From 9ac8fcbf381ae7cab5745aab72ca9206809dbc52 Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Mon, 15 Jan 2024 12:20:54 +0100 Subject: [PATCH] RED-5949: Wrong notificationType for specific endpoint * Do not send notification if assigneeId is null --- .../api/impl/controller/StatusController.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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/StatusController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java index 3e1512e47..90e5c5c1c 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java @@ -350,14 +350,16 @@ public class StatusController implements StatusResource { private void generatePossibleUnassignedFromFileNotification(String dossierId, String fileId, FileModel oldFileStatus, String newAssigneeId) { - if (oldFileStatus.getAssignee() != null && !oldFileStatus.getAssignee().equals(newAssigneeId) && !KeycloakSecurity.getUserId().equals(oldFileStatus.getAssignee())) { - notificationPersistenceService.insertNotification(AddNotificationRequest.builder() - .userId(oldFileStatus.getAssignee()) - .issuerId(KeycloakSecurity.getUserId()) - .notificationType(NotificationType.UNASSIGNED_FROM_FILE.name()) - .target(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, FILE_NAME, oldFileStatus.getFilename())) - .build()); + if (oldFileStatus.getAssignee() == null || newAssigneeId == null || oldFileStatus.getAssignee().equals(newAssigneeId) || KeycloakSecurity.getUserId().equals(oldFileStatus.getAssignee())) { + return; } + + notificationPersistenceService.insertNotification(AddNotificationRequest.builder() + .userId(oldFileStatus.getAssignee()) + .issuerId(KeycloakSecurity.getUserId()) + .notificationType(NotificationType.UNASSIGNED_FROM_FILE.name()) + .target(Map.of(DOSSIER_ID, dossierId, FILE_ID, fileId, FILE_NAME, oldFileStatus.getFilename())) + .build()); }