Merge branch 'dev' into CU-86bznypcf_Notifications-End-To-End-Testing

jembi · Jul 29, 2024 · c14e8a2 · c14e8a2
2 parents 67b2966 + 26c3d54
commit c14e8a2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/linker/Programs.java b/JeMPI_Apps/JeMPI_LibShared/src/main/java/org/jembi/jempi/shared/config/linker/Programs.java
@@ -130,6 +130,17 @@ private static String postfixToInfix1(
                }
                evalStack.push("uid(%c)".formatted('A' + i));
             }
+         } else if (s.startsWith("null(")) {
+            final var pattern = Pattern.compile("^null\\((?<field>\\w+)\\)$");
+            final var matcher = pattern.matcher(s);
+            if (matcher.find()) {
+               final var field = matcher.group("field");
+               int i = 0;
+               while (i < vars.size() && !field.equals(vars.get(i))) {
+                  i++;
+               }
+               evalStack.push("uid(%c)".formatted('A' + i));
+            }
          } else {
             final var operand1 = evalStack.pop();
             final var operand2 = evalStack.pop();
@@ -402,8 +413,8 @@ public static List<DeterministicProgram> generateDeterministicPrograms(
                } else {
                   LOGGER.error("Match error: [{}]", s);
                }
-            } else if (s.startsWith("isNull")) {
-               final var pattern = Pattern.compile("^isNull\\((?<field>\\w+)\\)$");
+            } else if (s.startsWith("null")) {
+               final var pattern = Pattern.compile("^null\\((?<field>\\w+)\\)$");
                final var matcher = pattern.matcher(s);
                if (matcher.find()) {
                   final var field = matcher.group("field");

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
@@ -238,8 +238,14 @@ private static Either<List<ExternalLinkCandidate>, LinkInfo> doMatch(
                LOGGER.error("matchNotificationProducer failed with error: {}", e.getLocalizedMessage());
             }
          }
+         return Either.left(List.of());
+      } else {
+         //create golden record when only link deterministic rules exist and no match rules configured
+         var linkInfo = libMPI.createInteractionAndLinkToClonedGoldenRecord(interaction, 1.0F);
+         return linkInfo == null
+               ? Either.left(List.of())
+               : Either.right(linkInfo);
       }
-      return Either.left(List.of());
    }
 
    /**

diff --git a/devops/JeMPI_TestData/Reference/DataGenerator.py b/devops/JeMPI_TestData/Reference/DataGenerator.py
@@ -8,10 +8,11 @@
 
 
 def generate_dataset():
+    rec_start_num=61000
     config = \
         {"BaseDate": "2022-01-01",
-         "NumberOfPatients": 500,
-         "AverageNumberOfClinicalRecordsPerPatient": 4,
+         "NumberOfPatients": 83334,
+         "AverageNumberOfClinicalRecordsPerPatient": 6,
          "PercentageOfCorruptedRecords": 0.3,
          "fields": [
              {"name": "given_name",
@@ -121,7 +122,7 @@ def generate_dataset():
         national_id = national_id_generator.send((dob, gender))
         clinical_data = clinical_data_generator.send((gender, base_date, dob, national_id))
         for j in range(0, len(clinical_data)):
-            rec_num = "rec-%010d-%02d" % (i + 1, j)
+            rec_num = "rec-%010d-%02d" % (i + 1 + rec_start_num, j)
             facility = clinical_data[j]['facility']
             patient_id = clinical_data[j]['patient_id']
             c_data = clinical_data[j]['clinical_data']
@@ -134,7 +135,8 @@ def generate_dataset():
     df = pd.DataFrame(data, columns=['rec_num', 'given_name', 'family_name', 'gender', 'dob',
                                      'city', 'phone_number', 'national_id',
                                      'src_id_facility', 'src_id_patient', 'clinical_data'])
-
+
+    df = df.sample(frac=1).reset_index(drop=True)
     df['corrupted'] = False
     number_of_records = df.shape[0]
     percentage_of_corrupted_records = config['PercentageOfCorruptedRecords']

diff --git a/devops/linux/docker/data-config/config.json b/devops/linux/docker/data-config/config.json
@@ -1 +1 @@
-config-reference-link-dp.json
+config-reference-link-d.json