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

Author: NyashaMuusha

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
 );
 

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);

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

@@ -436,7 +436,7 @@ private Behavior<Event> getGidsPagedHandler(final GetGidsPagedRequest request) {
    private Behavior<Event> postUpdateNotificationHandler(final PostUpdateNotificationRequest request) {
       try {
          libMPI.startTransaction();
-         psqlNotifications.updateNotificationState(request.notificationId, request.currentGoldenId);
+         psqlNotifications.updateNotificationState(request.notificationId, request.oldGoldenId, request.currentGoldenId);
          libMPI.sendUpdatedNotificationEvent(request.notificationId, request.oldGoldenId, request.currentGoldenId);
          libMPI.closeTransaction();
      } catch (SQLException exception) {

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
@@ -167,10 +167,11 @@ void insertCandidates(
       }
    }
 
-   void updateNotificationState(final String notificationId, final String currentGoldenId) throws SQLException {
+   void updateNotificationState(final String notificationId, final String oldGoldenId, final String currentGoldenId) throws SQLException {
       psqlClient.connect();
-      String sql = String.format(Locale.ROOT, "update notification set state = '%s', golden_id = '%s' where id = '%s'",
+      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)) {

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

@@ -185,7 +185,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
                         }

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',

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: [
       {

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[]