clean link/match streams & add new cr-link-update http request

w-hayes · w-hayes · commit ed42c4c7f536 · 2024-03-28T11:33:20.000+02:00
diff --git a/JeMPI_Apps/JeMPI_Bootstrapper/src/main/resources/data/postgres/notifications-schema.sql b/JeMPI_Apps/JeMPI_Bootstrapper/src/main/resources/data/postgres/notifications-schema.sql
@@ -26,7 +26,8 @@ CREATE TABLE IF NOT EXISTS Notification
     State VARCHAR(50),
     Patient_Id VARCHAR(50),
     Names VARCHAR(100),
-    Golden_Id VARCHAR(50),
+    Old_Golden_Id VARCHAR(50),
+    Current_Golden_Id VARCHAR(50),
     Score Numeric
 );
 
diff --git a/JeMPI_Apps/JeMPI_Controller/src/main/java/org/jembi/jempi/controller/PsqlNotifications.java b/JeMPI_Apps/JeMPI_Controller/src/main/java/org/jembi/jempi/controller/PsqlNotifications.java
@@ -28,8 +28,8 @@ void insert(
          final String dID) throws SQLException {
 
       psqlClient.connect(AppConfig.POSTGRESQL_NOTIFICATIONS_DB);
-      String sql = "INSERT INTO notification (id, type, state, names, created, patient_id, golden_id, score) "
-            + "VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+      String sql = "INSERT INTO notification (id, type, state, names, created, patient_id, old_golden_id, current_golden_id, score) "
+            + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
       try (PreparedStatement pstmt = psqlClient.prepareStatement(sql)) {
          psqlClient.setAutoCommit(false);
          pstmt.setObject(1, id);
@@ -39,7 +39,8 @@ void insert(
          pstmt.setTimestamp(5, created);
          pstmt.setString(6, dID);
          pstmt.setString(7, gID);
-         pstmt.setFloat(8, score);
+         pstmt.setString(8, gID);
+         pstmt.setFloat(9, score);
          pstmt.executeUpdate();
       } catch (SQLException e) {
          LOGGER.error("Error executing INSERT statement: {}", e.getMessage(), e);
diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Ask.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Ask.java
@@ -330,7 +330,9 @@ static CompletionStage<BackEnd.PostUpdateNotificationResponse> postUpdateNotific
       CompletionStage<BackEnd.PostUpdateNotificationResponse> stage = AskPattern
             .ask(backEnd,
                  replyTo -> new BackEnd.PostUpdateNotificationRequest(replyTo,
-                                                                      notificationRequest.notificationId()),
+                                                                      notificationRequest.notificationId(),
+                                                                      notificationRequest.oldGoldenId(),
+                                                                      notificationRequest.currentGoldenId()),
                  java.time.Duration.ofSeconds(11),
                  actorSystem.scheduler());
       return stage.thenApply(response -> response);
diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/BackEnd.java
@@ -433,8 +433,11 @@ private Behavior<Event> getGidsPagedHandler(final GetGidsPagedRequest request) {
 
    private Behavior<Event> postUpdateNotificationHandler(final PostUpdateNotificationRequest request) {
       try {
-         psqlNotifications.updateNotificationState(request.notificationId);
-      } catch (SQLException exception) {
+         libMPI.startTransaction();
+         psqlNotifications.updateNotificationState(request.notificationId, request.oldGoldenId, request.currentGoldenId);
+         libMPI.sendUpdatedNotificationEvent(request.notificationId, request.oldGoldenId, request.currentGoldenId);
+         libMPI.closeTransaction();
+     } catch (SQLException exception) {
          LOGGER.error(exception.getMessage());
       }
       request.replyTo.tell(new PostUpdateNotificationResponse());
@@ -611,7 +614,9 @@ public record PatchIidNewGidLinkResponse(Either<MpiGeneralError, LinkInfo> linkI
 
    public record PostUpdateNotificationRequest(
          ActorRef<PostUpdateNotificationResponse> replyTo,
-         String notificationId) implements Event {
+         String notificationId,
+         String oldGoldenId,
+         String currentGoldenId) implements Event {
    }
 
    public record PostUpdateNotificationResponse() implements EventResponse {
diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/PsqlNotifications.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/PsqlNotifications.java
@@ -11,7 +11,7 @@ final class PsqlNotifications {
 
    private static final String NOTIFICATION_TABLE_NAME = "notification";
    private static final String QUERY = """
-                                       SELECT patient_id, id, names, created, state,type, score, golden_id
+                                       SELECT patient_id, id, names, created, state,type, score, old_golden_id, current_golden_id
                                        FROM notification
                                        WHERE created BETWEEN ? AND ? AND state IN (?, ?)
                                        ORDER BY created
@@ -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,15 +167,21 @@ void insertCandidates(
       }
    }
 
-   void updateNotificationState(
-         final String id) throws SQLException {
+   void updateNotificationState(final String notificationId, final String oldGoldenId, final String currentGoldenId) throws SQLException {
       psqlClient.connect();
-      try (Statement stmt = psqlClient.createStatement()) {
-         ResultSet rs = stmt.executeQuery(String.format(Locale.ROOT,
-                                                        "update notification set state = '%s' where id = '%s'",
-                                                        "CLOSED",
-                                                        id));
-         psqlClient.commit();
+      String sql = String.format(Locale.ROOT, "update notification set state = '%s', old_golden_id = '%s', current_golden_id = '%s' where id = '%s'",
+                                                      "CLOSED",
+                                                      oldGoldenId,
+                                                      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);
+         }
       }
    }
 
diff --git a/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Routes.java b/JeMPI_Apps/JeMPI_LibAPI/src/main/java/org/jembi/jempi/libapi/Routes.java
@@ -892,7 +892,7 @@ private static Route postCrCandidates(
                        try {
                           return onComplete(postCrCandidatesProxy(linkerIP, linkerPort, http, obj),
                                             response -> {
-                                               if (response.isSuccess()) {
+                                               if (!response.isSuccess()) {
                                                   LOGGER.warn(IM_A_TEA_POT_LOG);
                                                   return complete(ApiModels.getHttpErrorResponse(GlobalConstants.IM_A_TEA_POT));
                                                }
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/LibMPI.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/LibMPI.java
@@ -371,4 +371,24 @@ public LinkInfo createInteractionAndLinkToClonedGoldenRecord(
       return result;
    }
 
+   /*
+    * *****************************************************************************
+    * *
+    * Notifications
+    * *****************************************************************************
+    * *
+    */
+
+   public void sendUpdatedNotificationEvent(
+         final String notificationId,
+         final String oldGoldenId,
+         final String currentGoldenId) {
+      final var message = String.format(
+            "Notification -> new GoldenID: old(%s) new(%s), new State: old(OPEN) new(CLOSED)",
+            oldGoldenId,
+            currentGoldenId);
+      final var eventData = new NotificationAuditEventData(message, notificationId);
+      auditTrailUtil.sendAuditEvent(GlobalConstants.AuditEventType.NOTIFICATION_EVENT, eventData);
+   }
+
 }
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/GlobalConstants.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/GlobalConstants.java
@@ -83,6 +83,7 @@ public final class GlobalConstants {
 
    public  enum AuditEventType {
       LINKING_EVENT,
+      NOTIFICATION_EVENT,
       UNKNOWN_EVENT
    }
 
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/NotificationAuditEventData.java b/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
+) {
+}
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/NotificationRequest.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/NotificationRequest.java
@@ -6,6 +6,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record NotificationRequest(
       @JsonProperty("notificationId") String notificationId,
-      @JsonProperty("state") String state) {
+      @JsonProperty("state") String state,
+      @JsonProperty("oldGoldenId") String oldGoldenId,
+      @JsonProperty("currentGoldenId") String currentGoldenId) {
 
 }
diff --git a/JeMPI_Apps/JeMPI_UI/src/components/notificationWorklist/NotificationWorklist.tsx b/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
   })
 
@@ -186,7 +186,7 @@ const NotificationWorklist = () => {
                           notificationId: params.row.id,
                           notificationType: params.row.type,
                           patient_id: params.row.patient_id,
-                          golden_id: params.row.golden_id,
+                          golden_id: params.row.current_golden_id,
                           score: params.row.score,
                           candidates: params.row.candidates
                         }
diff --git a/JeMPI_Apps/JeMPI_UI/src/components/notificationWorklist/notificationsColumns.tsx b/JeMPI_Apps/JeMPI_UI/src/components/notificationWorklist/notificationsColumns.tsx
@@ -38,12 +38,22 @@ const NOTIFICATIONS_COLUMNS: GridColDef[] = [
     filterable: false
   },
   {
-    field: 'golden_id',
-    headerName: 'Golden ID',
+    field: 'old_golden_id',
+    headerName: 'Initial Golden ID',
     type: 'number',
     flex: 1,
     headerClassName: 'super-app-theme--header',
-    filterable: false
+    filterable: false,
+    hideable: true
+  },
+  {
+    field: 'current_golden_id',
+    headerName: 'Current Golden ID',
+    type: 'number',
+    flex: 1,
+    headerClassName: 'super-app-theme--header',
+    filterable: false,
+    hideable: true
   },
   {
     field: 'score',
diff --git a/JeMPI_Apps/JeMPI_UI/src/components/reviewLink/ReviewLink.tsx b/JeMPI_Apps/JeMPI_UI/src/components/reviewLink/ReviewLink.tsx
@@ -89,10 +89,12 @@ const ReviewLink = () => {
     }
   })
 
-  const updateNotification = () => {
+  const updateNotification = (oldGoldenId: string, currentGoldenId: string) => {
     mutateNotification.mutate(
       {
-        notificationId: payload?.notificationId
+        notificationId: payload?.notificationId,
+        oldGoldenId: oldGoldenId,
+        currentGoldenId: currentGoldenId,
       },
       {
         onSuccess: () => {
@@ -117,7 +119,7 @@ const ReviewLink = () => {
       {
         onSuccess: data => {
           if (payload?.notificationId) {
-            updateNotification()
+            updateNotification(id, goldenRecord ? goldenRecord.uid : '')
           }
           enqueueSnackbar('New record linked', {
             variant: 'success'
@@ -153,7 +155,7 @@ const ReviewLink = () => {
         {
           onSuccess: () => {
             if (payload?.notificationId) {
-              updateNotification()
+              updateNotification(id, goldenRecord ? goldenRecord.uid : '')
               navigate('/notifications')
             } else {
               navigate(`/record-details/${id}`)
diff --git a/JeMPI_Apps/JeMPI_UI/src/services/mockData.ts b/JeMPI_Apps/JeMPI_UI/src/services/mockData.ts
@@ -12,7 +12,8 @@ const notifications: Notification[] = [
     names: 'Bob Smith',
     patient_id: '0x5a',
     status: NotificationState.CLOSED,
-    golden_id: '0x9833',
+    old_golden_id: '0x9493',
+    current_golden_id: '0x9833',
     score: 0.5,
     candidates: [
       {
@@ -28,7 +29,8 @@ const notifications: Notification[] = [
     names: 'Jane Doe',
     patient_id: '0x7j',
     status: NotificationState.OPEN,
-    golden_id: '0x9824',
+    old_golden_id: '0x9493',
+    current_golden_id: '0x9833',
     score: 0.9,
     candidates: [
       {
@@ -44,7 +46,8 @@ const notifications: Notification[] = [
     names: 'Jane Smith',
     patient_id: '0x1a',
     status: NotificationState.OPEN,
-    golden_id: '0x9847',
+    old_golden_id: '0x9493',
+    current_golden_id: '0x9833',
     score: 0.3,
     candidates: [
       {
@@ -60,7 +63,8 @@ const notifications: Notification[] = [
     names: 'John Themba',
     patient_id: '0x9a',
     status: NotificationState.OPEN,
-    golden_id: '0x9866',
+    old_golden_id: '0x9493',
+    current_golden_id: '0x9833',
     score: 0.7,
     candidates: [
       {
diff --git a/JeMPI_Apps/JeMPI_UI/src/types/BackendResponse.ts b/JeMPI_Apps/JeMPI_UI/src/types/BackendResponse.ts
@@ -8,6 +8,8 @@ import {
 
 export interface NotificationRequest {
   notificationId: string
+  oldGoldenId: string
+  currentGoldenId: string
 }
 
 export interface LinkRequest {
diff --git a/JeMPI_Apps/JeMPI_UI/src/types/Notification.ts b/JeMPI_Apps/JeMPI_UI/src/types/Notification.ts
@@ -6,7 +6,8 @@ export default interface Notification {
   names: string
   patient_id: string | null
   status: NotificationState
-  golden_id: string
+  old_golden_id: string
+  current_golden_id: string
   score: number
   linkedTo?: GoldenRecordCandidate
   candidates?: GoldenRecordCandidate[]

Original file line number	Diff line number	Diff line change
`@@ -892,7 +892,7 @@ private static Route postCrCandidates(`
`892`	`892`	`try {`
`893`	`893`	`return onComplete(postCrCandidatesProxy(linkerIP, linkerPort, http, obj),`
`894`	`894`	`response -> {`
`895`		`- if (response.isSuccess()) {`
	`895`	`+ if (!response.isSuccess()) {`
`896`	`896`	`LOGGER.warn(IM_A_TEA_POT_LOG);`
`897`	`897`	`return complete(ApiModels.getHttpErrorResponse(GlobalConstants.IM_A_TEA_POT));`
`898`	`898`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public final class GlobalConstants {`
`83`	`83`
`84`	`84`	`public enum AuditEventType {`
`85`	`85`	`LINKING_EVENT,`
	`86`	`+ NOTIFICATION_EVENT,`
`86`	`87`	`UNKNOWN_EVENT`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`7`	`7`	`public record NotificationRequest(`
`8`	`8`	`@JsonProperty("notificationId") String notificationId,`
`9`		`- @JsonProperty("state") String state) {`
	`9`	`+ @JsonProperty("state") String state,`
	`10`	`+ @JsonProperty("oldGoldenId") String oldGoldenId,`
	`11`	`+ @JsonProperty("currentGoldenId") String currentGoldenId) {`
`10`	`12`
`11`	`13`	`}`