fixed bug on notifications ui, added audit trail for notification updates

Author: NyashaMuusha

JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Ask.java

@@ -331,6 +331,7 @@ static CompletionStage<BackEnd.PostUpdateNotificationResponse> postUpdateNotific
             .ask(backEnd,
                  replyTo -> new BackEnd.PostUpdateNotificationRequest(replyTo,
                                                                       notificationRequest.notificationId(),
+                                                                      notificationRequest.oldGoldenId(),
                                                                       notificationRequest.currentGoldenId()),
                  java.time.Duration.ofSeconds(11),
                  actorSystem.scheduler());

JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java

@@ -435,8 +435,11 @@ private Behavior<Event> getGidsPagedHandler(final GetGidsPagedRequest request) {
 
    private Behavior<Event> postUpdateNotificationHandler(final PostUpdateNotificationRequest request) {
       try {
+         libMPI.startTransaction();
          psqlNotifications.updateNotificationState(request.notificationId, request.currentGoldenId);
-      } catch (SQLException exception) {
+         libMPI.sendUpdatedNotificationEvent(request.notificationId, request.oldGoldenId, request.currentGoldenId);
+         libMPI.closeTransaction();
+     } catch (SQLException exception) {
          LOGGER.error(exception.getMessage());
       }
       request.replyTo.tell(new PostUpdateNotificationResponse());
@@ -609,6 +612,7 @@ public record PatchIidNewGidLinkResponse(Either<MpiGeneralError, LinkInfo> linkI
    public record PostUpdateNotificationRequest(
          ActorRef<PostUpdateNotificationResponse> replyTo,
          String notificationId,
+         String oldGoldenId,
          String currentGoldenId) implements Event {
    }
 

JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/PsqlNotifications.java

@@ -38,6 +38,7 @@ final class PsqlNotifications {
     * @param states The state of notification.
     * @return A {@link MatchesForReviewResult} object containing the matches and related information.
     */
+
    MatchesForReviewResult getMatchesForReview(
          final int limit,
          final int offset,
@@ -166,21 +167,20 @@ void insertCandidates(
       }
    }
 
-   void updateNotificationState(
-         final String notificationId,
-         final String currentGoldenId) throws SQLException {
+   void updateNotificationState(final String notificationId, final String currentGoldenId) throws SQLException {
       psqlClient.connect();
-      try (Statement stmt = psqlClient.createStatement()) {
-        stmt.executeQuery(String.format(Locale.ROOT,
-                                                        "update notification set state = '%s' where id = '%s'",
-                                                        "CLOSED",
-                                                        notificationId));
-         stmt.executeQuery(String.format(Locale.ROOT,
-                                                        "update notification set golden_id = '%s' where id = '%s'",
-                                                        currentGoldenId,
-                                                        notificationId));
-         LOGGER.info("Updated notification {} with new currentGoldenId {} ", notificationId, currentGoldenId);
-         psqlClient.commit();
+      String sql = String.format(Locale.ROOT, "update notification set state = '%s', golden_id = '%s' where id = '%s'",
+                                                      "CLOSED",
+                                                      currentGoldenId,
+                                                      notificationId);
+      try (PreparedStatement stmt = psqlClient.prepareStatement(sql)) {
+         int rowsAffected = stmt.executeUpdate();
+         if (rowsAffected > 0) {
+            LOGGER.info("Updated notification {} with new currentGoldenId {}", notificationId, currentGoldenId);
+            psqlClient.commit();
+         } else {
+            LOGGER.warn("Notification with ID {} not found", notificationId);
+         }
       }
    }
 

JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/LibMPI.java

@@ -375,6 +375,23 @@ public LinkInfo createInteractionAndLinkToClonedGoldenRecord(
       return result;
    }
 
+   /*
+    * *****************************************************************************
+    * *
+    * Notifications
+    * *****************************************************************************
+    * *
+    */
+
+   public void sendUpdatedNotificationEvent(final String notificationId, final String oldGoldenId, final String currentGoldenId) {
+      var message = String.format(
+            "Notification -> new GoldenID: old(%s) new(%s), new State: old(OPEN) new(CLOSED)",
+            oldGoldenId,
+            currentGoldenId);
+      var eventData = new NotificationAuditEventData(message, notificationId);
+      auditTrailUtil.sendAuditEvent(GlobalConstants.AuditEventType.NOTIFICATION_EVENT, eventData);
+   }
+
    /*
     * *****************************************************************************
     * *

JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/GlobalConstants.java

@@ -81,6 +81,7 @@ public final class GlobalConstants {
 
    public  enum AuditEventType {
       LINKING_EVENT,
+      NOTIFICATION_EVENT,
       UNKNOWN_EVENT
    }
 

JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/NotificationAuditEventData.java

@@ -0,0 +1,7 @@
+package org.jembi.jempi.shared.models;
+
+public record NotificationAuditEventData(
+      String message,
+      String notificationId
+) {
+}

JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/NotificationRequest.java

@@ -7,6 +7,7 @@
 public record NotificationRequest(
       @JsonProperty("notificationId") String notificationId,
       @JsonProperty("state") String state,
+      @JsonProperty("oldGoldenId") String oldGoldenId,
       @JsonProperty("currentGoldenId") String currentGoldenId) {
 
 }

JeMPI_Apps/JeMPI_UI/src/components/reviewLink/ReviewLink.tsx

@@ -89,10 +89,11 @@ const ReviewLink = () => {
     }
   })
 
-  const updateNotification = (currentGoldenId: string) => {
+  const updateNotification = (oldGoldenId: string, currentGoldenId: string) => {
     mutateNotification.mutate(
       {
         notificationId: payload?.notificationId,
+        oldGoldenId: oldGoldenId,
         currentGoldenId: currentGoldenId,
       },
       {
@@ -118,7 +119,7 @@ const ReviewLink = () => {
       {
         onSuccess: data => {
           if (payload?.notificationId) {
-            updateNotification(goldenRecord ? goldenRecord.uid : '')
+            updateNotification(id, goldenRecord ? goldenRecord.uid : '')
           }
           enqueueSnackbar('New record linked', {
             variant: 'success'
@@ -154,7 +155,7 @@ const ReviewLink = () => {
         {
           onSuccess: () => {
             if (payload?.notificationId) {
-              updateNotification(goldenRecord.uid)
+              updateNotification(id, goldenRecord.uid)
               navigate('/notifications')
             } else {
               navigate(`/record-details/${id}`)

JeMPI_Apps/JeMPI_UI/src/types/BackendResponse.ts

@@ -8,6 +8,7 @@ import {
 
 export interface NotificationRequest {
   notificationId: string
+  oldGoldenId: string
   currentGoldenId: string
 }