From edd6b87566083956f344aa0c50bf516181763dcd Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 001/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 9b801cb9b..fa3baa720 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 @@ -38,6 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 8c7e64ffad94666c76f44d4bd6d712f2bdc70c0c Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 002/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa3baa720..934d412cd 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 @@ -38,7 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 12136e0fdc0844df1ba0f7214093bed733738b9d Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 003/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 9b801cb9b..fa3baa720 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 @@ -38,6 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 4a32f55b6176a5b14cc56f07d4df0a5a64645bdc Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 004/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa3baa720..934d412cd 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 @@ -38,7 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 072c965593ef43217ca933d813f9e829e49cc382 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 005/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); From c7a9c2ff11d2053255d49adfec3ee9fbd89a4c15 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:38:51 +0100 Subject: [PATCH 006/100] RED-9393 user stats controller added action roles --- .../v1/processor/roles/ApplicationRoles.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 05ced6d54..c2fbb290a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -26,7 +26,7 @@ public final class ApplicationRoles { GET_TENANTS, CREATE_TENANT, READ_USERS, - READ_ALL_USERS, + READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -63,7 +63,7 @@ public final class ApplicationRoles { READ_COLORS, READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, - READ_DOSSIER, + READ_DOSSIER, READ_USER_STATS, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -119,7 +119,7 @@ public final class ApplicationRoles { READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, READ_LICENSE_REPORT, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,7 +146,7 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, @@ -154,7 +154,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From fa0e29095f3006fbd4656b92f1f140d33ea5c9ee Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:43:29 +0100 Subject: [PATCH 007/100] RED-9393 user stats controller added authority check --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c58a78a25..6350e3a65 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From c1fafaee6ec1036e31a84b98fe5e1537cc11f263 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 008/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 9b801cb9b..fa3baa720 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 @@ -38,6 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 23078c0b6696e59549d3bb3a9eee00d3163f84ca Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 009/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa3baa720..934d412cd 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 @@ -38,7 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From afe793a5235bf367038ec010649f6b7f19905368 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 010/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); From 013d61b0d0714810d3a1849cee20a6120c258967 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:38:51 +0100 Subject: [PATCH 011/100] RED-9393 user stats controller added action roles --- .../v1/processor/roles/ApplicationRoles.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 05ced6d54..c2fbb290a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -26,7 +26,7 @@ public final class ApplicationRoles { GET_TENANTS, CREATE_TENANT, READ_USERS, - READ_ALL_USERS, + READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -63,7 +63,7 @@ public final class ApplicationRoles { READ_COLORS, READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, - READ_DOSSIER, + READ_DOSSIER, READ_USER_STATS, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -119,7 +119,7 @@ public final class ApplicationRoles { READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, READ_LICENSE_REPORT, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,7 +146,7 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, @@ -154,7 +154,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From 3315a679a88be3909fd1d679804cac9fa22b83f4 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:43:29 +0100 Subject: [PATCH 012/100] RED-9393 user stats controller added authority check --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c58a78a25..6350e3a65 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 5bbcfdffc0494cc60bc2a8b9ff09c82525feed40 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 013/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 03d4f04b152fed2ea148efcb2ec8d59cf9df9d79 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:22:50 +0100 Subject: [PATCH 014/100] RED-9393 user stats controller added filter for hard deleted files --- .../service/persistence/FileStatusPersistenceService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 9311ab746..722cf4c5e 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 @@ -3,7 +3,6 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis import java.time.OffsetDateTime; import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -603,7 +602,9 @@ public class FileStatusPersistenceService { public int getNumberOfAssignedFiles(String userId) { List files = fileRepository.findFilesByAssignee(userId); - return files.size(); + return files.stream() + .filter(fileEntity -> fileEntity.getHardDeletedTime() == null) + .collect(Collectors.toList()).size(); } From b3bc7bb0ac7ef66540350f04d2ee2e2b5305177f Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 015/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 684dc3418d28184c6f963e01580505265c7aee22 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 016/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 9b74db96bad50255eb38a7b76e756642da011702 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 017/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 9b801cb9b..fa3baa720 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 @@ -38,6 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 861f1e559f0a302552cd819edae98eefbad560df Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 018/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa3baa720..934d412cd 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 @@ -38,7 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From d36cf3c7f2fac67824216590dcdf7cec43798736 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 019/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); From 59933f4a8827347e1058f1c49faaa2075a4205a7 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:38:51 +0100 Subject: [PATCH 020/100] RED-9393 user stats controller added action roles --- .../v1/processor/roles/ApplicationRoles.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 05ced6d54..c2fbb290a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -26,7 +26,7 @@ public final class ApplicationRoles { GET_TENANTS, CREATE_TENANT, READ_USERS, - READ_ALL_USERS, + READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -63,7 +63,7 @@ public final class ApplicationRoles { READ_COLORS, READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, - READ_DOSSIER, + READ_DOSSIER, READ_USER_STATS, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -119,7 +119,7 @@ public final class ApplicationRoles { READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, READ_LICENSE_REPORT, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,7 +146,7 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, @@ -154,7 +154,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From 17b90b1b67f995bff44ff683f40b580782e1982f Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:43:29 +0100 Subject: [PATCH 021/100] RED-9393 user stats controller added authority check --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c58a78a25..6350e3a65 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 46cab2786a05fc2c6e7d29ecc77fc21c667c3e07 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 022/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 6350e3a65..3f8409fd6 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 @@ -43,8 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) - .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From efbfd26363fc0148be3d5a3f5efe620f372b6195 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 023/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8409fd6..0f7317de0 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 @@ -43,7 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From f9a5b5aa01b2d66f1f40998dffb532d60e395bc2 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 024/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 71f4a78a165864c4fe87a8dc4a1133dd64911606 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 025/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 5f98b16bc1e3b9b1cf3d21dd1aba0027048938ec Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:22:50 +0100 Subject: [PATCH 026/100] RED-9393 user stats controller added filter for hard deleted files --- .../service/persistence/FileStatusPersistenceService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 9311ab746..722cf4c5e 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 @@ -3,7 +3,6 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis import java.time.OffsetDateTime; import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -603,7 +602,9 @@ public class FileStatusPersistenceService { public int getNumberOfAssignedFiles(String userId) { List files = fileRepository.findFilesByAssignee(userId); - return files.size(); + return files.stream() + .filter(fileEntity -> fileEntity.getHardDeletedTime() == null) + .collect(Collectors.toList()).size(); } From b04bad60575c95aa194050f45af59a58574d8c20 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 027/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From ce27ac8d178f4fbcf7b2ef4d26511d2794af04dd Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 028/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 28c97b446ce5f80e610839a2c395e97f9acaed1d Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 28 Nov 2024 08:48:07 +0100 Subject: [PATCH 029/100] RED-9393 user stats controller --- .../v1/processor/roles/ApplicationRoles.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index c2fbb290a..906e33448 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -25,8 +25,7 @@ public final class ApplicationRoles { UPDATE_LICENSE, GET_TENANTS, CREATE_TENANT, - READ_USERS, - READ_ALL_USERS, READ_USER_STATS, + READ_USERS, READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -62,8 +61,7 @@ public final class ApplicationRoles { PROCESS_MANUAL_REDACTION_REQUEST, READ_COLORS, READ_DICTIONARY_TYPES, - READ_DIGITAL_SIGNATURE, - READ_DOSSIER, READ_USER_STATS, + READ_DIGITAL_SIGNATURE, READ_DOSSIER, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -118,8 +116,7 @@ public final class ApplicationRoles { READ_DOSSIER_TEMPLATES, READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, - READ_LICENSE_REPORT, - READ_NOTIFICATIONS, READ_USER_STATS, + READ_LICENSE_REPORT, READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,15 +143,14 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, READ_APP_CONFIG, READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, - GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, READ_USER_STATS, + GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From 10f69631b01a17640b16d13c70d0fd9b00b92869 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 28 Nov 2024 20:16:28 +0100 Subject: [PATCH 030/100] RED-9393 user stats controller --- .../management/v1/processor/roles/ApplicationRoles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 906e33448..d88c89e69 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -151,7 +151,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, - READ_USERS, + READ_USERS, READ_USER_STATS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, WRITE_USERS, From 15f05624ca4d1c4d6f6bcd3869b53a128f5969e6 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 031/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 9b801cb9b..fa3baa720 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 @@ -38,6 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 0d7b57dd6af167c2814aefc3b6402f0a1b7b20fa Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 032/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa3baa720..934d412cd 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 @@ -38,7 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 0d3e3051aba4a634ef2c060445c17985c00a455e Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 033/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); From 86ff048c6b97725e7d8c7a3abd4a8d87962c1cd8 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:38:51 +0100 Subject: [PATCH 034/100] RED-9393 user stats controller added action roles --- .../v1/processor/roles/ApplicationRoles.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 05ced6d54..c2fbb290a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -26,7 +26,7 @@ public final class ApplicationRoles { GET_TENANTS, CREATE_TENANT, READ_USERS, - READ_ALL_USERS, + READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -63,7 +63,7 @@ public final class ApplicationRoles { READ_COLORS, READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, - READ_DOSSIER, + READ_DOSSIER, READ_USER_STATS, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -119,7 +119,7 @@ public final class ApplicationRoles { READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, READ_LICENSE_REPORT, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,7 +146,7 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, @@ -154,7 +154,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From 96a8575cb64b5d209a471faa8ec31fa651dda711 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:43:29 +0100 Subject: [PATCH 035/100] RED-9393 user stats controller added authority check --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c58a78a25..6350e3a65 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From f3032becf411bcbac3f1fba55e9c4e3d87cd02f3 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 036/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 6350e3a65..3f8409fd6 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 @@ -43,8 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) - .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 6f6095990f37f883c7999e0fe311584b880db7ff Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 037/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8409fd6..0f7317de0 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 @@ -43,7 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 5767e3465e34710fa328ecbc9b27595f2840cf2d Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 038/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 295839c048402b8bd4e8ff415599aedf79b74c19 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 039/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 0584172bbd3d7a0ab4d628917df29c1f7361ee12 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:22:50 +0100 Subject: [PATCH 040/100] RED-9393 user stats controller added filter for hard deleted files --- .../service/persistence/FileStatusPersistenceService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ede3abfed..afabdd266 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 @@ -602,7 +602,9 @@ public class FileStatusPersistenceService { public int getNumberOfAssignedFiles(String userId) { List files = fileRepository.findFilesByAssignee(userId); - return files.size(); + return files.stream() + .filter(fileEntity -> fileEntity.getHardDeletedTime() == null) + .collect(Collectors.toList()).size(); } From 4efc1b897a962e9dbf1aa1a19c2cd433b1ecfae1 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 041/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 4f289c359f4240e420aa41b2ed0ec7c590c8250d Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 042/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From c95a5f027c5fd186b6795a8619db19de58d14e16 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 043/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From d0c79c87cf0337e4b28f686492f9821c8548de88 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 044/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 6a5792adf613b28c541f56848972d017be388cf5 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 045/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 3507130e646638198dc05f982a1ba476d6ccbdd4 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 046/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From f3fc2e2ce253b195f28382a9f5a98236bc14a4e9 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 28 Nov 2024 08:48:07 +0100 Subject: [PATCH 047/100] RED-9393 user stats controller --- .../v1/processor/roles/ApplicationRoles.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index c2fbb290a..906e33448 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -25,8 +25,7 @@ public final class ApplicationRoles { UPDATE_LICENSE, GET_TENANTS, CREATE_TENANT, - READ_USERS, - READ_ALL_USERS, READ_USER_STATS, + READ_USERS, READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -62,8 +61,7 @@ public final class ApplicationRoles { PROCESS_MANUAL_REDACTION_REQUEST, READ_COLORS, READ_DICTIONARY_TYPES, - READ_DIGITAL_SIGNATURE, - READ_DOSSIER, READ_USER_STATS, + READ_DIGITAL_SIGNATURE, READ_DOSSIER, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -118,8 +116,7 @@ public final class ApplicationRoles { READ_DOSSIER_TEMPLATES, READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, - READ_LICENSE_REPORT, - READ_NOTIFICATIONS, READ_USER_STATS, + READ_LICENSE_REPORT, READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,15 +143,14 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, READ_APP_CONFIG, READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, - GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, READ_USER_STATS, + GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From d55a72e57a83fafc6b3302601eea7ff50e06fcaa Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 28 Nov 2024 20:16:28 +0100 Subject: [PATCH 048/100] RED-9393 user stats controller --- .../management/v1/processor/roles/ApplicationRoles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 906e33448..d88c89e69 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -151,7 +151,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, - READ_USERS, + READ_USERS, READ_USER_STATS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, WRITE_USERS, From 52c5dbea1f58ac654ed2885665d006f860be9ef8 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 049/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 9b801cb9b..fa3baa720 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 @@ -38,6 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 8548dcaf66911c16a6d671c31b52c95750a2b172 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 050/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa3baa720..934d412cd 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 @@ -38,7 +38,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 9667144c9b7f8de6634b1489f90d5f5b0af79153 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 051/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); From df65dac4cb9ca2b15f27d8b4206fefb0b43f7198 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:38:51 +0100 Subject: [PATCH 052/100] RED-9393 user stats controller added action roles --- .../v1/processor/roles/ApplicationRoles.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 05ced6d54..c2fbb290a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -26,7 +26,7 @@ public final class ApplicationRoles { GET_TENANTS, CREATE_TENANT, READ_USERS, - READ_ALL_USERS, + READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -63,7 +63,7 @@ public final class ApplicationRoles { READ_COLORS, READ_DICTIONARY_TYPES, READ_DIGITAL_SIGNATURE, - READ_DOSSIER, + READ_DOSSIER, READ_USER_STATS, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -119,7 +119,7 @@ public final class ApplicationRoles { READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, READ_LICENSE_REPORT, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,7 +146,7 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, @@ -154,7 +154,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, + READ_NOTIFICATIONS, READ_USER_STATS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From a875f94ca451ed62cc119760ed0136f6ca25bb8b Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:43:29 +0100 Subject: [PATCH 053/100] RED-9393 user stats controller added authority check --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c58a78a25..6350e3a65 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From d1883fc5b681da0e311106292975b36b12dde96b Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 054/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 6350e3a65..3f8409fd6 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 @@ -43,8 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) - .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From d2fdba56582d0fbaf341c512f5c53d36e6b3bbac Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 055/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8409fd6..0f7317de0 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 @@ -43,7 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From a7db55cb136a9b565c1e3cf12023789aba7ee173 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 056/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 1d595eb1f061e5513a8b555b7502b60246e7178f Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 057/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 5d0b26aca6e294174f1fa76af579147aaadc3adf Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:22:50 +0100 Subject: [PATCH 058/100] RED-9393 user stats controller added filter for hard deleted files --- .../service/persistence/FileStatusPersistenceService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 cac75be43..fa294214d 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 @@ -602,7 +602,9 @@ public class FileStatusPersistenceService { public int getNumberOfAssignedFiles(String userId) { List files = fileRepository.findFilesByAssignee(userId); - return files.size(); + return files.stream() + .filter(fileEntity -> fileEntity.getHardDeletedTime() == null) + .collect(Collectors.toList()).size(); } From 5425e06399dca35683249753f447c4d83a233a64 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 059/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From bc1b6b9e6d3850a3c200932c33e9fd879bd4bbc8 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 060/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From ab7f6a14709eadb8db3e0727f7491f0a2a344e3c Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 061/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 298ccff8428a6a5f16d9c91a059785c68560bade Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 062/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From dba47d0f0f94863a269dec68f10a9443a85e49c6 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 063/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 84c1d037c67fb3ec2a25718f0681dea3a9ee985c Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 064/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From bde5c88471f9e3bc24e89090b93119fa10fd8e60 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 28 Nov 2024 08:48:07 +0100 Subject: [PATCH 065/100] RED-9393 user stats controller --- .../v1/processor/roles/ApplicationRoles.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index c2fbb290a..906e33448 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -25,8 +25,7 @@ public final class ApplicationRoles { UPDATE_LICENSE, GET_TENANTS, CREATE_TENANT, - READ_USERS, - READ_ALL_USERS, READ_USER_STATS, + READ_USERS, READ_ALL_USERS, READ_USER_STATS, WRITE_USERS, READ_SMTP_CONFIGURATION, WRITE_SMTP_CONFIGURATION, @@ -62,8 +61,7 @@ public final class ApplicationRoles { PROCESS_MANUAL_REDACTION_REQUEST, READ_COLORS, READ_DICTIONARY_TYPES, - READ_DIGITAL_SIGNATURE, - READ_DOSSIER, READ_USER_STATS, + READ_DIGITAL_SIGNATURE, READ_DOSSIER, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -118,8 +116,7 @@ public final class ApplicationRoles { READ_DOSSIER_TEMPLATES, READ_FILE_ATTRIBUTES_CONFIG, READ_LEGAL_BASIS, - READ_LICENSE_REPORT, - READ_NOTIFICATIONS, READ_USER_STATS, + READ_LICENSE_REPORT, READ_NOTIFICATIONS, READ_USER_STATS, READ_RULES, READ_DATA_FORMATS, READ_SMTP_CONFIGURATION, @@ -146,15 +143,14 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, READ_APP_CONFIG, READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, - GET_SIMILAR_IMAGES, - READ_NOTIFICATIONS, READ_USER_STATS, + GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, READ_USERS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From e0717e34668763e1c633155b60d10184db827fc8 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 28 Nov 2024 20:16:28 +0100 Subject: [PATCH 066/100] RED-9393 user stats controller --- .../management/v1/processor/roles/ApplicationRoles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index 906e33448..d88c89e69 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -151,7 +151,7 @@ public final class ApplicationRoles { READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, - READ_USERS, + READ_USERS, READ_USER_STATS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, WRITE_USERS, From 6068c39c332cfa2b14fc278ccebf550a051ec1ba Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 067/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 34680a3972a137552bfc4846bf75388052a4b249 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 068/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 6350e3a65..3f8409fd6 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 @@ -43,8 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) - .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 14143c93567a14ea8414762394fd66448916129d Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 069/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8409fd6..0f7317de0 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 @@ -43,7 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 556e6a4f6bcc5a211eb0774877a2cc384dcffc50 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 070/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From b3b547914b13d4be74a7b66dd5cf4750bf282e54 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 071/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From fad8fb3af207b781402bbb9ec8bd958be853f115 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 072/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 635925b3fcba03bb86a01406072a4c100e537641 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 073/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 5e60074d2f89fc5a6a99615e4774f8568a09610e Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 074/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 7a087764c14d2fab9c124446b3d79d4fa7c35871 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 22 Nov 2024 08:38:51 +0100 Subject: [PATCH 075/100] RED-9393 user stats controller added action roles --- .../management/v1/processor/roles/ApplicationRoles.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java index d88c89e69..2c26af9f1 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ApplicationRoles.java @@ -61,7 +61,7 @@ public final class ApplicationRoles { PROCESS_MANUAL_REDACTION_REQUEST, READ_COLORS, READ_DICTIONARY_TYPES, - READ_DIGITAL_SIGNATURE, READ_DOSSIER, + READ_DIGITAL_SIGNATURE, READ_DOSSIER, READ_USER_STATS, READ_DOSSIER_ATTRIBUTES, READ_DOSSIER_ATTRIBUTES_CONFIG, READ_DOSSIER_TEMPLATES, @@ -143,14 +143,14 @@ public final class ApplicationRoles { GET_TENANTS, DEPLOYMENT_INFO); - public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, WRITE_DOSSIER_ATTRIBUTES); + public static final Set RED_MANAGER_ACTION_ROLES = Sets.newHashSet(ADD_UPDATE_DOSSIER, ARCHIVE_DOSSIER, DELETE_DOSSIER, READ_USER_STATS, WRITE_DOSSIER_ATTRIBUTES); public static final Set RED_USER_ADMIN_ACTION_ROLES = Sets.newHashSet(MANAGE_USER_PREFERENCES, READ_ALL_USERS, READ_APP_CONFIG, READ_GENERAL_CONFIGURATION, READ_GENERAL_CONFIGURATION, - GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, + GET_SIMILAR_IMAGES, READ_NOTIFICATIONS, READ_USER_STATS, READ_USERS, READ_USER_STATS, UPDATE_MY_PROFILE, UPDATE_NOTIFICATIONS, From 091a648a82ca3a448c932047efcb7c451ee75566 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 076/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 569c24924afe7c2d03e7c676d116727d2a4f607c Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 077/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 1967468fec9b00a99d9a91530ae3ae79b50de0a0 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 078/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From abfc9eed95b804be89404266916703821818e233 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 079/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 7d07b1c882dbecf48703de1080e80fd929f088ad Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 080/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 6350e3a65..3f8409fd6 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 @@ -43,8 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) - .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 3610e6c76fc4136aaf9a243fd011c9e65e018cbd Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 081/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8409fd6..0f7317de0 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 @@ -43,7 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From 45c0c3d902c43d710901f35051f2a7ff6b677c09 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 082/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From ae8aecc00568d31e37de89e9ade1efa3df032cc5 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 083/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 87ba79905cc61d89473fc5af44dd33ad4aa9a4eb Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 084/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 6b885f3212c1366877976b25a459faac5a7aea73 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 085/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 850e85ffdb8e3b0199dec10e3a29f00712cbf739 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 086/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 3624a6e49a967afae19c37fee8fc991f0482dcbd Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 087/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 945e402639d8aa0adf334908a0ed8dbe3f571695 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 088/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From a3a1ee67fc72535ab934efffc3558f2e9db8c694 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 089/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From f55ebd9ecc4ad832ede51fe6c83a933da00ec80d Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 090/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 9fc3aef66931a031a32eb875d12b710dafaf430c Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:30 +0100 Subject: [PATCH 091/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 6350e3a65..3f8409fd6 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 @@ -43,8 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) - .filter(dossierEntity -> dossierEntity.getSoftDeletedTime() == null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From c420bda82025c6d88bcbd2da2e0fa2db7162d29e Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 20 Nov 2024 08:57:49 +0100 Subject: [PATCH 092/100] RED-9393 user stats controller added filter for hard deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8409fd6..0f7317de0 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 @@ -43,7 +43,7 @@ public class UserStatsController implements UserStatsResource { List dossierOwnerships = new ArrayList<>(); dossierService.getAllDossiers() .stream() - .filter(dossierEntity -> dossierEntity.getHardDeletedTime() != null) + .filter(dossierEntity -> dossierEntity.getHardDeletedTime() == null) .forEach(d -> { if (dossierACLService.getMembers(d.getId()).contains(userId)) { dossierMemberships.add(d.getId()); From cfac2bcc6bac50693e35dc0e5c1835a416d6c4e5 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 093/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From 032f6f87c9123c8b81137cae80e204d08724ff3f Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 094/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From c28076df68f21368076a7d37b9825a987f5af35f Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 095/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 61e557712b7e135a097676dfe982f7282f84bb5f Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 096/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From fbb8a7b5199aa73a3721ee52e8b70e0b9f0666e0 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 21 Nov 2024 09:00:30 +0100 Subject: [PATCH 097/100] RED-9393 user stats controller added filter for soft deleted dossiers --- .../v1/external/api/impl/controller/UserStatsController.java | 1 + 1 file changed, 1 insertion(+) 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 0f7317de0..6350e3a65 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 @@ -44,6 +44,7 @@ public class UserStatsController implements UserStatsResource { 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()); From c32c2cdab015fe1227109514d95dbd4f562f9eb3 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 26 Nov 2024 15:19:37 +0100 Subject: [PATCH 098/100] RED-9393 user stats controller removed filter for soft deleted files --- .../v1/external/api/impl/controller/UserStatsController.java | 1 - 1 file changed, 1 deletion(-) 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 6350e3a65..0f7317de0 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 @@ -44,7 +44,6 @@ public class UserStatsController implements UserStatsResource { 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()); From 77483b6bd00cde94dfdec770a478aea61de09f2e Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 11:40:10 +0100 Subject: [PATCH 099/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ---- 1 file changed, 4 deletions(-) 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 0f7317de0..71d8396ec 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 @@ -1,13 +1,10 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; - import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -33,7 +30,6 @@ public class UserStatsController implements UserStatsResource { @Override - @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) { From 8ed5f3388bddb46633d9c762adea07f905172de4 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 27 Nov 2024 12:10:43 +0100 Subject: [PATCH 100/100] RED-9393 user stats controller --- .../v1/external/api/impl/controller/UserStatsController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 71d8396ec..0f7317de0 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 @@ -1,10 +1,13 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_USER_STATS; + import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; @@ -30,6 +33,7 @@ public class UserStatsController implements UserStatsResource { @Override + @PreAuthorize("hasAuthority('" + READ_USER_STATS + "')") public ResponseEntity getUserStats(String userId) { if (userService.getUserById(userId).isEmpty()) {