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_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": {

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

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,

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