openchs-models 1.31.34 → 1.31.36

package/.editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = LF
 charset = utf-8
 trim_trailing_whitespace = true

package/dist/Schema.js

@@ -221,29 +221,6 @@ function migrateListTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creator
 }
 
 function migrateEmbeddedObjects(oldDB, newDB) {
-  _MetaDataService.default.forEachObservationField((observationField, schemaName) => {
-    migrateListTypeFieldToEmbedded(newDB, oldDB, schemaName, observationField, old => {
-      const newConcept = newDB.objects("Concept").filtered(`uuid = "${old.concept.uuid}"`)[0];
-      return {
-        concept: newConcept,
-        valueJSON: old.valueJSON
-      };
-    });
-  });
-
-  newDB.deleteModel("Observation");
-
-  _MetaDataService.default.forEachPointField((field, schemaName) => {
-    migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, old => {
-      return {
-        x: old.x,
-        y: old.y
-      };
-    });
-  });
-
-  newDB.deleteModel("Point");
-
   _MetaDataService.default.forEachFormatField((field, schemaName) => {
     migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, old => {
       return {
@@ -298,10 +275,77 @@ function migrateEmbeddedObjects(oldDB, newDB) {
   newDB.deleteModel("StringKeyNumericValue");
 }
 
+function flush(db) {
+  db.commitTransaction();
+  db.beginTransaction();
+}
+
+function shouldFlush(numberOfRecords) {
+  const batchSize = 100;
+  return numberOfRecords % batchSize === batchSize - 1;
+}
+
+function migrateGeoLocation(oldDB, newDB) {
+  flush(newDB);
+  let recordCounter = 0;
+
+  _MetaDataService.default.forEachPointField((field, schemaName) => {
+    console.log(`schema: ${schemaName}, field: ${field}`);
+    newDB.objects(schemaName).forEach(newDbParentEntity => {
+      if (shouldFlush(recordCounter)) {
+        flush(newDB);
+      }
+
+      const oldFieldValue = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0][field];
+
+      if (!_lodash.default.isNil(oldFieldValue)) {
+        newDbParentEntity[field] = {
+          x: oldFieldValue.x,
+          y: oldFieldValue.y
+        };
+      }
+
+      recordCounter++;
+    });
+  });
+
+  flush(newDB);
+  newDB.deleteModel("Point");
+}
+
+function migrateObservationsToEmbedded(oldDB, newDB) {
+  flush(newDB);
+  let recordCounter = 0;
+
+  _MetaDataService.default.forEachObservationField((observationField, schemaName) => {
+    console.log(`schema: ${schemaName}, field: ${observationField}`);
+    newDB.objects(schemaName).forEach(newDbParentEntity => {
+      if (shouldFlush(recordCounter)) {
+        flush(newDB);
+      }
+
+      const newList = [];
+      const oldFieldValues = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0][observationField];
+      oldFieldValues.forEach(oldFieldValue => {
+        const newConcept = newDB.objects("Concept").filtered(`uuid = "${oldFieldValue.concept.uuid}"`)[0];
+        newList.push({
+          concept: newConcept,
+          valueJSON: oldFieldValue.valueJSON
+        });
+      });
+      newDbParentEntity[observationField] = newList;
+      recordCounter++;
+    });
+  });
+
+  flush(newDB);
+  newDB.deleteModel("Observation");
+}
+
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 184,
+    schemaVersion: 186,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -913,6 +957,14 @@ function createRealmConfig() {
       if (oldDB.schemaVersion < 184) {
         migrateEmbeddedObjects(oldDB, newDB);
       }
+
+      if (oldDB.schemaVersion < 185) {
+        migrateGeoLocation(oldDB, newDB);
+      }
+
+      if (oldDB.schemaVersion < 186) {
+        migrateObservationsToEmbedded(oldDB, newDB);
+      }
     }
   };
 }

package/dist/application/Form.js

@@ -66,14 +66,6 @@ class Form extends _BaseEntity.default {
     this.that.decisionRule = x;
   }
 
-  get editFormRule() {
-    return this.that.editFormRule;
-  }
-
-  set editFormRule(x) {
-    this.that.editFormRule = x;
-  }
-
   get visitScheduleRule() {
     return this.that.visitScheduleRule;
   }
@@ -126,7 +118,7 @@ class Form extends _BaseEntity.default {
       this.deleteOutOfSyncDrafts(entityService, resource.uuid);
     }
 
-    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
+    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
   static deleteOutOfSyncDrafts(entityService, formUUID) {
@@ -356,10 +348,6 @@ _defineProperty(Form, "schema", {
       type: "string",
       optional: true
     },
-    editFormRule: {
-      type: "string",
-      optional: true
-    },
     visitScheduleRule: {
       type: "string",
       optional: true

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.31.34",
+    "version": "1.31.36",
     "private": false,
     "repository": {
         "type": "git",