avniproject/avni-product#1561 - reverted observation and point as emb…

…edded. updated schema version for skipping 185.
avniproject · Mar 21, 2024 · b89ae54 · b89ae54
1 parent 068dc82
commit b89ae54
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 118 deletions.
diff --git a/src/AddressLevel.js b/src/AddressLevel.js
@@ -80,7 +80,7 @@ class AddressLevel extends BaseEntity {
       level: "double",
       type: {type: "string", optional: true},
       locationMappings: {type: "list", objectType: "LocationMapping"},
-      locationProperties: {type: "list", objectType: "EmbeddedObservation"},
+      locationProperties: {type: "list", objectType: "Observation"},
       titleLineage: {type: "string", optional: true},
       voided: {type: "bool", default: false},
       parentUuid: {type: "string", optional: true},

diff --git a/src/ChecklistItem.js b/src/ChecklistItem.js
@@ -24,7 +24,7 @@ class ChecklistItem extends BaseEntity {
             uuid: "string",
             detail: "ChecklistItemDetail",
             completionDate: {type: "date", optional: true},
-            observations: {type: "list", objectType: "EmbeddedObservation"},
+            observations: {type: "list", objectType: "Observation"},
             checklist: "Checklist",
             approvalStatuses: {type: "list", objectType: "EntityApprovalStatus"},
             latestEntityApprovalStatus: {type: "EntityApprovalStatus", optional: true},  //Reporting purposes

diff --git a/src/Encounter.js b/src/Encounter.js
@@ -20,14 +20,14 @@ class Encounter extends AbstractEncounter {
       encounterType: "EncounterType",
       encounterDateTime: {type: "date", optional: true},
       individual: SchemaNames.Individual,
-      observations: {type: "list", objectType: "EmbeddedObservation"},
-      encounterLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+      observations: {type: "list", objectType: "Observation"},
+      encounterLocation: {type: SchemaNames.Point, optional: true},
       name: {type: "string", optional: true},
       earliestVisitDateTime: {type: "date", optional: true},
       maxVisitDateTime: {type: "date", optional: true},
       cancelDateTime: {type: "date", optional: true},
-      cancelObservations: {type: "list", objectType: "EmbeddedObservation"},
-      cancelLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+      cancelObservations: {type: "list", objectType: "Observation"},
+      cancelLocation: {type: SchemaNames.Point, optional: true},
       voided: {type: "bool", default: false},
       approvalStatuses: {type: "list", objectType: "EntityApprovalStatus"},
       latestEntityApprovalStatus: {type: "EntityApprovalStatus", optional: true}, //Reporting purposes

diff --git a/src/Family.js b/src/Family.js
@@ -29,7 +29,7 @@ class Family extends BaseEntity {
       typeOfFamily: "string",
       householdNumber: "string",
       members: { type: "list", objectType: "Individual" },
-      observations: { type: "list", objectType: "EmbeddedObservation" },
+      observations: { type: "list", objectType: "Observation" },
     },
   };
 

diff --git a/src/Individual.js b/src/Individual.js
@@ -52,10 +52,10 @@ class Individual extends BaseEntity {
       voided: {type: "bool", default: false},
       enrolments: {type: "list", objectType: SchemaNames.ProgramEnrolment},
       encounters: {type: "list", objectType: SchemaNames.Encounter},
-      observations: {type: "list", objectType: "EmbeddedObservation"},
+      observations: {type: "list", objectType: "Observation"},
       relationships: {type: "list", objectType: "IndividualRelationship"},
       groupSubjects: {type: "list", objectType: "GroupSubject"},
-      registrationLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+      registrationLocation: {type: SchemaNames.Point, optional: true},
       comments: {type: "list", objectType: "Comment"},
       groups: {type: "list", objectType: "GroupSubject"},
       approvalStatuses: {type: "list", objectType: "EntityApprovalStatus"},

diff --git a/src/Observation.js b/src/Observation.js
@@ -14,8 +14,7 @@ const clone = function (concept, valueJSON) {
 
 class Observation extends PersistedObject {
     static schema = {
-        name: "EmbeddedObservation",
-        embedded: true,
+        name: "Observation",
         properties: {
             concept: "Concept",
             valueJSON: "string",

diff --git a/src/ProgramEncounter.js b/src/ProgramEncounter.js
@@ -32,11 +32,11 @@ class ProgramEncounter extends AbstractEncounter {
             maxVisitDateTime: {type: "date", optional: true},
             encounterDateTime: {type: "date", optional: true},
             programEnrolment: SchemaNames.ProgramEnrolment,
-            observations: {type: "list", objectType: "EmbeddedObservation"},
+            observations: {type: "list", objectType: "Observation"},
             cancelDateTime: {type: "date", optional: true},
-            cancelObservations: {type: "list", objectType: "EmbeddedObservation"},
-            encounterLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
-            cancelLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+            cancelObservations: {type: "list", objectType: "Observation"},
+            encounterLocation: {type: SchemaNames.Point, optional: true},
+            cancelLocation: {type: SchemaNames.Point, optional: true},
             voided: {type: "bool", default: false},
             approvalStatuses: {type: "list", objectType: "EntityApprovalStatus"},
             latestEntityApprovalStatus: {type: "EntityApprovalStatus", optional: true},  //Reporting purposes

diff --git a/src/ProgramEnrolment.js b/src/ProgramEnrolment.js
@@ -32,15 +32,15 @@ class ProgramEnrolment extends BaseEntity {
             uuid: "string",
             program: "Program",
             enrolmentDateTime: "date",
-            observations: {type: "list", objectType: "EmbeddedObservation"},
+            observations: {type: "list", objectType: "Observation"},
             programExitDateTime: {type: "date", optional: true},
-            programExitObservations: {type: "list", objectType: "EmbeddedObservation"},
+            programExitObservations: {type: "list", objectType: "Observation"},
             programOutcome: {type: "ProgramOutcome", optional: true},
             encounters: {type: "list", objectType: SchemaNames.ProgramEncounter},
             checklists: {type: "list", objectType: "Checklist"},
             individual: "Individual",
-            enrolmentLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
-            exitLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+            enrolmentLocation: {type: SchemaNames.Point, optional: true},
+            exitLocation: {type: SchemaNames.Point, optional: true},
             voided: {type: "bool", default: false},
             approvalStatuses: {type: "list", objectType: "EntityApprovalStatus"},
             latestEntityApprovalStatus: {type: "EntityApprovalStatus", optional: true},   //Reporting purposes

diff --git a/src/Schema.js b/src/Schema.js
@@ -249,82 +249,6 @@ 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);
-}
-
-export function createTransactionDataMapForEmbeddedFields() {
-    const map = new Map();
-    MetaDataService.forEachPointField((fieldName, schemaName) => {
-        if (map.has(schemaName)) {
-            map.get(schemaName).push({fieldName, fieldType: "Point"});
-        } else {
-            map.set(schemaName, [{fieldName, fieldType: "Point"}]);
-        }
-    });
-    MetaDataService.forEachObservationField((fieldName, schemaName) => {
-        if (map.has(schemaName)) {
-            map.get(schemaName).push({fieldName, fieldType: "Obs"});
-        } else {
-            map.set(schemaName, [{fieldName, fieldType: "Obs"}]);
-        }
-    });
-    return map;
-}
-
-function migrateAllEmbeddedForTxnData(oldDB, newDB) {
-    const startTime = new Date();
-    flush(newDB);
-    const map = createTransactionDataMapForEmbeddedFields();
-
-    let recordCounter = 0;
-    const conceptMap = new Map();
-    map.forEach((fields, schemaName) => {
-        console.log(`schema: ${schemaName}, fields: ${fields.length}`);
-        newDB.objects(schemaName).forEach((newDbParentEntity) => {
-            if (shouldFlush(recordCounter)) {
-                flush(newDB);
-            }
-            fields.forEach((field) => {
-                const oldEntity = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0];
-                const oldValue = oldEntity[field.fieldName];
-                if (!_.isNil(oldValue)) {
-                    if (field.fieldType === "Point")
-                        newDbParentEntity[field.fieldName] = {x: oldValue.x, y: oldValue.y};
-                    else {
-                        const newObsList = [];
-                        oldValue.forEach((oldItemValue) => {
-                            let newConcept = conceptMap.get(oldItemValue.concept.uuid);
-                            if (_.isNil(newConcept)) {
-                                newConcept = newDB.objects("Concept").filtered(`uuid = "${oldItemValue.concept.uuid}"`)[0];
-                                conceptMap.set(oldItemValue.concept.uuid, newConcept);
-                            }
-                            newObsList.push({
-                                concept: newConcept,
-                                valueJSON: oldItemValue.valueJSON
-                            });
-                        });
-                        newDbParentEntity[field.fieldName] = newObsList;
-                    }
-                }
-            });
-            recordCounter++;
-        });
-    });
-    flush(newDB);
-    newDB.deleteModel("Point");
-    newDB.deleteModel("Observation");
-    const endTime = new Date();
-    const diff = moment(endTime).diff(startTime, "seconds", true);
-    console.log("Total Time Taken", diff, "seconds");
-}
-
 function createRealmConfig() {
     return {
         shouldCompact: function (totalBytes, usedBytes) {
@@ -333,7 +257,7 @@ function createRealmConfig() {
             return doCompact;
         },
         //order is important, should be arranged according to the dependency
-        schemaVersion: 185,
+        schemaVersion: 186,
         onMigration: function (oldDB, newDB) {
             console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
             if (oldDB.schemaVersion < 10) {
@@ -973,7 +897,7 @@ function createRealmConfig() {
                 migrateEmbeddedObjects(oldDB, newDB);
             }
             if (oldDB.schemaVersion < 185) {
-                migrateAllEmbeddedForTxnData(oldDB, newDB);
+                // removed migration code. keeping the version number in case this number is required for any checks later
             }
         },
     };

diff --git a/src/SchemaNames.js b/src/SchemaNames.js
@@ -40,7 +40,7 @@ class SchemaNames {
   static Comment = "Comment";
   static Concept = "Concept";
   static EntityApprovalStatus = "EntityApprovalStatus";
-  static EmbeddedPoint = "EmbeddedPoint";
+  static Point = "Point";
 }
 
 export default SchemaNames;
diff --git a/src/draft/DraftEncounter.js b/src/draft/DraftEncounter.js
@@ -17,14 +17,14 @@ class DraftEncounter extends BaseEntity {
       encounterType: "EncounterType",
       encounterDateTime: {type: "date", optional: true},
       individual: "Individual",
-      observations: {type: "list", objectType: "EmbeddedObservation"},
-      encounterLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+      observations: {type: "list", objectType: "Observation"},
+      encounterLocation: {type: SchemaNames.Point, optional: true},
       name: {type: "string", optional: true},
       earliestVisitDateTime: {type: "date", optional: true},
       maxVisitDateTime: {type: "date", optional: true},
       cancelDateTime: {type: "date", optional: true},
-      cancelObservations: {type: "list", objectType: "EmbeddedObservation"},
-      cancelLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+      cancelObservations: {type: "list", objectType: "Observation"},
+      cancelLocation: {type: SchemaNames.Point, optional: true},
       voided: {type: "bool", default: false}
     },
   };

diff --git a/src/draft/DraftSubject.js b/src/draft/DraftSubject.js
@@ -23,8 +23,8 @@ class DraftSubject extends BaseEntity {
       gender: {type: "Gender", optional: true},
       registrationDate: "date",
       lowestAddressLevel: "AddressLevel",
-      observations: {type: "list", objectType: "EmbeddedObservation"},
-      registrationLocation: {type: SchemaNames.EmbeddedPoint, optional: true},
+      observations: {type: "list", objectType: "Observation"},
+      registrationLocation: {type: SchemaNames.Point, optional: true},
       updatedOn: "date",
       totalMembers: {type: "string", optional: true}
     },

diff --git a/src/geo/Point.js b/src/geo/Point.js
@@ -2,8 +2,7 @@ import PersistedObject from "../PersistedObject";
 
 class Point extends PersistedObject {
   static schema = {
-    name: "EmbeddedPoint",
-    embedded: true,
+    name: "Point",
     properties: {
       x: "double",
       y: "double",

diff --git a/src/program/SubjectProgramEligibility.js b/src/program/SubjectProgramEligibility.js
@@ -19,7 +19,7 @@ class SubjectProgramEligibility extends BaseEntity {
             program: "Program",
             checkDate: "date",
             eligible: {type: "bool", default: false},
-            observations: {type: "list", objectType: "EmbeddedObservation"},
+            observations: {type: "list", objectType: "Observation"},
             voided: {type: "bool", default: false},
             ...AuditFields
         },

diff --git a/src/relationship/IndividualRelationship.js b/src/relationship/IndividualRelationship.js
@@ -19,7 +19,7 @@ class IndividualRelationship extends BaseEntity {
             individualB: "Individual",
             enterDateTime: {type: "date", optional: true},
             exitDateTime: {type: "date", optional: true},
-            exitObservations: {type: "list", objectType: "EmbeddedObservation"},
+            exitObservations: {type: "list", objectType: "Observation"},
             voided: {type: "bool", default: false},
             ...AuditFields
         },

diff --git a/src/task/Task.ts b/src/task/Task.ts
@@ -22,9 +22,9 @@ class Task extends BaseEntity {
             taskStatus: "TaskStatus",
             scheduledOn: {type: "date"},
             completedOn: {type: "date", optional: true},
-            metadata: {type: "list", objectType: "EmbeddedObservation"},
+            metadata: {type: "list", objectType: "Observation"},
             subject: {type: 'Individual', optional: true},
-            observations: {type: "list", objectType: "EmbeddedObservation"},
+            observations: {type: "list", objectType: "Observation"},
             voided: {type: 'bool', default: false},
             ...AuditFields
         },

diff --git a/test/DefinedObjectSchemaTest.js b/test/DefinedObjectSchemaTest.js
@@ -18,7 +18,7 @@ const schema = {
     registrationDate: "date",
     lowestAddressLevel: {type: "AddressLevel", optional: false},
     enrolments: {type: "list", objectType: "Bar"},
-    registrationLocation: {type: SchemaNames.EmbeddedPoint, optional: true}
+    registrationLocation: {type: SchemaNames.Point, optional: true}
   }
 };
 

diff --git a/test/SchemaTest.js b/test/SchemaTest.js