openchs-models 1.31.25 → 1.31.26

package/dist/ChecklistItemDetail.js

@@ -146,7 +146,7 @@ _defineProperty(ChecklistItemDetail, "schema", {
     concept: "Concept",
     stateConfig: {
       type: "list",
-      objectType: "ChecklistItemStatus"
+      objectType: _SchemaNames.default.ChecklistItemStatus
     },
     form: {
       type: "Form",

package/dist/ChecklistItemStatus.js

@@ -129,8 +129,8 @@ _defineProperty(ChecklistItemStatus, "schema", {
   embedded: true,
   properties: {
     state: "string",
-    from: "StringKeyNumericValue",
-    to: "StringKeyNumericValue",
+    from: _SchemaNames.default.StringKeyNumericValue,
+    to: _SchemaNames.default.StringKeyNumericValue,
     color: {
       type: "string",
       default: "yellow"

package/dist/Concept.js

@@ -375,7 +375,7 @@ _defineProperty(Concept, "schema", {
     },
     keyValues: {
       type: "list",
-      objectType: "KeyValue"
+      objectType: _SchemaNames.default.KeyValue
     },
     voided: {
       type: "bool",

package/dist/Decision.js

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

package/dist/Schema.js

@@ -71,10 +71,6 @@ var _UserInfo = _interopRequireDefault(require("./UserInfo"));
 
 var _StringKeyNumericValue = _interopRequireDefault(require("./application/StringKeyNumericValue"));
 
-var _VisitScheduleInterval = _interopRequireDefault(require("./VisitScheduleInterval"));
-
-var _VisitScheduleConfig = _interopRequireDefault(require("./VisitScheduleConfig"));
-
 var _IndividualRelation = _interopRequireDefault(require("./relationship/IndividualRelation"));
 
 var _IndividualRelationship = _interopRequireDefault(require("./relationship/IndividualRelationship"));
@@ -199,40 +195,100 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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];
+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, _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 migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
+  console.log(`schema: ${schemaName}, field: ${field}`);
+  newDB.objects(schemaName).forEach(newDbParentEntity => {
+    const oldFieldValue = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0][field];
+
+    if (!_lodash.default.isNil(oldFieldValue)) {
+      newDbParentEntity[field] = creatorFn(oldFieldValue);
+    }
+  });
+}
+
+function migrateListTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
+  console.log(`schema: ${schemaName}, field: ${field}`);
+  newDB.objects(schemaName).forEach(newDbParentEntity => {
+    const newList = [];
+    const oldFieldValues = oldDB.objects(schemaName).filtered(`uuid = "${newDbParentEntity.uuid}"`)[0][field];
+    oldFieldValues.forEach(oldFieldValue => {
+      newList.push(creatorFn(oldFieldValue));
+    });
+    newDbParentEntity[field] = newList;
+  });
+}
 
 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;
+    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((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
+  _MetaDataService.default.forEachPointField((field, schemaName) => {
+    migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, old => {
+      return {
+        x: old.x,
+        y: old.y
       };
-      console.log(`Schema: ${schemaName}, newDbParentEntity: ${newDbParentEntity.uuid}`);
-      newDbParentEntity[pointField] = newPoint;
     });
   });
 
   newDB.deleteModel("Point");
+
+  _MetaDataService.default.forEachFormatField((field, schemaName) => {
+    migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, old => {
+      return {
+        regex: old.regex,
+        descriptionKey: old.descriptionKey
+      };
+    });
+  });
+
+  newDB.deleteModel("Format");
+
+  _MetaDataService.default.forEachKeyValueField((field, schemaName) => {
+    migrateListTypeFieldToEmbedded(newDB, oldDB, schemaName, field, old => {
+      return {
+        key: old.key,
+        value: old.value
+      };
+    });
+  });
+
+  newDB.deleteModel("KeyValue");
+
+  _MetaDataService.default.forEachChecklistItemStatusField((field, schemaName) => {
+    migrateListTypeFieldToEmbedded(newDB, oldDB, schemaName, field, old => {
+      return {
+        state: old.state,
+        from: {
+          key: old.from.key,
+          value: old.from.value
+        },
+        to: {
+          key: old.to.key,
+          value: old.to.value
+        },
+        color: old.color,
+        displayOrder: old.displayOrder,
+        start: old.start,
+        end: old.end
+      };
+    });
+  });
+
+  console.log(`deleting model: ChecklistItemStatus`);
+  newDB.deleteModel("ChecklistItemStatus"); // console.log(`deleting model: StringKeyNumericValue`);
+  // newDB.deleteModel("StringKeyNumericValue");
 }
 
 function createRealmConfig() {
@@ -242,10 +298,6 @@ function createRealmConfig() {
     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 => {
@@ -850,6 +902,10 @@ function createRealmConfig() {
         const newObjects = newDB.objects("DashboardCache");
         newDB.delete(newObjects);
       }
+
+      if (oldDB.schemaVersion < 184) {
+        migrateEmbeddedObjects(oldDB, newDB);
+      }
     }
   };
 }

package/dist/SchemaNames.js

@@ -33,7 +33,7 @@ _defineProperty(SchemaNames, "Identifier", "Identifier");
 
 _defineProperty(SchemaNames, "Form", "Form");
 
-_defineProperty(SchemaNames, "Format", "Format");
+_defineProperty(SchemaNames, "Format", "EmbeddedFormat");
 
 _defineProperty(SchemaNames, "FormElement", "FormElement");
 
@@ -41,11 +41,11 @@ _defineProperty(SchemaNames, "FormElementGroup", "FormElementGroup");
 
 _defineProperty(SchemaNames, "FormMapping", "FormMapping");
 
-_defineProperty(SchemaNames, "KeyValue", "KeyValue");
+_defineProperty(SchemaNames, "KeyValue", "EmbeddedKeyValue");
 
 _defineProperty(SchemaNames, "MenuItem", "MenuItem");
 
-_defineProperty(SchemaNames, "StringKeyNumericValue", "StringKeyNumericValue");
+_defineProperty(SchemaNames, "StringKeyNumericValue", "EmbeddedStringKeyNumericValue");
 
 _defineProperty(SchemaNames, "UserSubjectAssignment", "UserSubjectAssignment");
 
@@ -83,7 +83,7 @@ _defineProperty(SchemaNames, "ChecklistDetail", "ChecklistDetail");
 
 _defineProperty(SchemaNames, "ChecklistItemDetail", "ChecklistItemDetail");
 
-_defineProperty(SchemaNames, "ChecklistItemStatus", "ChecklistItemStatus");
+_defineProperty(SchemaNames, "ChecklistItemStatus", "EmbeddedChecklistItemStatus");
 
 _defineProperty(SchemaNames, "Comment", "Comment");
 

package/dist/SubjectType.js

@@ -13,6 +13,8 @@ var _Format = _interopRequireDefault(require("./application/Format"));
 
 var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
 
+var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
+
 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; }
@@ -300,15 +302,15 @@ _defineProperty(SubjectType, "schema", {
       default: false
     },
     validFirstNameFormat: {
-      type: "Format",
+      type: _SchemaNames.default.Format,
       optional: true
     },
     validMiddleNameFormat: {
-      type: "Format",
+      type: _SchemaNames.default.Format,
       optional: true
     },
     validLastNameFormat: {
-      type: "Format",
+      type: _SchemaNames.default.Format,
       optional: true
     },
     iconFileS3Key: {

package/dist/application/FormElement.js

@@ -418,7 +418,7 @@ _defineProperty(FormElement, "schema", {
     mandatory: "bool",
     keyValues: {
       type: "list",
-      objectType: "KeyValue"
+      objectType: _SchemaNames.default.KeyValue
     },
     concept: "Concept",
     type: {
@@ -427,7 +427,7 @@ _defineProperty(FormElement, "schema", {
     },
     formElementGroup: "FormElementGroup",
     validFormat: {
-      type: "Format",
+      type: _SchemaNames.default.Format,
       optional: true
     },
     voided: {

package/dist/index.js

@@ -387,18 +387,6 @@ Object.defineProperty(exports, "VideoTelemetric", {
     return _VideoTelemetric.default;
   }
 });
-Object.defineProperty(exports, "VisitScheduleConfig", {
-  enumerable: true,
-  get: function () {
-    return _VisitScheduleConfig.default;
-  }
-});
-Object.defineProperty(exports, "VisitScheduleInterval", {
-  enumerable: true,
-  get: function () {
-    return _VisitScheduleInterval.default;
-  }
-});
 Object.defineProperty(exports, "MediaQueue", {
   enumerable: true,
   get: function () {
@@ -940,10 +928,6 @@ var _Video = _interopRequireDefault(require("./videos/Video"));
 
 var _VideoTelemetric = _interopRequireDefault(require("./videos/VideoTelemetric"));
 
-var _VisitScheduleConfig = _interopRequireDefault(require("./VisitScheduleConfig"));
-
-var _VisitScheduleInterval = _interopRequireDefault(require("./VisitScheduleInterval"));
-
 var _MediaQueue = _interopRequireDefault(require("./MediaQueue"));
 
 var _Point = _interopRequireDefault(require("./geo/Point"));

package/dist/service/MetaDataService.js

@@ -34,22 +34,42 @@ pointHolders.set(_SchemaNames.default.Encounter, ["encounterLocation", "cancelLo
 pointHolders.set(_SchemaNames.default.Individual, ["registrationLocation"]);
 pointHolders.set(_SchemaNames.default.ProgramEncounter, ["encounterLocation", "cancelLocation"]);
 pointHolders.set(_SchemaNames.default.ProgramEnrolment, ["enrolmentLocation", "exitLocation"]);
+const formatHolders = new Map();
+formatHolders.set("SubjectType", ["validFirstNameFormat", "validMiddleNameFormat", "validLastNameFormat"]);
+formatHolders.set(_SchemaNames.default.FormElement, ["validFormat"]);
+const keyValueHolders = new Map();
+keyValueHolders.set(_SchemaNames.default.FormElement, ["keyValues"]);
+keyValueHolders.set(_SchemaNames.default.Concept, ["keyValues"]);
+const checklistItemStatusHolders = new Map();
+checklistItemStatusHolders.set(_SchemaNames.default.ChecklistItemDetail, ["stateConfig"]);
+
+function forEachField(fn, holders) {
+  holders.forEach((fields, schemaName) => {
+    fields.forEach(field => {
+      fn(field, schemaName);
+    });
+  });
+}
 
 class MetaDataService {
   static forEachPointField(fn) {
-    pointHolders.forEach((pointFields, schemaName) => {
-      pointFields.forEach(observationField => {
-        fn(observationField, schemaName);
-      });
-    });
+    forEachField(fn, pointHolders);
   }
 
   static forEachObservationField(fn) {
-    observationHolders.forEach((observationFields, schemaName) => {
-      observationFields.forEach(observationField => {
-        fn(observationField, schemaName);
-      });
-    });
+    forEachField(fn, observationHolders);
+  }
+
+  static forEachFormatField(fn) {
+    forEachField(fn, formatHolders);
+  }
+
+  static forEachKeyValueField(fn) {
+    forEachField(fn, keyValueHolders);
+  }
+
+  static forEachChecklistItemStatusField(fn) {
+    forEachField(fn, checklistItemStatusHolders);
   }
 
   static everyObservationField(fn) {

package/package.json

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

package/dist/VisitScheduleConfig.js

@@ -1,73 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
-
-var _General = _interopRequireDefault(require("./utility/General"));
-
-var _EncounterType = _interopRequireDefault(require("./EncounterType"));
-
-var _VisitScheduleInterval = _interopRequireDefault(require("./VisitScheduleInterval"));
-
-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; }
-
-class VisitScheduleConfig extends _ReferenceEntity.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get name() {
-    return this.that.name;
-  }
-
-  set name(x) {
-    this.that.name = x;
-  }
-
-  get encounterType() {
-    return this.toEntity("encounterType", _EncounterType.default);
-  }
-
-  set encounterType(x) {
-    this.that.encounterType = this.fromObject(x);
-  }
-
-  get interval() {
-    return this.toEntity("interval", _VisitScheduleInterval.default);
-  }
-
-  set interval(x) {
-    this.that.interval = this.fromObject(x);
-  }
-
-  static fromResource(resource, entityService) {
-    const visitScheduleConfig = _General.default.assignFields(resource, new VisitScheduleConfig(), ["uuid", "name"]);
-
-    visitScheduleConfig.encounterType = entityService.findByKey("name", resource.encounterType, _EncounterType.default.schema.name);
-    visitScheduleConfig.interval = _VisitScheduleInterval.default.fromResource(resource.interval, entityService);
-    return visitScheduleConfig;
-  }
-
-  clone() {
-    return super.clone(new VisitScheduleConfig());
-  }
-
-}
-
-_defineProperty(VisitScheduleConfig, "schema", {
-  name: "VisitScheduleConfig",
-  properties: {
-    name: "string",
-    encounterType: "EncounterType",
-    interval: "VisitScheduleInterval"
-  }
-});
-
-var _default = VisitScheduleConfig;
-exports.default = _default;

package/dist/VisitScheduleInterval.js

@@ -1,72 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
-
-var _StringKeyNumericValue = _interopRequireDefault(require("./application/StringKeyNumericValue"));
-
-var _General = _interopRequireDefault(require("./utility/General"));
-
-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; }
-
-class VisitScheduleInterval extends _ReferenceEntity.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get from() {
-    return this.that.from;
-  }
-
-  set from(x) {
-    this.that.from = x;
-  }
-
-  get min() {
-    return this.toEntity("min", _StringKeyNumericValue.default);
-  }
-
-  set min(x) {
-    this.that.min = this.fromObject(x);
-  }
-
-  get max() {
-    return this.toEntity("max", _StringKeyNumericValue.default);
-  }
-
-  set max(x) {
-    this.that.max = this.fromObject(x);
-  }
-
-  static fromResource(resource) {
-    const visitScheduleInterval = _General.default.assignFields(resource, new VisitScheduleInterval(), ["uuid", "from"]);
-
-    visitScheduleInterval.min = _StringKeyNumericValue.default.fromResource(resource.min.unit, resource.min.value);
-    visitScheduleInterval.max = _StringKeyNumericValue.default.fromResource(resource.max.unit, resource.max.value);
-    return visitScheduleInterval;
-  }
-
-  clone() {
-    return super.clone(new VisitScheduleInterval());
-  }
-
-}
-
-_defineProperty(VisitScheduleInterval, "schema", {
-  name: "VisitScheduleInterval",
-  embedded: true,
-  properties: {
-    from: "string",
-    min: "StringKeyNumericValue",
-    max: "StringKeyNumericValue"
-  }
-});
-
-var _default = VisitScheduleInterval;
-exports.default = _default;