This is an automated email from the ASF dual-hosted git repository. ppapou pushed a commit to branch DATALAB-1953 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 5c9817a6b0793e3a263bd233cc72a3a8789342d8 Author: Pavel Papou <[email protected]> AuthorDate: Thu May 12 09:54:41 2022 -0400 [DATALAB-1953] Auidit report has been added - auditresource, auditreport objects have been added --- .../datalab/backendapi/domain/AuditReport.java | 24 ++++++++++++++++++++++ .../backendapi/service/impl/AuditServiceImpl.java | 13 ++++++++++++ 2 files changed, 37 insertions(+) diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditReport.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditReport.java new file mode 100644 index 000000000..7ffa0740d --- /dev/null +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/AuditReport.java @@ -0,0 +1,24 @@ +package com.epam.datalab.backendapi.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class AuditReport { + private String name; + @JsonProperty("report_lines") + private List<AuditReportLine> reportLines; + @JsonProperty("from") + private LocalDate usageDateFrom; + @JsonProperty("to") + private LocalDate usageDateTo; +} diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/AuditServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/AuditServiceImpl.java index 8e54e9962..7cf21b259 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/AuditServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/AuditServiceImpl.java @@ -62,6 +62,19 @@ public class AuditServiceImpl implements AuditService { return auditDAO.getAudit(users, projects, resourceNames, resourceTypes, dateStart, dateEnd, pageNumber, pageSize); } + @Override + public AuditReport getAuditReport(AuditFilter filter) { + List<AuditReportLine> auditReportLines = auditDAO.aggregateAuditReport(filter); + final LocalDate dateFrom = LocalDate.parse(filter.getDateStart()); + final LocalDate dateTo = LocalDate.parse(filter.getDateEnd()); + return AuditReport.builder() + .name("Audit Report") + .reportLines(auditReportLines) + .usageDateFrom(dateFrom) + .usageDateTo(dateTo) + .build(); + } + public String downloadAuditReport(AuditFilter filter) { List<AuditReportLine> auditReportLines = auditDAO.aggregateAuditReport(filter); final LocalDate dateFrom = LocalDate.parse(filter.getDateStart()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
