RED-4242: Inconsistency regarding dossiers that have been deleted and archived for dossier stats

This commit is contained in:
aoezyetimoglu 2022-06-21 11:54:54 +02:00
parent 08988e7820
commit 50a63c1e6e
2 changed files with 3 additions and 1 deletions

View File

@ -18,9 +18,11 @@ public interface DossierStatsResource {
String DOSSIER_ID_PARAM = "dossierId"; String DOSSIER_ID_PARAM = "dossierId";
String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}"; String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
@Deprecated
@GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
DossierStats getDossierStats(@PathVariable(DOSSIER_ID_PARAM) String dossierId); DossierStats getDossierStats(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
@Deprecated
@PostMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
List<DossierStats> getDossierStats(@RequestBody Set<String> dossierIds); List<DossierStats> getDossierStats(@RequestBody Set<String> dossierIds);
} }

View File

@ -41,7 +41,7 @@ public interface DossierRepository extends JpaRepository<DossierEntity, String>
@Query("update DossierEntity d set d.lastUpdated = :lastUpdated, d.archivedTime = null where d.id = :dossierId") @Query("update DossierEntity d set d.lastUpdated = :lastUpdated, d.archivedTime = null where d.id = :dossierId")
int unarchiveDossier(String dossierId, OffsetDateTime lastUpdated); int unarchiveDossier(String dossierId, OffsetDateTime lastUpdated);
@Query("select count(d) from DossierEntity d where d.archivedTime is not null and d.dossierTemplateId = :dossierTemplateId") @Query("select count(d) from DossierEntity d where d.archivedTime is not null and d.softDeletedTime is null and d.hardDeletedTime is null and d.dossierTemplateId = :dossierTemplateId")
int countArchived(String dossierTemplateId); int countArchived(String dossierTemplateId);
@Query("select count(d) from DossierEntity d where d.hardDeletedTime is null and d.softDeletedTime is not null and d.dossierTemplateId = :dossierTemplateId") @Query("select count(d) from DossierEntity d where d.hardDeletedTime is null and d.softDeletedTime is not null and d.dossierTemplateId = :dossierTemplateId")