openchs-models 1.31.24 → 1.31.25

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/ChecklistItemStatus.js

@@ -126,6 +126,7 @@ class ChecklistItemStatus extends _PersistedObject.default {
 
 _defineProperty(ChecklistItemStatus, "schema", {
   name: _SchemaNames.default.ChecklistItemStatus,
+  embedded: true,
   properties: {
     state: "string",
     from: "StringKeyNumericValue",

package/dist/Decision.js

@@ -52,6 +52,7 @@ class Decision extends _PersistedObject.default {
 
 _defineProperty(Decision, "schema", {
   name: "Decision",
+  embedded: true,
   properties: {
     name: "string",
     code: "string",

package/dist/Encounter.js

@@ -19,8 +19,6 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
-var _Point = _interopRequireDefault(require("./geo/Point"));
-
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
@@ -134,10 +132,10 @@ _defineProperty(Encounter, "schema", {
     individual: _SchemaNames.default.Individual,
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounterLocation: {
-      type: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     name: {
@@ -158,10 +156,10 @@ _defineProperty(Encounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelLocation: {
-      type: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/Family.js

@@ -211,7 +211,7 @@ class Family extends _BaseEntity.default {
 }
 
 _defineProperty(Family, "schema", {
-  name: "Family",
+  name: _SchemaNames.default.Family,
   primaryKey: "uuid",
   properties: {
     uuid: "string",
@@ -226,7 +226,7 @@ _defineProperty(Family, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     }
   }
 });

package/dist/Individual.js

@@ -1104,7 +1104,7 @@ _defineProperty(Individual, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     relationships: {
       type: "list",
@@ -1115,7 +1115,7 @@ _defineProperty(Individual, "schema", {
       objectType: "GroupSubject"
     },
     registrationLocation: {
-      type: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     comments: {

package/dist/Observation.js

@@ -49,7 +49,7 @@ class Observation extends _PersistedObject.default {
     this.that.valueJSON = x;
   }
 
-  static create(concept, value, abnormal = false) {
+  static create(concept, value) {
     const observation = new Observation();
     observation.concept = concept;
     observation.valueJSON = value;
@@ -254,10 +254,15 @@ class Observation extends _PersistedObject.default {
     return this.concept.isMobileNo();
   }
 
+  isForMedia(mediaName) {
+    return _Concept.default.dataType.Media.includes(this.concept.datatype) && this.valueJSON.includes(mediaName);
+  }
+
 }
 
 _defineProperty(Observation, "schema", {
-  name: "Observation",
+  name: "EmbeddedObservation",
+  embedded: true,
   properties: {
     concept: "Concept",
     valueJSON: "string"

package/dist/ProgramEncounter.js

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

package/dist/ProgramEnrolment.js

@@ -681,7 +681,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     enrolmentDateTime: "date",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     programExitDateTime: {
       type: "date",
@@ -689,7 +689,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     programExitObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     programOutcome: {
       type: "ProgramOutcome",
@@ -705,11 +705,11 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     individual: "Individual",
     enrolmentLocation: {
-      type: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     exitLocation: {
-      type: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     voided: {

package/dist/Schema.js

@@ -191,6 +191,8 @@ var _DefinedObjectSchema = _interopRequireDefault(require("./framework/DefinedOb
 
 var _MigrationsHelper = _interopRequireDefault(require("./MigrationsHelper"));
 
+var _MetaDataService = _interopRequireDefault(require("./service/MetaDataService"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -199,13 +201,51 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
 
+function migrateEmbeddedObjects(oldDB, newDB) {
+  _MetaDataService.default.forEachObservationField((observationField, schemaName) => {
+    newDB.objects(schemaName).forEach(newDbParentEntity => {
+      const newObservations = [];
+      const oldObservations = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0][observationField];
+      oldObservations.forEach(oldObservation => {
+        const newConcept = newDB.objects("Concept").filtered(`uuid = "${oldObservation.concept.uuid}"`)[0];
+        console.log(`Schema: ${schemaName}, newDbParentEntity: ${newDbParentEntity.uuid}, newConcept: ${newConcept.uuid}`);
+        newObservations.push({
+          concept: newConcept,
+          valueJSON: oldObservation.valueJSON
+        });
+      });
+      newDbParentEntity[observationField] = newObservations;
+    });
+  });
+
+  newDB.deleteModel("Observation");
+
+  _MetaDataService.default.forEachPointField((pointField, schemaName) => {
+    newDB.objects(schemaName).forEach(newDbParentEntity => {
+      const oldPoint = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0][pointField];
+      const newPoint = {
+        x: oldPoint.x,
+        y: oldPoint.y
+      };
+      console.log(`Schema: ${schemaName}, newDbParentEntity: ${newDbParentEntity.uuid}`);
+      newDbParentEntity[pointField] = newPoint;
+    });
+  });
+
+  newDB.deleteModel("Point");
+}
+
 function createRealmConfig() {
   return {
     //order is important, should be arranged according to the dependency
-    schemaVersion: 183,
+    schemaVersion: 184,
     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 < 184) {
+        migrateEmbeddedObjects(oldDB, newDB);
+      }
+
       if (oldDB.schemaVersion < 10) {
         const oldObjects = oldDB.objects("DecisionConfig");
         oldObjects.forEach(decisionConfig => {

package/dist/SchemaNames.js

@@ -9,6 +9,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 class SchemaNames {}
 
+_defineProperty(SchemaNames, "Family", "Family");
+
+_defineProperty(SchemaNames, "AddressLevel", "AddressLevel");
+
+_defineProperty(SchemaNames, "DraftEncounter", "DraftEncounter");
+
 _defineProperty(SchemaNames, "EntitySyncStatus", "EntitySyncStatus");
 
 _defineProperty(SchemaNames, "Individual", "Individual");
@@ -85,5 +91,7 @@ _defineProperty(SchemaNames, "Concept", "Concept");
 
 _defineProperty(SchemaNames, "EntityApprovalStatus", "EntityApprovalStatus");
 
+_defineProperty(SchemaNames, "EmbeddedPoint", "EmbeddedPoint");
+
 var _default = SchemaNames;
 exports.default = _default;

package/dist/VisitScheduleInterval.js

@@ -60,6 +60,7 @@ class VisitScheduleInterval extends _ReferenceEntity.default {
 
 _defineProperty(VisitScheduleInterval, "schema", {
   name: "VisitScheduleInterval",
+  embedded: true,
   properties: {
     from: "string",
     min: "StringKeyNumericValue",

package/dist/application/Format.js

@@ -61,6 +61,7 @@ _defineProperty(Format, "map", new Map());
 
 _defineProperty(Format, "schema", {
   name: _SchemaNames.default.Format,
+  embedded: true,
   properties: {
     regex: "string",
     descriptionKey: "string"

package/dist/application/KeyValue.js

@@ -59,6 +59,7 @@ _defineProperty(KeyValue, "ContactYesValue", "yes");
 
 _defineProperty(KeyValue, "schema", {
   name: _SchemaNames.default.KeyValue,
+  embedded: true,
   properties: {
     key: "string",
     value: "string"

package/dist/application/StringKeyNumericValue.js

@@ -53,6 +53,7 @@ class StringKeyNumericValue extends _PersistedObject.default {
 
 _defineProperty(StringKeyNumericValue, "schema", {
   name: _SchemaNames.default.StringKeyNumericValue,
+  embedded: true,
   properties: {
     key: "string",
     value: "double"

package/dist/draft/DraftEncounter.js

@@ -19,7 +19,7 @@ var _index = require("../index");
 
 var _Point = _interopRequireDefault(require("../geo/Point"));
 
-var _ApprovalStatus = _interopRequireDefault(require("../ApprovalStatus"));
+var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -158,7 +158,7 @@ class DraftEncounter extends _BaseEntity.default {
 }
 
 _defineProperty(DraftEncounter, "schema", {
-  name: "DraftEncounter",
+  name: _SchemaNames.default.DraftEncounter,
   primaryKey: "uuid",
   properties: {
     uuid: "string",
@@ -170,10 +170,10 @@ _defineProperty(DraftEncounter, "schema", {
     individual: "Individual",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     encounterLocation: {
-      type: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     name: {
@@ -194,10 +194,10 @@ _defineProperty(DraftEncounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelLocation: {
-      type: "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: "Point",
+      type: _SchemaNames.default.EmbeddedPoint,
       optional: true
     },
     updatedOn: "date",

package/dist/framework/RealmResultsProxy.js

@@ -153,6 +153,14 @@ class RealmResultsProxy {
     return _lodash.default.isNil(thisArg) ? this.realmCollection.find(findFunc) : this.realmCollection.find(findFunc, thisArg);
   }
 
+  every(callback, [thisArg] = []) {
+    const everyFunc = (object, index, collection) => {
+      return callback(this.createEntity(object), index, collection);
+    };
+
+    return _lodash.default.isNil(thisArg) ? this.realmCollection.every(everyFunc) : this.realmCollection.every(everyFunc, [thisArg]);
+  }
+
 }
 
 var _default = RealmResultsProxy;

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/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/service/MetaDataService.js

@@ -7,27 +7,82 @@ exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _openchsModels = require("openchs-models");
+var _Form = _interopRequireDefault(require("../application/Form"));
+
+var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const observationHolders = new Map();
+observationHolders.set(_SchemaNames.default.Individual, ["observations"]);
+observationHolders.set(_SchemaNames.default.DraftSubject, ["observations"]);
+observationHolders.set(_SchemaNames.default.Encounter, ["observations", "cancelObservations"]);
+observationHolders.set(_SchemaNames.default.DraftEncounter, ["observations", "cancelObservations"]);
+observationHolders.set(_SchemaNames.default.SubjectProgramEligibility, ["observations"]);
+observationHolders.set(_SchemaNames.default.IndividualRelationship, ["exitObservations"]);
+observationHolders.set(_SchemaNames.default.AddressLevel, ["locationProperties"]);
+observationHolders.set(_SchemaNames.default.ChecklistItem, ["observations"]);
+observationHolders.set(_SchemaNames.default.Family, ["observations"]);
+observationHolders.set(_SchemaNames.default.ProgramEncounter, ["observations", "cancelObservations"]);
+observationHolders.set(_SchemaNames.default.ProgramEnrolment, ["observations", "programExitObservations"]);
+observationHolders.set(_SchemaNames.default.Task, ["metadata", "observations"]);
+observationHolders.set(_SchemaNames.default.Family, ["observations"]);
+const pointHolders = new Map();
+pointHolders.set(_SchemaNames.default.DraftEncounter, ["encounterLocation", "cancelLocation"]);
+pointHolders.set(_SchemaNames.default.DraftSubject, ["registrationLocation"]);
+pointHolders.set(_SchemaNames.default.Encounter, ["encounterLocation", "cancelLocation"]);
+pointHolders.set(_SchemaNames.default.Individual, ["registrationLocation"]);
+pointHolders.set(_SchemaNames.default.ProgramEncounter, ["encounterLocation", "cancelLocation"]);
+pointHolders.set(_SchemaNames.default.ProgramEnrolment, ["enrolmentLocation", "exitLocation"]);
+
 class MetaDataService {
+  static forEachPointField(fn) {
+    pointHolders.forEach((pointFields, schemaName) => {
+      pointFields.forEach(observationField => {
+        fn(observationField, schemaName);
+      });
+    });
+  }
+
+  static forEachObservationField(fn) {
+    observationHolders.forEach((observationFields, schemaName) => {
+      observationFields.forEach(observationField => {
+        fn(observationField, schemaName);
+      });
+    });
+  }
+
+  static everyObservationField(fn) {
+    const schemaAndObsFields = Array.from(observationHolders, ([schema, observationFields]) => ({
+      schema,
+      observationFields
+    }));
+    return schemaAndObsFields.every(({
+      schema,
+      observationFields
+    }) => {
+      return observationFields.every(observationField => {
+        return fn(observationField, schema);
+      });
+    });
+  }
+
   static getProgramFormMappings(formMappings) {
-    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _openchsModels.Form.formTypes.ProgramEnrolment);
+    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _Form.default.formTypes.ProgramEnrolment);
   }
 
   static getGeneralEncounterFormMappings(formMappings) {
-    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _openchsModels.Form.formTypes.Encounter || formMapping.formType === _openchsModels.Form.formTypes.IndividualEncounterCancellation);
+    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _Form.default.formTypes.Encounter || formMapping.formType === _Form.default.formTypes.IndividualEncounterCancellation);
   }
 
   static getProgramEncounterFormMappings(formMappings) {
-    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _openchsModels.Form.formTypes.ProgramEncounter || formMapping.formType === _openchsModels.Form.formTypes.ProgramEncounterCancellation);
+    return _lodash.default.filter(formMappings, formMapping => formMapping.formType === _Form.default.formTypes.ProgramEncounter || formMapping.formType === _Form.default.formTypes.ProgramEncounterCancellation);
   }
 
   static getProgramsForSubjectType(allPrograms, subjectType, formMappings) {
     if (_lodash.default.isNil(subjectType)) return allPrograms;
 
-    const programFormMappingsForSubjectType = _lodash.default.filter(formMappings, formMapping => formMapping.subjectTypeUUID === subjectType.uuid && formMapping.formType === _openchsModels.Form.formTypes.ProgramEnrolment);
+    const programFormMappingsForSubjectType = _lodash.default.filter(formMappings, formMapping => formMapping.subjectTypeUUID === subjectType.uuid && formMapping.formType === _Form.default.formTypes.ProgramEnrolment);
 
     return _lodash.default.intersectionWith(allPrograms, programFormMappingsForSubjectType, (p, fm) => p.uuid === fm.programUUID);
   }

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/package.json

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