diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/UserStatsController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/UserStatsController.java index 934d412cd..c58a78a25 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/UserStatsController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/UserStatsController.java @@ -8,6 +8,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; +import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.DossierService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.users.UserService; @@ -32,13 +33,14 @@ public class UserStatsController implements UserStatsResource { public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { - return new ResponseEntity(null, HttpStatus.NOT_FOUND); + throw new NotFoundException(String.format("The user with id %s is not found.", userId)); } List dossierMemberships = new ArrayList<>(); List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId());