Taking into account unique indexes

Author: walisc

JeMPI_Apps/JeMPI_Configuration/src/main/scala/configuration/CustomDgraphIndexes.scala

@@ -86,6 +86,20 @@ private object CustomDgraphIndexes {
               write_field_with_index(field, "Interaction", indexPropsOpt.get.props, 30)
             }
           })
+
+          val index_to_remove = config.demographicFields.filter(f => !index_names.contains(f.fieldName))
+          index_to_remove.foreach(field => {
+              val indexGoldenRecord = field.indexGoldenRecord.getOrElse("")
+              val indexInteraction = field.indexInteraction.getOrElse("")
+
+              if (indexGoldenRecord != "") {
+                write_field_without_index(field, "GoldenRecord", indexGoldenRecord, 29)
+              }
+
+              if (indexInteraction != "") {
+                write_field_without_index(field, "Interaction", indexInteraction, 30)
+              }
+            })
         }
 
         writer.println(
@@ -118,6 +132,8 @@ private object CustomDgraphIndexes {
                 }
               })
 
+              removeUniqueIndexes()
+
             writer.println(
               s"""
                  |         \"\"\";
@@ -150,7 +166,22 @@ private object CustomDgraphIndexes {
         )
       }
 
-  }
+      def removeUniqueIndexes(): Unit = {
+        List(config.indexes.linking, config.indexes.matching).foreach(indexsObjOption => {
+          if (indexsObjOption.isDefined) {
+            val indexsObj = indexsObjOption.get
 
+            val index_names = indexsObj.keySet
+            val uniqueIndexes = config.demographicFields.filter(f => index_names.contains(f.fieldName) && f.indexGoldenRecord.getOrElse("") == "" && f.indexInteraction.getOrElse("") == "")
+
+            uniqueIndexes.foreach(field => {
+              write_field_without_index(field, "GoldenRecord", "", 29)
+              write_field_without_index(field, "Interaction", "", 30)
+            })
+
+          }
+        })
+      }
+  }
 
 }

JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/dgraph/CustomDgraphIndexes.java

@@ -45,6 +45,13 @@ public static Boolean shouldUpdateLinkingIndexes() {
 
          GoldenRecord.national_id:                  string    @index(exact,trigram)              .
          Interaction.national_id:                   string    @index(exact,trigram)              .
+         GoldenRecord.given_name:                   string                                       .
+         Interaction.given_name:                    string                                       .
+         GoldenRecord.family_name:                  string                                       .
+         Interaction.family_name:                   string                                       .
+         GoldenRecord.gender:                       string                                       .
+         GoldenRecord.city:                         string                                       .
+         GoldenRecord.phone_number:                 string                                       .
 
          """;
 

JeMPI_Apps/JeMPI_LibMPI/src/main/java/org/jembi/jempi/libmpi/dgraph/DgraphMutations.java

@@ -408,7 +408,6 @@ public Option<MpiGeneralError> deleteAllIndexes() {
 
    public Option<MpiGeneralError> loadLinkingIndexes() {
       try {
-         deleteAllIndexes();
          final DgraphProto.Operation operation = DgraphProto.Operation.newBuilder().setSchema(CustomDgraphIndexes.LOAD_LINKING_INDEXES).build();
          DgraphClient.getInstance().alter(operation);
          final var mySchema = DgraphProto.Operation.newBuilder().getSchema();
@@ -423,7 +422,6 @@ public Option<MpiGeneralError> loadLinkingIndexes() {
 
    public Option<MpiGeneralError> loadDefaultIndexes() {
       try {
-         deleteAllIndexes();
          final DgraphProto.Operation operation = DgraphProto.Operation.newBuilder().setSchema(CustomDgraphIndexes.LOAD_DEFAULT_INDEXES).build();
          DgraphClient.getInstance().alter(operation);
          final var mySchema = DgraphProto.Operation.newBuilder().getSchema();