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

RED-4012: Dossier stats controller always returns numberOfSoftDeletedFiles = 0

Browse Source
This commit is contained in:
aoezyetimoglu 2022-06-03 12:49:45 +02:00
parent 1559a75e49
commit 4fb570bd8a
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
} }

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
View File

@ -154,7 +154,12 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
@Query("select count(f) from FileEntity f inner join DossierEntity d on d.id = f.dossierId where d.dossierTemplateId = :dossierTemplateId" + @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 " + " 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") " (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") @Query("select distinct f.dossierId from FileEntity f where f.lastUpdated > :since")
List<String> findDossierChangeByLastUpdatedIsAfter(OffsetDateTime since); List<String> findDossierChangeByLastUpdatedIsAfter(OffsetDateTime since);

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierTemplateStatsService.java
View File

@ -93,7 +93,7 @@ public class DossierTemplateStatsService {
dts.setNumberOfActiveDossiers(dossierRepository.countActive(dossierTemplateId)); dts.setNumberOfActiveDossiers(dossierRepository.countActive(dossierTemplateId));
dts.setNumberOfDeletedDossiers(dossierRepository.countSofDeleted(dossierTemplateId)); dts.setNumberOfDeletedDossiers(dossierRepository.countSofDeleted(dossierTemplateId));
dts.setNumberOfActiveFiles(fileRepository.countActiveFiles(dossierTemplateId)); dts.setNumberOfActiveFiles(fileRepository.countActiveFiles(dossierTemplateId));
dts.setNumberOfSoftDeletedFiles(fileRepository.countSoftDeletedFiles(dossierTemplateId)); dts.setNumberOfSoftDeletedFiles(fileRepository.countSoftDeletedFilesPerDossierTemplateId(dossierTemplateId));
var processingCounts = fileRepository.countFilesByProcessingStatus(dossierTemplateId); var processingCounts = fileRepository.countFilesByProcessingStatus(dossierTemplateId);
var workflowCounts = fileRepository.countFilesByWorkflowStatus(dossierTemplateId); var workflowCounts = fileRepository.countFilesByWorkflowStatus(dossierTemplateId);

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
View File

@ -662,7 +662,7 @@ public class FileStatusService {
public int countSoftDeletedFiles(String dossierId) { public int countSoftDeletedFiles(String dossierId) {
return fileStatusPersistenceService.countSoftDeletedFiles(dossierId); return fileStatusPersistenceService.countSoftDeletedFilesPerDossierId(dossierId);
} }
} }