Merge remote-tracking branch 'origin/dev' into Jmpi-bug-notification-screen-pointing-to-deleted-GR-2

NyashaMuusha · NyashaMuusha · commit 2880b9e1d76a · 2024-03-19T08:32:55.000+02:00
diff --git a/JeMPI_Apps/JeMPI_Configuration/reference/config-reference-link-d-validate-dp-match-dp.json b/JeMPI_Apps/JeMPI_Configuration/reference/config-reference-link-d-validate-dp-match-dp.json
@@ -201,6 +201,13 @@
       "indexGoldenRecord": "@index(exact)"
     }
   ],
+  "indexes": {
+    "linking": {
+      "national_id": {
+        "props": "@index(exact)"
+      }
+    }
+  },
   "rules": {
     "link": {
       "deterministic": {
diff --git a/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomLinkerBackEnd.scala b/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomLinkerBackEnd.scala
@@ -29,6 +29,7 @@ object CustomLinkerBackEnd {
         .mkString(sys.props("line.separator"))
     }
 
+    /*
     def createApplyFunctions(): String = {
 
       def applyFields(): String = {
@@ -59,8 +60,10 @@ object CustomLinkerBackEnd {
          |${" " * 3}                          interaction.uniqueInteractionData(),
          |${" " * 3}                          new CustomDemographicData(${applyFields()}));
          |${" " * 3}}""".stripMargin
+
     }
 
+     */
     config.demographicFields
       .filter(f => f.linkMetaData.isDefined)
       .foreach(f => {
@@ -87,14 +90,12 @@ object CustomLinkerBackEnd {
          |
          |${createGenerateFunctions()}
          |
-         |   ${createApplyFunctions()}
-         |
          |   static void updateGoldenRecordFields(
          |         final LibMPI libMPI,
          |         final float threshold,
          |         final String interactionId,
          |         final String goldenId) {
-         |      final var expandedGoldenRecord = libMPI.findExpandedGoldenRecords(List.of(goldenId)).get(0);
+         |      final var expandedGoldenRecord = libMPI.findExpandedGoldenRecords(List.of(goldenId)).getFirst();
          |      final var goldenRecord = expandedGoldenRecord.goldenRecord();
          |      final var demographicData = goldenRecord.demographicData();
          |      var k = 0;
@@ -105,13 +106,15 @@ object CustomLinkerBackEnd {
       val fieldName = Utils.snakeCaseToCamelCase(field_name)
       writer.println(
         s"""${" " * 6}k += LinkerDWH.helperUpdateGoldenRecordField(libMPI, interactionId, expandedGoldenRecord,
-           |${" " * 6}                                            "$fieldName", demographicData.$fieldName, CustomDemographicData::get${fieldName
-            .charAt(0)
-            .toUpper}${fieldName.substring(1)})
+           |${" " * 6}                                            "$fieldName", demographicData.$fieldName,
+           |${" " * 6}                                            expandedGoldenRecord.interactionsWithScore()
+           |${" " * 6}                                                                .stream()
+           |${" " * 6}                                                                .map(rec -> rec.interaction().demographicData().$fieldName))
            |${" " * 12}? 1
            |${" " * 12}: 0;""".stripMargin
       )
     })
+
     writer.println(s"""
          |${" " * 6}if (k > 0) {
          |${" " * 6}  LinkerDWH.helperUpdateInteractionsScore(libMPI, threshold, expandedGoldenRecord);
diff --git a/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomPatient.scala b/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomPatient.scala
@@ -61,7 +61,7 @@ private object CustomPatient {
       )
     }
     writer.println()
-    for (field <- config.demographicFields) {
+    /*    for (field <- config.demographicFields) {
       val typeString = field.fieldType
       val fieldName = Utils.snakeCaseToCamelCase(field.fieldName)
       writer.println(
@@ -73,7 +73,7 @@ private object CustomPatient {
            |""".stripMargin
       )
     }
-
+     */
     writer.println(
       s"""${" " * indent * 1}public $customClassNameCustomDemographicData() {""".stripMargin
     )
@@ -83,6 +83,20 @@ private object CustomPatient {
          |""".stripMargin
     )
 
+    writer.print(
+      s"""${" " * indent * 1}public $customClassNameCustomDemographicData(final $customClassNameCustomDemographicData demographicData) {"""
+    )
+    config.demographicFields.zipWithIndex.foreach { case (field, idx) =>
+      val fieldName = Utils.snakeCaseToCamelCase(field.fieldName)
+      writer.print(
+        s"""
+           |${" " * indent * 2}this.$fieldName = demographicData.$fieldName;""".stripMargin
+      )
+    }
+    writer.println(s"""
+         |${" " * indent * 1}}
+         |""".stripMargin)
+
     writer.println(
       s"""${" " * indent * 1}public $customClassNameCustomDemographicData(""".stripMargin
     )
diff --git a/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomPostgresqlGoldenRecord.scala b/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomPostgresqlGoldenRecord.scala
@@ -23,17 +23,10 @@ private object CustomPostgresqlGoldenRecord {
          |final class $customClassName extends CustomDemographicData implements NodeData {
          |
          |   $customClassName(final CustomDemographicData customDemographicData) {
-         |      super(${fields
-          .map(field =>
-            s"""customDemographicData.${Utils.snakeCaseToCamelCase(
-                field.fieldName
-              )}"""
-          )
-          .mkString(s",${sys.props("line.separator")}            ")});
+         |      super(customDemographicData);
          |   }
          |
-         |}
-         |""".stripMargin
+         |}""".stripMargin
     )
     writer.close()
   }
diff --git a/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomPostgresqlInteraction.scala b/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomPostgresqlInteraction.scala
@@ -23,13 +23,7 @@ private object CustomPostgresqlInteraction {
          |final class $customClassName extends CustomDemographicData implements NodeData {
          |
          |   $customClassName(final CustomDemographicData customDemographicData) {
-         |      super(${fields
-          .map(field =>
-            s"""customDemographicData.${Utils.snakeCaseToCamelCase(
-                field.fieldName
-              )}"""
-          )
-          .mkString(s",${sys.props("line.separator")}            ")});
+         |      super(customDemographicData);
          |   }
          |
          |}
diff --git a/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/Main.scala b/JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/Main.scala
@@ -44,8 +44,8 @@ object Main {
     CustomLinkerProbabilistic.generate(config)
     CustomLinkerBackEnd.generate(config)
     CustomLinkerMU.generate(config)
-    CustomPostgresqlInteraction.generate(config.demographicFields)
-    CustomPostgresqlGoldenRecord.generate(config.demographicFields)
+//    CustomPostgresqlInteraction.generate(config.demographicFields)
+//    CustomPostgresqlGoldenRecord.generate(config.demographicFields)
     CustomAsyncHelper.generate(config)
     CustomPatient.generate(config)
     CustomFieldTallies.generate(config)
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/lib/hooks/indexes/LibMPIIndexesHooks.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/lib/hooks/indexes/LibMPIIndexesHooks.java
@@ -16,7 +16,7 @@ public LibMPIIndexesHooks(final LibMPIClientInterface clientIn) {
 
     @Override
     public Option<MpiGeneralError> beforeLinkingHook() {
-        if (client.shouldUpdateLinkingIndexes()) {
+        if (Boolean.TRUE.equals(client.shouldUpdateLinkingIndexes())) {
             LOGGER.info("Updating indexes for linking.");
             return client.loadLinkingIndexes();
         }
@@ -25,7 +25,7 @@ public Option<MpiGeneralError> beforeLinkingHook() {
 
     @Override
     public Option<MpiGeneralError> afterLinkingHook() {
-        if (client.shouldUpdateLinkingIndexes()) {
+        if (Boolean.TRUE.equals(client.shouldUpdateLinkingIndexes())) {
             LOGGER.info("Adding default indexes after linking.");
             return client.loadDefaultIndexes();
         }
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/CustomGoldenRecordData.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/CustomGoldenRecordData.java
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/CustomInteractionData.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/CustomInteractionData.java
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/GoldenRecordData.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/GoldenRecordData.java
@@ -0,0 +1,11 @@
+package org.jembi.jempi.libmpi.postgresql;
+
+import org.jembi.jempi.shared.models.CustomDemographicData;
+
+final class GoldenRecordData extends CustomDemographicData implements NodeData {
+
+   GoldenRecordData(final CustomDemographicData customDemographicData) {
+      super(customDemographicData);
+   }
+
+}
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/InteractionData.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/InteractionData.java
@@ -0,0 +1,12 @@
+package org.jembi.jempi.libmpi.postgresql;
+
+import org.jembi.jempi.shared.models.CustomDemographicData;
+
+final class InteractionData extends CustomDemographicData implements NodeData {
+
+   InteractionData(final CustomDemographicData customDemographicData) {
+      super(customDemographicData);
+   }
+
+}
+
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/NodeGoldenRecord.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/NodeGoldenRecord.java
@@ -7,10 +7,10 @@
 record NodeGoldenRecord(
       NodeType type,
       UUID uid,
-      CustomGoldenRecordData data) implements Node {
+      GoldenRecordData data) implements Node {
 
    NodeGoldenRecord(final CustomDemographicData demographicData) {
-      this(NodeType.GOLDEN_RECORD, null, new CustomGoldenRecordData(demographicData));
+      this(NodeType.GOLDEN_RECORD, null, new GoldenRecordData(demographicData));
    }
 
    public NodeType getType() {
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/NodeInteraction.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/NodeInteraction.java
@@ -7,10 +7,10 @@
 record NodeInteraction(
       NodeType type,
       UUID uid,
-      CustomInteractionData data) implements Node {
+      InteractionData data) implements Node {
 
    NodeInteraction(final CustomDemographicData demographicData) {
-      this(NodeType.INTERACTION, null, new CustomInteractionData(demographicData));
+      this(NodeType.INTERACTION, null, new InteractionData(demographicData));
    }
 
    public NodeType getType() {
diff --git a/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/PostgresqlQueries.java b/JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/postgresql/PostgresqlQueries.java
@@ -153,7 +153,7 @@ public static List<NodeGoldenRecord> getGoldenRecordsOfInteraction(final UUID ei
          while (rs.next()) {
             final var id = rs.getString("id");
             final var json = rs.getString("fields");
-            final var goldenRecordData = new CustomGoldenRecordData(OBJECT_MAPPER.readValue(json, CustomDemographicData.class));
+            final var goldenRecordData = new GoldenRecordData(OBJECT_MAPPER.readValue(json, CustomDemographicData.class));
             list.add(new NodeGoldenRecord(Node.NodeType.valueOf(rs.getString("type")), UUID.fromString(id), goldenRecordData));
          }
          return list;
@@ -175,7 +175,7 @@ public static List<NodeInteraction> getGoldenRecordInteractions(final UUID gid)
          while (rs.next()) {
             final var id = rs.getString("id");
             final var json = rs.getString("fields");
-            final var interactionData = new CustomInteractionData(OBJECT_MAPPER.readValue(json, CustomDemographicData.class));
+            final var interactionData = new InteractionData(OBJECT_MAPPER.readValue(json, CustomDemographicData.class));
             list.add(new NodeInteraction(Node.NodeType.valueOf(rs.getString("type")), UUID.fromString(id), interactionData));
          }
          return list;
@@ -192,7 +192,7 @@ private static List<GoldenRecord> findCandidatesWorker(final String sql) {
          while (rs.next()) {
             final var id = rs.getString("id");
             final var json = rs.getString("fields");
-            final var goldenRecordData = new CustomGoldenRecordData(OBJECT_MAPPER.readValue(json, CustomDemographicData.class));
+            final var goldenRecordData = new GoldenRecordData(OBJECT_MAPPER.readValue(json, CustomDemographicData.class));
             list.add(new GoldenRecord(id, null, new CustomUniqueGoldenRecordData(null), goldenRecordData));
          }
          return list;
@@ -228,7 +228,7 @@ public static NodeGoldenRecord getGoldenRecord(final UUID gid) {
          if (rs.next()) {
             final var id = rs.getString("id");
             final var goldenRecordData =
-                  new CustomGoldenRecordData(OBJECT_MAPPER.readValue(rs.getString("fields"), CustomDemographicData.class));
+                  new GoldenRecordData(OBJECT_MAPPER.readValue(rs.getString("fields"), CustomDemographicData.class));
             return new NodeGoldenRecord(Node.NodeType.valueOf(rs.getString("type")), UUID.fromString(id), goldenRecordData);
          }
          return null;
@@ -248,7 +248,7 @@ static NodeInteraction getInteraction(final UUID iid) {
          if (rs.next()) {
             final var id = rs.getString("id");
             final var interactionData =
-                  new CustomInteractionData(OBJECT_MAPPER.readValue(rs.getString("fields"), CustomDemographicData.class));
+                  new InteractionData(OBJECT_MAPPER.readValue(rs.getString("fields"), CustomDemographicData.class));
             return new NodeInteraction(Node.NodeType.valueOf(rs.getString("type")), UUID.fromString(id), interactionData);
          }
          return null;
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/CustomDemographicData.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/CustomDemographicData.java
@@ -12,38 +12,20 @@ public class CustomDemographicData {
    public final String phoneNumber;
    public final String nationalId;
 
-   public final String getGivenName() {
-      return givenName;
-   }
-
-   public final String getFamilyName() {
-      return familyName;
-   }
-
-   public final String getGender() {
-      return gender;
-   }
-
-   public final String getDob() {
-      return dob;
-   }
-
-   public final String getCity() {
-      return city;
-   }
-
-   public final String getPhoneNumber() {
-      return phoneNumber;
-   }
-
-   public final String getNationalId() {
-      return nationalId;
-   }
-
    public CustomDemographicData() {
       this(null, null, null, null, null, null, null);
    }
 
+   public CustomDemographicData(final CustomDemographicData demographicData) {
+      this.givenName = demographicData.givenName;
+      this.familyName = demographicData.familyName;
+      this.gender = demographicData.gender;
+      this.dob = demographicData.dob;
+      this.city = demographicData.city;
+      this.phoneNumber = demographicData.phoneNumber;
+      this.nationalId = demographicData.nationalId;
+   }
+
    public CustomDemographicData(
       final String givenName,
       final String familyName,
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/utils/AuditTrailBridge.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/utils/AuditTrailBridge.java
@@ -32,7 +32,7 @@ public <T> void sendAuditEvent(
                 eventType,
                 getSerializedEventData(eventData)
         );
-        LOGGER.info("Creating Audit Event {} ", auditEvent.toString());
+//        LOGGER.info("Creating Audit Event {} ", auditEvent.toString());
 
         topicAuditEvents.produceAsync(UUID.randomUUID().toString(),
                 auditEvent,
diff --git a/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/SPInteractions.java b/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/SPInteractions.java
@@ -11,14 +11,12 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jembi.jempi.AppConfig;
-import org.jembi.jempi.libmpi.MpiGeneralError;
 import org.jembi.jempi.linker.backend.BackEnd;
 import org.jembi.jempi.shared.models.CustomMU;
 import org.jembi.jempi.shared.models.InteractionEnvelop;
 import org.jembi.jempi.shared.serdes.JsonPojoDeserializer;
 import org.jembi.jempi.shared.serdes.JsonPojoSerializer;
 
-import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -48,6 +46,7 @@ private void linkPatient(
          final String key,
          final InteractionEnvelop interactionEnvelop) {
 
+/*
       if (interactionEnvelop.contentType() == InteractionEnvelop.ContentType.BATCH_START_SENTINEL
               || interactionEnvelop.contentType() == BATCH_END_SENTINEL) {
          final var completableFuture = Ask.runStartEndHooks(system, backEnd, key, interactionEnvelop).toCompletableFuture();
@@ -61,6 +60,7 @@ private void linkPatient(
             this.close();
          }
       }
+*/
 
       if (interactionEnvelop.contentType() != BATCH_INTERACTION) {
 
diff --git a/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/backend/CustomLinkerBackEnd.java b/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/backend/CustomLinkerBackEnd.java
diff --git a/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/backend/LinkerCR.java b/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/backend/LinkerCR.java
diff --git a/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/backend/LinkerDWH.java b/JeMPI_Apps/JeMPI_Linker/src/main/java/org/jembi/jempi/linker/backend/LinkerDWH.java
diff --git a/JeMPI_Apps/pom.xml b/JeMPI_Apps/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private object CustomPatient {`
`61`	`61`	`)`
`62`	`62`	`}`
`63`	`63`	`writer.println()`
`64`		`- for (field <- config.demographicFields) {`
	`64`	`+ /* for (field <- config.demographicFields) {`
`65`	`65`	`val typeString = field.fieldType`
`66`	`66`	`val fieldName = Utils.snakeCaseToCamelCase(field.fieldName)`
`67`	`67`	`writer.println(`
`@@ -73,7 +73,7 @@ private object CustomPatient {`
`73`	`73`	`\|""".stripMargin`
`74`	`74`	`)`
`75`	`75`	`}`
`76`		`-`
	`76`	`+ */`
`77`	`77`	`writer.println(`
`78`	`78`	`s"""${" " * indent * 1}public $customClassNameCustomDemographicData() {""".stripMargin`
`79`	`79`	`)`
`@@ -83,6 +83,20 @@ private object CustomPatient {`
`83`	`83`	`\|""".stripMargin`
`84`	`84`	`)`
`85`	`85`
	`86`	`+ writer.print(`
	`87`	`+ s"""${" " * indent * 1}public $customClassNameCustomDemographicData(final $customClassNameCustomDemographicData demographicData) {"""`
	`88`	`+ )`
	`89`	`+ config.demographicFields.zipWithIndex.foreach { case (field, idx) =>`
	`90`	`+ val fieldName = Utils.snakeCaseToCamelCase(field.fieldName)`
	`91`	`+ writer.print(`
	`92`	`+ s"""`
	`93`	`+ \|${" " * indent * 2}this.$fieldName = demographicData.$fieldName;""".stripMargin`
	`94`	`+ )`
	`95`	`+ }`
	`96`	`+ writer.println(s"""`
	`97`	`+ \|${" " * indent * 1}}`
	`98`	`+ \|""".stripMargin)`
	`99`	`+`
`86`	`100`	`writer.println(`
`87`	`101`	`s"""${" " * indent * 1}public $customClassNameCustomDemographicData(""".stripMargin`
`88`	`102`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,10 @@ private object CustomPostgresqlGoldenRecord {`
`23`	`23`	`\|final class $customClassName extends CustomDemographicData implements NodeData {`
`24`	`24`	`\|`
`25`	`25`	`\| $customClassName(final CustomDemographicData customDemographicData) {`
`26`		`- \| super(${fields`
`27`		`- .map(field =>`
`28`		`- s"""customDemographicData.${Utils.snakeCaseToCamelCase(`
`29`		`- field.fieldName`
`30`		`- )}"""`
`31`		`- )`
`32`		`- .mkString(s",${sys.props("line.separator")} ")});`
	`26`	`+ \| super(customDemographicData);`
`33`	`27`	`\| }`
`34`	`28`	`\|`
`35`		`- \|}`
`36`		`- \|""".stripMargin`
	`29`	`+ \|}""".stripMargin`
`37`	`30`	`)`
`38`	`31`	`writer.close()`
`39`	`32`	`}`