From 4fb570bd8a3327ed14a11dacc486d5a65eb3322d Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Fri, 3 Jun 2022 12:49:45 +0200 Subject: [PATCH] RED-4012: Dossier stats controller always returns numberOfSoftDeletedFiles = 0 --- .../persistence/FileStatusPersistenceService.java | 9 +++++++-- .../service/persistence/repository/FileRepository.java | 7 ++++++- .../v1/server/service/DossierTemplateStatsService.java | 2 +- .../peristence/v1/server/service/FileStatusService.java | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java index 535d5915f..20b1b4c42 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java @@ -381,9 +381,14 @@ public class FileStatusPersistenceService { } - public int countSoftDeletedFiles(String dossierTemplateId) { + public int countSoftDeletedFilesPerDossierTemplateId(String dossierTemplateId) { - return fileRepository.countSoftDeletedFiles(dossierTemplateId); + return fileRepository.countSoftDeletedFilesPerDossierTemplateId(dossierTemplateId); + } + + public int countSoftDeletedFilesPerDossierId(String dossierId) { + + return fileRepository.countSoftDeletedFilesPerDossierId(dossierId); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java index 79bb38bc8..08b852dca 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java @@ -154,7 +154,12 @@ public interface FileRepository extends JpaRepository { @Query("select count(f) from FileEntity f inner join DossierEntity d on d.id = f.dossierId where d.dossierTemplateId = :dossierTemplateId" + " and ((f.deleted is not null and f.hardDeletedTime is null) or " + " (d.softDeletedTime is not null and d.hardDeletedTime is null)) and d.archivedTime is null") - int countSoftDeletedFiles(String dossierTemplateId); + int countSoftDeletedFilesPerDossierTemplateId(String dossierTemplateId); + + @Query("select count(f) from FileEntity f inner join DossierEntity d on d.id = f.dossierId where d.id = :dossierId" + + " and ((f.deleted is not null and f.hardDeletedTime is null) or " + + " (d.softDeletedTime is not null and d.hardDeletedTime is null)) and d.archivedTime is null") + int countSoftDeletedFilesPerDossierId(String dossierId); @Query("select distinct f.dossierId from FileEntity f where f.lastUpdated > :since") List findDossierChangeByLastUpdatedIsAfter(OffsetDateTime since); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateStatsService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateStatsService.java index fbbec6c26..6e66f5f60 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateStatsService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateStatsService.java @@ -93,7 +93,7 @@ public class DossierTemplateStatsService { dts.setNumberOfActiveDossiers(dossierRepository.countActive(dossierTemplateId)); dts.setNumberOfDeletedDossiers(dossierRepository.countSofDeleted(dossierTemplateId)); dts.setNumberOfActiveFiles(fileRepository.countActiveFiles(dossierTemplateId)); - dts.setNumberOfSoftDeletedFiles(fileRepository.countSoftDeletedFiles(dossierTemplateId)); + dts.setNumberOfSoftDeletedFiles(fileRepository.countSoftDeletedFilesPerDossierTemplateId(dossierTemplateId)); var processingCounts = fileRepository.countFilesByProcessingStatus(dossierTemplateId); var workflowCounts = fileRepository.countFilesByWorkflowStatus(dossierTemplateId); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index 12f069ef9..0fb1bb45a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -662,7 +662,7 @@ public class FileStatusService { public int countSoftDeletedFiles(String dossierId) { - return fileStatusPersistenceService.countSoftDeletedFiles(dossierId); + return fileStatusPersistenceService.countSoftDeletedFilesPerDossierId(dossierId); } }