openchs-models 1.31.57 → 1.31.58

package/dist/AbstractEncounter.js

@@ -412,19 +412,6 @@ class AbstractEncounter extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
-  updateAudit(userInfo, isNew, isGettingFilled) {
-    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
-
-    if (_lodash.default.isNil(this.filledByUUID) && isGettingFilled) {
-      this.filledByUUID = userInfo.userUUID;
-      this.filledBy = userInfo.name;
-    }
-  }
-
-  isFilled() {
-    return !_lodash.default.isNil(this.encounterDateTime);
-  }
-
 }
 
 _defineProperty(AbstractEncounter, "fieldKeys", {

package/dist/AddressLevel.js

@@ -261,7 +261,7 @@ _defineProperty(AddressLevel, "schema", {
     },
     locationProperties: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     titleLineage: {
       type: "string",

package/dist/ChecklistItem.js

@@ -362,7 +362,7 @@ _defineProperty(ChecklistItem, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     checklist: "Checklist",
     approvalStatuses: {

package/dist/Encounter.js

@@ -132,10 +132,10 @@ _defineProperty(Encounter, "schema", {
     individual: _SchemaNames.default.Individual,
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     name: {
@@ -156,10 +156,10 @@ _defineProperty(Encounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/Family.js

@@ -226,7 +226,7 @@ _defineProperty(Family, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     }
   }
 });

package/dist/Individual.js

@@ -1066,10 +1066,6 @@ class Individual extends _BaseEntity.default {
     return _SchemaNames.default.Individual;
   }
 
-  updateAudit(userInfo, isNew) {
-    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
-  }
-
 }
 
 _defineProperty(Individual, "schema", {
@@ -1120,7 +1116,7 @@ _defineProperty(Individual, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     relationships: {
       type: "list",
@@ -1131,7 +1127,7 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     comments: {

package/dist/Observation.js

@@ -261,7 +261,8 @@ class Observation extends _PersistedObject.default {
 }
 
 _defineProperty(Observation, "schema", {
-  name: "Observation",
+  name: "EmbeddedObservation",
+  embedded: true,
   properties: {
     concept: "Concept",
     valueJSON: "string"

package/dist/ProgramEncounter.js

@@ -194,7 +194,7 @@ _defineProperty(ProgramEncounter, "schema", {
     programEnrolment: _SchemaNames.default.ProgramEnrolment,
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelDateTime: {
       type: "date",
@@ -202,14 +202,14 @@ _defineProperty(ProgramEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/ProgramEnrolment.js

@@ -646,10 +646,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     return _SchemaNames.default.ProgramEnrolment;
   }
 
-  updateAudit(userInfo, isNew) {
-    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
-  }
-
 }
 
 _defineProperty(ProgramEnrolment, "schema", {
@@ -661,7 +657,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     enrolmentDateTime: "date",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     programExitDateTime: {
       type: "date",
@@ -669,7 +665,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     programExitObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounters: {
       type: "list",
@@ -681,11 +677,11 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     individual: "Individual",
     enrolmentLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     exitLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/Schema.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createTransactionDataMapForEmbeddedFields = createTransactionDataMapForEmbeddedFields;
 exports.default = void 0;
 
 var _Settings = _interopRequireDefault(require("./Settings"));
@@ -271,7 +272,100 @@ function migrateEmbeddedObjects(oldDB, newDB) {
   newDB.deleteModel("StringKeyNumericValue");
 }
 
-const VersionWithEmbeddedMigrationProblem = 185;
+function flush(db) {
+  db.commitTransaction();
+  db.beginTransaction();
+}
+
+function shouldFlush(numberOfRecords) {
+  const batchSize = 100;
+  return numberOfRecords % batchSize === batchSize - 1;
+}
+
+function createTransactionDataMapForEmbeddedFields() {
+  const map = new Map();
+
+  _MetaDataService.default.forEachPointField((fieldName, schemaName) => {
+    if (map.has(schemaName)) {
+      map.get(schemaName).push({
+        fieldName,
+        fieldType: "Point"
+      });
+    } else {
+      map.set(schemaName, [{
+        fieldName,
+        fieldType: "Point"
+      }]);
+    }
+  });
+
+  _MetaDataService.default.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 (!_lodash.default.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 (_lodash.default.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 = (0, _moment.default)(endTime).diff(startTime, "seconds", true);
+  console.log("Total Time Taken", diff, "seconds");
+}
 
 function createRealmConfig() {
   return {
@@ -284,14 +378,6 @@ function createRealmConfig() {
     schemaVersion: 188,
     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 === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
-
-      if (oldDB.schemaVersion < 10) {
-        const oldObjects = oldDB.objects("DecisionConfig");
-        oldObjects.forEach(decisionConfig => {
-          newDB.create(ConfigFile.schema.name, ConfigFile.create(decisionConfig.fileName, decisionConfig.decisionCode), true);
-        });
-      }
 
       if (oldDB.schemaVersion < 17) {
         const oldObjects = oldDB.objects("AddressLevel");
@@ -895,7 +981,8 @@ function createRealmConfig() {
         migrateEmbeddedObjects(oldDB, newDB);
       }
 
-      if (oldDB.schemaVersion < VersionWithEmbeddedMigrationProblem) {// removed migration code. keeping the version number in case this number is required for any checks later
+      if (oldDB.schemaVersion < 185) {
+        migrateAllEmbeddedForTxnData(oldDB, newDB);
       }
 
       if (oldDB.schemaVersion < 186) {// newDB.deleteModel("UserDefinedIndividualProperty");

package/dist/SchemaNames.js

@@ -91,7 +91,7 @@ _defineProperty(SchemaNames, "Concept", "Concept");
 
 _defineProperty(SchemaNames, "EntityApprovalStatus", "EntityApprovalStatus");
 
-_defineProperty(SchemaNames, "Point", "Point");
+_defineProperty(SchemaNames, "EmbeddedPoint", "EmbeddedPoint");
 
 var _default = SchemaNames;
 exports.default = _default;

package/dist/application/Form.js

@@ -227,6 +227,32 @@ class Form extends _BaseEntity.default {
 
     const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
     return orderedObservations.concat(extraObs);
+  } //TODO add tests
+
+
+  orderObservationsPerFEG(observations) {
+    const orderedObservations = [];
+
+    const formElementOrdering = _lodash.default.sortBy(this.formElementGroups, feg => feg.displayOrder).map(feg => {
+      let fegOrderedObservations = [];
+      const returnValue = {};
+      returnValue.uuid = feg.uuid;
+      returnValue.feg = feg;
+      returnValue.sortedObservationsArray = fegOrderedObservations;
+      this.orderObservationsWithinAFEG(feg.getFormElements(), observations, fegOrderedObservations);
+      orderedObservations.concat(fegOrderedObservations);
+      return returnValue;
+    });
+
+    return formElementOrdering;
+  }
+
+  orderObservationsWithinAFEG(formElements, observations, orderedObservations) {
+    _lodash.default.sortBy(formElements, fe => fe.displayOrder).forEach(formElement => this.addSortedObservations(formElement, observations, orderedObservations));
+
+    const extraObs = observations.filter(obs => _lodash.default.isNil(orderedObservations.find(oobs => oobs.concept.uuid === obs.concept.uuid)));
+    orderedObservations.concat(extraObs);
+    return extraObs;
   }
 
   sectionWiseOrderedObservations(observations) {

package/dist/application/FormElement.js

@@ -31,6 +31,8 @@ var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
 
 var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
+var _RepeatableQuestionGroup = _interopRequireDefault(require("../observation/RepeatableQuestionGroup"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -149,8 +151,18 @@ class FormElement extends _BaseEntity.default {
     return formElement;
   }
 
+  newFormElement() {
+    return new FormElement();
+  }
+
   getType() {
-    return this.concept.datatype === _Concept.default.dataType.Coded ? this.type : this.concept.datatype;
+    if (this.concept.datatype === _Concept.default.dataType.Coded) {
+      return this.type;
+    } else if (this.concept.datatype === _Concept.default.dataType.QuestionGroup && this.repeatable) {
+      return _RepeatableQuestionGroup.default.TypeName;
+    } else {
+      return this.concept.datatype;
+    }
   }
 
   isMultiSelect() {
@@ -387,7 +399,7 @@ class FormElement extends _BaseEntity.default {
   }
 
   clone() {
-    const formElement = new FormElement();
+    const formElement = this.newFormElement();
     formElement.uuid = this.uuid;
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;

package/dist/draft/DraftEncounter.js

@@ -170,10 +170,10 @@ _defineProperty(DraftEncounter, "schema", {
     individual: "Individual",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     name: {
@@ -194,10 +194,10 @@ _defineProperty(DraftEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/draft/DraftSubject.js

@@ -211,10 +211,10 @@ _defineProperty(DraftSubject, "schema", {
     lowestAddressLevel: "AddressLevel",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     registrationLocation: {
-      type: _SchemaNames.default.Point,
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     updatedOn: "date",

package/dist/geo/Point.js

@@ -57,7 +57,8 @@ class Point extends _PersistedObject.default {
 }
 
 _defineProperty(Point, "schema", {
-  name: "Point",
+  name: "EmbeddedPoint",
+  embedded: true,
   properties: {
     x: "double",
     y: "double"

package/dist/observation/RepeatableQuestionGroup.js

@@ -88,6 +88,8 @@ class RepeatableQuestionGroup {
 
 }
 
+_defineProperty(RepeatableQuestionGroup, "TypeName", "RepeatableQuestionGroup");
+
 _defineProperty(RepeatableQuestionGroup, "actions", {
   add: 'add',
   remove: 'remove'

package/dist/program/SubjectProgramEligibility.js

@@ -221,7 +221,7 @@ _defineProperty(SubjectProgramEligibility, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     voided: {
       type: "bool",

package/dist/relationship/IndividualRelationship.js

@@ -207,7 +207,7 @@ _defineProperty(IndividualRelationship, "schema", {
     },
     exitObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     voided: {
       type: "bool",

package/dist/task/Task.js

@@ -230,7 +230,7 @@ _defineProperty(Task, "schema", {
     },
     metadata: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     subject: {
       type: 'Individual',
@@ -238,7 +238,7 @@ _defineProperty(Task, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     voided: {
       type: 'bool',

package/dist/utility/AuditUtil.js

@@ -3,14 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateAuditFields = updateAuditFields;
-exports.mapAuditFields = mapAuditFields;
-exports.AuditFields = void 0;
+exports.mapAuditFields = exports.AuditFields = void 0;
 
 var _ResourceUtil = _interopRequireDefault(require("./ResourceUtil"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const AuditFields = {
@@ -33,23 +29,11 @@ const AuditFields = {
 };
 exports.AuditFields = AuditFields;
 
-function updateAuditFields(entity, userInfo, isNew = false) {
-  // old entities may have createdByUUID as null if never synced after audit release
-  // isNew must be passed by callers to specify that it is indeed a create scenario
-  if (_lodash.default.isNil(entity.createdByUUID) && isNew) {
-    entity.createdByUUID = userInfo.userUUID;
-    entity.createdBy = userInfo.name;
-  }
-
-  if (_lodash.default.isNil(entity.lastModifiedByUUID)) {
-    entity.lastModifiedByUUID = userInfo.userUUID;
-    entity.lastModifiedBy = userInfo.name;
-  }
-}
-
-function mapAuditFields(txnEntity, txnResource) {
+const mapAuditFields = function (txnEntity, txnResource) {
   txnEntity.createdBy = _ResourceUtil.default.getFieldValue(txnResource, "createdBy");
   txnEntity.createdByUUID = _ResourceUtil.default.getFieldValue(txnResource, "createdByUUID");
   txnEntity.lastModifiedBy = _ResourceUtil.default.getFieldValue(txnResource, "lastModifiedBy");
   txnEntity.lastModifiedByUUID = _ResourceUtil.default.getFieldValue(txnResource, "lastModifiedByUUID");
-}
+};
+
+exports.mapAuditFields = mapAuditFields;

package/package.json

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