This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch audit
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/audit by this push:
new c2c59a6 Added resource type filter
c2c59a6 is described below
commit c2c59a68f6cf38e5ec546fb504f87bf3888d0804
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Tue Jun 23 16:54:09 2020 +0300
Added resource type filter
---
.../src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java | 8 +++++++-
.../java/com/epam/dlab/backendapi/domain/AuditPaginationDTO.java | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
index e363888..cde9380 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
@@ -57,6 +57,7 @@ import static com.mongodb.client.model.Filters.lte;
public class AuditDAOImpl extends BaseDAO implements AuditDAO {
private final static String AUDIT_COLLECTION = "audit";
private static final String RESOURCE_NAME_FIELD = "resourceName";
+ private static final String RESOURCE_TYPE_FIELD = "type";
private static final String TIMESTAMP_FIELD = "timestamp";
private static final String COUNT_FIELD = "count";
private static final String AUDIT_FACET = "auditFacet";
@@ -64,6 +65,7 @@ public class AuditDAOImpl extends BaseDAO implements AuditDAO
{
private static final String RESOURCE_NAME_FACET = "resourceNameFacet";
private static final String USER_FACET = "userFacet";
private static final String PROJECT_FACET = "projectFacet";
+ private static final String RESOURCE_TYPE_FACET = "typeFacet";
@Override
public void save(AuditDTO audit) {
@@ -87,9 +89,11 @@ public class AuditDAOImpl extends BaseDAO implements
AuditDAO {
List<Bson> userFilter =
Collections.singletonList(group(getGroupingFields(USER)));
List<Bson> projectFilter =
Collections.singletonList(group(getGroupingFields(PROJECT)));
List<Bson> resourceNameFilter =
Collections.singletonList(group(getGroupingFields(RESOURCE_NAME_FIELD)));
+ List<Bson> resourceTypeFilter =
Collections.singletonList(group(getGroupingFields(RESOURCE_TYPE_FIELD)));
List<Bson> facets = Collections.singletonList(facet(new
Facet(AUDIT_FACET, valuesPipeline), new Facet(TOTAL_COUNT_FACET, countPipeline),
- new Facet(RESOURCE_NAME_FACET, resourceNameFilter), new
Facet(USER_FACET, userFilter), new Facet(PROJECT_FACET, projectFilter)));
+ new Facet(RESOURCE_NAME_FACET, resourceNameFilter), new
Facet(USER_FACET, userFilter), new Facet(PROJECT_FACET, projectFilter),
+ new Facet(RESOURCE_TYPE_FACET, resourceTypeFilter)));
return StreamSupport.stream(aggregate(AUDIT_COLLECTION,
facets).spliterator(), false)
.map(this::toAuditPaginationDTO)
.collect(Collectors.toList());
@@ -117,12 +121,14 @@ public class AuditDAOImpl extends BaseDAO implements
AuditDAO {
Set<String> userFilter = getFilter(document, USER_FACET, USER);
Set<String> projectFilter = getFilter(document, PROJECT_FACET,
PROJECT);
Set<String> resourceNameFilter = getFilter(document,
RESOURCE_NAME_FACET, RESOURCE_NAME_FIELD);
+ Set<String> resourceTypeFilter = getFilter(document,
RESOURCE_TYPE_FACET, RESOURCE_TYPE_FIELD);
List<AuditDTO> auditDTOs = (List<AuditDTO>) document.get(AUDIT_FACET);
return AuditPaginationDTO.builder()
.totalPageCount(count)
.audit(auditDTOs)
.userFilter(userFilter)
.resourceNameFilter(resourceNameFilter)
+ .resourceTypeFilter(resourceTypeFilter)
.projectFilter(projectFilter)
.build();
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditPaginationDTO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditPaginationDTO.java
index 9729615..7acff35 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditPaginationDTO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditPaginationDTO.java
@@ -38,4 +38,6 @@ public class AuditPaginationDTO {
private final Set<String> projectFilter;
@JsonProperty("resource_name_filter")
private final Set<String> resourceNameFilter;
+ @JsonProperty("resource_type_filter")
+ private final Set<String> resourceTypeFilter;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
