diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java index 40ba2ed00..9b4ca672a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java @@ -33,7 +33,9 @@ public class DossierStatsService { log.info("Computing Dossier Stats ... "); long start = System.currentTimeMillis(); Map dossierStatsComputeMap = new HashMap<>(); - dossierService.getAllDossiers().forEach(d -> dossierStatsComputeMap.put(d.getId(), computeDossierStats(d))); + dossierService.getAllDossiers().stream() + .filter(d -> !d.getStatus().equals(DossierStatus.DELETED)) + .forEach(d -> dossierStatsComputeMap.put(d.getId(), computeDossierStats(d))); dossierStatsMap.clear(); dossierStatsMap = dossierStatsComputeMap; log.info("Dossier Stats Computed in {}ms", System.currentTimeMillis() - start); @@ -51,6 +53,7 @@ public class DossierStatsService { if (dossierEntity.getStatus().equals(DossierStatus.DELETED)) { throw new DossierNotFoundException(String.format(DOSSIER_NOT_FOUND_MESSAGE, dossierId)); } + dossierStats.setDossierId(dossierId); // get the associated files List files = fileStatusService.getActiveFiles(dossierId);