Merge branch 'dev' into CU-86bzu8m1g_Increase-Lease-in-Dgraph-while-r…

…estoring-Backup-using-API
jembi · Oct 15, 2024 · 66f0152 · 66f0152
2 parents f7fb857 + ad7083b
commit 66f0152
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 40 deletions.
diff --git a/JeMPI_Apps/JeMPI_AsyncReceiver/src/main/java/org/jembi/jempi/async_receiver/Main.java b/JeMPI_Apps/JeMPI_AsyncReceiver/src/main/java/org/jembi/jempi/async_receiver/Main.java
@@ -15,6 +15,7 @@
 import org.jembi.jempi.shared.serdes.JsonPojoSerializer;
 import org.jembi.jempi.shared.utils.AppUtils;
 import org.apache.commons.codec.language.Soundex;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.nio.file.*;
@@ -153,28 +154,7 @@ private void apacheReadCSV(
 
             for (CSVRecord csvRecord : csvParser) {
                final var patientRecord = demographicData(csvRecord);
-               String givenName = patientRecord.fields.stream()
-                  .filter(field -> "given_name".equals(field.ccTag()))
-                  .map(DemographicData.DemographicField::value)
-                  .findFirst()
-                  .orElse("");
-               String familyName = patientRecord.fields.stream()
-                  .filter(field -> "family_name".equals(field.ccTag()))
-                  .map(DemographicData.DemographicField::value)
-                  .findFirst()
-                  .orElse("");
-
-               String partitionKey = "";
-               if (!givenName.isEmpty()) {
-                  partitionKey += new Soundex().soundex(givenName);
-               }
-               if (!familyName.isEmpty()) {
-                  partitionKey += new Soundex().soundex(familyName);
-               }
-               if (givenName.isEmpty() && familyName.isEmpty()) {
-                  partitionKey += "Unknown";
-               }
-               LOGGER.info("Using Kafka topic/partition: " + partitionKey);
+               String partitionKey = generateKafkaPartitionKey(patientRecord);
 
                final var interactionEnvelop = new InteractionEnvelop(InteractionEnvelop.ContentType.BATCH_INTERACTION,
                                                                      tag,
@@ -203,6 +183,30 @@ private void apacheReadCSV(
       }
    }
 
+   private static @NotNull String generateKafkaPartitionKey(final DemographicData patientRecord) {
+      StringBuilder partitionKey = new StringBuilder();
+
+      for (String field : FIELDS_CONFIG.fieldsForKafkaKeyGen) {
+         String value = patientRecord.fields.stream()
+                                            .filter(fieldData -> field.equals(fieldData.ccTag()))
+                                            .map(DemographicData.DemographicField::value)
+                                            .findFirst()
+                                            .orElse("");
+
+         if (!value.isEmpty()) {
+            partitionKey.append(new Soundex().soundex(value));
+         }
+      }
+
+      if (partitionKey.length() == 0) {
+         partitionKey.append("Unknown");
+      }
+
+      String partitionKeyStr = partitionKey.toString();
+      LOGGER.info("Using Kafka topic/partition: {}", partitionKeyStr);
+      return partitionKeyStr;
+   }
+
    private String updateStan(
          final String stanDate,
          final int recCount) {

diff --git a/JeMPI_Apps/JeMPI_EM_Scala/src/main/scala/org/jembi/jempi/em/config/Config.scala b/JeMPI_Apps/JeMPI_EM_Scala/src/main/scala/org/jembi/jempi/em/config/Config.scala
@@ -61,9 +61,11 @@ case class Rules(
 )
 
 case class Config(
-    auxInteractionFields: Option[Array[auxField]],
-    auxGoldenRecordFields: Option[Array[auxField]],
-    additionalNodes: Option[Array[AdditionalNode]],
-    demographicFields: Array[DemographicField],
-    rules: Rules
+                   auxInteractionFields: Option[Array[auxField]],
+                   auxGoldenRecordFields: Option[Array[auxField]],
+                   additionalNodes: Option[Array[AdditionalNode]],
+                   demographicFields: Array[DemographicField],
+                   rules: Rules,
+                   fieldsForKafkaKeyGen: Option[List[String]],
+                   nameFieldsForNotificationDisplay: Option[List[String]]
 )
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/FieldsConfig.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/FieldsConfig.java
@@ -31,6 +31,8 @@ public final class FieldsConfig {
    public final List<AuxField> userAuxInteractionFields;
    public final List<AuxField> userAuxGoldenRecordFields;
    public final List<DemographicField> demographicFields;
+   public final List<String> fieldsForKafkaKeyGen;
+   public final List<String> nameFieldsForNotificationDisplay;
    public final List<AdditionalNode> additionalNodes;
 
    public FieldsConfig(final JsonConfig jsonConfig) {
@@ -88,6 +90,13 @@ public FieldsConfig(final JsonConfig jsonConfig) {
                        );
       optionalInteractionAuxIdIdx = auxInteractionAuxIdIdx[0];
 
+      fieldsForKafkaKeyGen = jsonConfig.fieldsForKafkaKeyGen() != null
+            ? List.copyOf(jsonConfig.fieldsForKafkaKeyGen())
+            : List.of();
+
+      nameFieldsForNotificationDisplay = jsonConfig.nameFieldsForNotificationDisplay() != null
+            ? List.copyOf(jsonConfig.nameFieldsForNotificationDisplay())
+            : List.of();
 
       demographicFields = jsonConfig.demographicFields()
                                     .stream()

diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/input/JsonConfig.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/input/JsonConfig.java
@@ -19,6 +19,8 @@ public record JsonConfig(
       @JsonProperty("auxGoldenRecordFields") List<AuxGoldenRecordField> auxGoldenRecordFields,
       List<AdditionalNode> additionalNodes,
       List<DemographicField> demographicFields,
+      @JsonProperty("fieldsForKafkaKeyGen") List<String> fieldsForKafkaKeyGen,
+      @JsonProperty("nameFieldsForNotificationDisplay") List<String> nameFieldsForNotificationDisplay,
       Rules rules) {
 
    private static final Logger LOGGER = LogManager.getLogger(JsonConfig.class);

diff --git a/...LibShared/src/main/java/org/jembi/jempi/shared/config/input/NameFieldsForKafkaKeyGen.java b/...LibShared/src/main/java/org/jembi/jempi/shared/config/input/NameFieldsForKafkaKeyGen.java
@@ -0,0 +1,10 @@
+package org.jembi.jempi.shared.config.input;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+   public record NameFieldsForKafkaKeyGen(
+         List<String> nameFieldsForKafkaKeyGen
+         ) {
+   }
diff --git a/..._Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/ConfigurationModel.java b/..._Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/models/ConfigurationModel.java
@@ -16,6 +16,8 @@ public record Configuration(
                         List<Field> auxGoldenRecordFields,
                         List<Node> additionalNodes,
                         List<DemographicField> demographicFields,
+                        List<String> fieldsForKafkaKeyGen,
+                        List<String> nameFieldsForNotificationDisplay,
                         Rules rules) {
         }
 

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
@@ -95,17 +95,17 @@ private static boolean helperUpdateGoldenRecordField(
 
    private static String patientName(final Interaction interaction) {
       var patientRecord = interaction.demographicData();
-      String givenName = patientRecord.fields.stream()
-         .filter(field -> "given_name".equals(field.ccTag()))
-         .map(DemographicData.DemographicField::value)
-         .findFirst()
-         .orElse("");
-      String familyName = patientRecord.fields.stream()
-         .filter(field -> "family_name".equals(field.ccTag()))
-         .map(DemographicData.DemographicField::value)
-         .findFirst()
-         .orElse("");
-         return (givenName + " " + familyName).trim();
+      Map<String, String> fieldMap = patientRecord.fields.stream()
+                                                         .collect(Collectors.toMap(DemographicData.DemographicField::ccTag,
+                                                                                   DemographicData.DemographicField::value));
+
+      String patientDisplayName = FIELDS_CONFIG.nameFieldsForNotificationDisplay.stream()
+                                                                                .map(fieldName -> fieldMap.getOrDefault(fieldName,
+                                                                                                                        ""))
+                                                                                .filter(StringUtils::isNotBlank)
+                                                                                .collect(Collectors.joining(" "))
+                                                                                .trim();
+      return patientDisplayName;
    }
 
    /**

diff --git a/devops/linux/docker/data-config/config-reference-auto-generate-fields.json b/devops/linux/docker/data-config/config-reference-auto-generate-fields.json
@@ -135,6 +135,14 @@
       "indexGoldenRecord": "@index(exact)"
     }
   ],
+  "fieldsForKafkaKeyGen": [
+    "given_name",
+    "family_name"
+  ],
+  "nameFieldsForNotificationDisplay": [
+    "given_name",
+    "family_name"
+  ],
   "rules": {
     "link": {
       "deterministic": [

diff --git a/devops/linux/docker/data-config/config-reference-link-d-validate-dp-match-dp.json b/devops/linux/docker/data-config/config-reference-link-d-validate-dp-match-dp.json
@@ -222,6 +222,14 @@
       "matchMetaData": null
     }
   ],
+  "fieldsForKafkaKeyGen": [
+    "given_name",
+    "family_name"
+  ],
+  "nameFieldsForNotificationDisplay": [
+    "given_name",
+    "family_name"
+  ],
   "rules": {
     "link": {
       "deterministic": [

diff --git a/devops/linux/docker/data-config/config-reference-link-d.json b/devops/linux/docker/data-config/config-reference-link-d.json
@@ -113,6 +113,14 @@
       "indexGoldenRecord": "@index(exact)"
     }
   ],
+  "fieldsForKafkaKeyGen": [
+    "given_name",
+    "family_name"
+  ],
+  "nameFieldsForNotificationDisplay": [
+    "given_name",
+    "family_name"
+  ],
   "rules": {
     "link": {
       "deterministic": [

diff --git a/devops/linux/docker/data-config/config-reference-link-dp-minimal.json b/devops/linux/docker/data-config/config-reference-link-dp-minimal.json
@@ -189,6 +189,14 @@
       }
     }
   ],
+  "fieldsForKafkaKeyGen": [
+    "given_name",
+    "family_name"
+  ],
+  "nameFieldsForNotificationDisplay": [
+    "given_name",
+    "family_name"
+  ],
   "rules": {
     "link": {
       "deterministic": [

diff --git a/devops/linux/docker/data-config/config-reference-link-dp.json b/devops/linux/docker/data-config/config-reference-link-dp.json
@@ -174,6 +174,14 @@
       }
     }
   ],
+  "fieldsForKafkaKeyGen": [
+    "given_name",
+    "family_name"
+  ],
+  "nameFieldsForNotificationDisplay": [
+    "given_name",
+    "family_name"
+  ],
   "rules": {
     "link": {
       "deterministic": [

diff --git a/devops/linux/docker/deployment/install_from_scratch/d-stack-1-create-db-build-all-reboot.sh b/devops/linux/docker/deployment/install_from_scratch/d-stack-1-create-db-build-all-reboot.sh
@@ -30,5 +30,3 @@ source ../scripts/d-stack-up-keycloak-containers.sh
 sleep 2
 source ../scripts/d-stack-up-app-containers.sh
 sleep 2
-source ../../helper/keycloak/start-keycloak-test-server.sh
-sleep 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,3 @@ source ../scripts/d-stack-up-keycloak-containers.sh @@
     sleep 2
     source ../scripts/d-stack-up-app-containers.sh
     sleep 2
-    source ../../helper/keycloak/start-keycloak-test-server.sh
-    sleep 2