Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-6543: Fixed license report QA findings

Browse Source
This commit is contained in:
deiflaender 2023-06-27 09:43:44 +02:00
parent 804e77bd6c
commit e53fc9e43b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/LicenseReportService.java
View File

@ -35,14 +35,20 @@ public class LicenseReportService {
public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
var files = fileStatusService.getStatusesAddedBefore(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID));
var addDossiers = dossierService.getAllDossiers();
if (files == null || files.isEmpty()) {
return LicenseReport.builder().startDate(licenseReportRequest.getStartDate()).endDate(licenseReportRequest.getEndDate()).build();
return LicenseReport.builder()
.startDate(licenseReportRequest.getStartDate())
.endDate(licenseReportRequest.getEndDate()).numberOfDossiers(addDossiers.stream()
.filter(dossier -> dossier.getDate().toInstant().isAfter(licenseReportRequest.getStartDate()) && (dossier.getHardDeletedTime() == null || dossier.getHardDeletedTime()
.isAfter(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID))))
.collect(Collectors.toSet())
.size()).build();
}
files.sort(Comparator.comparing(FileModel::getAdded));
var addDossiers = dossierService.getAllDossiers();
var dossiersById = addDossiers.stream().collect(Collectors.toMap(DossierEntity::getId, Function.identity()));
Map<YearMonth, List<FileModel>> adds = new HashMap<>();
@ -181,8 +187,8 @@ public class LicenseReportService {
.numberOfAnalyzedFiles(numberOfAnalyzedFiles)
.numberOfOcrFiles(numberOfOcrFiles)
.numberOfDossiers(addDossiers.stream()
.filter(dossier -> dossier.getHardDeletedTime() == null || dossier.getHardDeletedTime()
.isAfter(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID)))
.filter(dossier -> dossier.getDate().toInstant().isAfter(licenseReportRequest.getStartDate()) && (dossier.getHardDeletedTime() == null || dossier.getHardDeletedTime()
.isAfter(OffsetDateTime.ofInstant(licenseReportRequest.getEndDate(), UTC_ZONE_ID))))
.collect(Collectors.toSet())
.size())
.startDate(licenseReportRequest.getStartDate())

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/license/LicenseReportRequest.java
View File

@ -29,7 +29,7 @@ public class LicenseReportRequest {
public Instant getEndDate() {
if (endDate == null) {
if (endDate == null || endDate.isAfter(Instant.now())) {
endDate = Instant.now();
}
return endDate;