Merge branch 'Jmpi-bug-notification-screen-pointing-to-deleted-GR' into Jmpi-bug-notification-screen-pointing-to-deleted-GR-2

Author: NyashaMuusha

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

@@ -330,7 +330,8 @@ static CompletionStage<BackEnd.PostUpdateNotificationResponse> postUpdateNotific
       CompletionStage<BackEnd.PostUpdateNotificationResponse> stage = AskPattern
             .ask(backEnd,
                  replyTo -> new BackEnd.PostUpdateNotificationRequest(replyTo,
-                                                                      notificationRequest.notificationId()),
+                                                                      notificationRequest.notificationId(),
+                                                                      notificationRequest.currentGoldenId()),
                  java.time.Duration.ofSeconds(11),
                  actorSystem.scheduler());
       return stage.thenApply(response -> response);

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

@@ -435,7 +435,7 @@ private Behavior<Event> getGidsPagedHandler(final GetGidsPagedRequest request) {
 
    private Behavior<Event> postUpdateNotificationHandler(final PostUpdateNotificationRequest request) {
       try {
-         psqlNotifications.updateNotificationState(request.notificationId);
+         psqlNotifications.updateNotificationState(request.notificationId, request.currentGoldenId);
       } catch (SQLException exception) {
          LOGGER.error(exception.getMessage());
       }
@@ -608,7 +608,8 @@ public record PatchIidNewGidLinkResponse(Either<MpiGeneralError, LinkInfo> linkI
 
    public record PostUpdateNotificationRequest(
          ActorRef<PostUpdateNotificationResponse> replyTo,
-         String notificationId) implements Event {
+         String notificationId,
+         String currentGoldenId) implements Event {
    }
 
    public record PostUpdateNotificationResponse() implements EventResponse {

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

@@ -167,13 +167,19 @@ void insertCandidates(
    }
 
    void updateNotificationState(
-         final String id) throws SQLException {
+         final String notificationId,
+         final String currentGoldenId) throws SQLException {
       psqlClient.connect();
       try (Statement stmt = psqlClient.createStatement()) {
-         ResultSet rs = stmt.executeQuery(String.format(Locale.ROOT,
+        stmt.executeQuery(String.format(Locale.ROOT,
                                                         "update notification set state = '%s' where id = '%s'",
                                                         "CLOSED",
-                                                        id));
+                                                        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();
       }
    }

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

@@ -6,6 +6,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record NotificationRequest(
       @JsonProperty("notificationId") String notificationId,
-      @JsonProperty("state") String state) {
+      @JsonProperty("state") String state,
+      @JsonProperty("currentGoldenId") String currentGoldenId) {
 
 }

JeMPI_Apps/JeMPI_UI/src/components/notificationWorklist/NotificationWorklist.tsx

@@ -65,7 +65,7 @@ const NotificationWorklist = () => {
         endDateFilter.format('YYYY-MM-DD HH:mm:ss'),
         selectedStates
       ),
-    refetchOnWindowFocus: false,
+    refetchOnWindowFocus: true,
     keepPreviousData: true
   })
 

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

@@ -89,10 +89,11 @@ const ReviewLink = () => {
     }
   })
 
-  const updateNotification = () => {
+  const updateNotification = (currentGoldenId: string) => {
     mutateNotification.mutate(
       {
-        notificationId: payload?.notificationId
+        notificationId: payload?.notificationId,
+        currentGoldenId: currentGoldenId,
       },
       {
         onSuccess: () => {
@@ -117,7 +118,7 @@ const ReviewLink = () => {
       {
         onSuccess: data => {
           if (payload?.notificationId) {
-            updateNotification()
+            updateNotification(goldenRecord ? goldenRecord.uid : '')
           }
           enqueueSnackbar('New record linked', {
             variant: 'success'
@@ -153,7 +154,7 @@ const ReviewLink = () => {
         {
           onSuccess: () => {
             if (payload?.notificationId) {
-              updateNotification()
+              updateNotification(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
+  currentGoldenId: string
 }
 
 export interface LinkRequest {