openchs-models 1.31.35 → 1.31.36

package/dist/ProgramEncounter.js

@@ -25,8 +25,14 @@ var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _AuditUtil = require("./utility/AuditUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 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 ProgramEncounter extends _AbstractEncounter.default {
@@ -164,7 +170,7 @@ _defineProperty(ProgramEncounter, "validationKeys", {
 _defineProperty(ProgramEncounter, "schema", {
   name: _SchemaNames.default.ProgramEncounter,
   primaryKey: "uuid",
-  properties: {
+  properties: _objectSpread({
     uuid: {
       type: "string"
     },
@@ -190,7 +196,7 @@ _defineProperty(ProgramEncounter, "schema", {
     programEnrolment: _SchemaNames.default.ProgramEnrolment,
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     cancelDateTime: {
       type: "date",
@@ -198,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: {
@@ -219,9 +225,17 @@ _defineProperty(ProgramEncounter, "schema", {
     latestEntityApprovalStatus: {
       type: "EntityApprovalStatus",
       optional: true
-    } //Reporting purposes
-
-  }
+    }
+  }, _AuditUtil.AuditFields, {
+    filledBy: {
+      type: "string",
+      optional: true
+    },
+    filledByUUID: {
+      type: "string",
+      optional: true
+    }
+  })
 });
 
 var _default = ProgramEncounter;

package/dist/ProgramEnrolment.js

@@ -41,8 +41,14 @@ var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
 var _MergeUtil = _interopRequireDefault(require("./utility/MergeUtil"));
 
+var _AuditUtil = require("./utility/AuditUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 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; }
 
 const mergeMap = new Map([[_SchemaNames.default.ProgramEncounter, "encounters"], [_SchemaNames.default.Checklist, "checklists"], [_SchemaNames.default.EntityApprovalStatus, "approvalStatuses"]]);
@@ -152,6 +158,38 @@ class ProgramEnrolment extends _BaseEntity.default {
     this.that.approvalStatuses = this.fromEntityList(x);
   }
 
+  get createdBy() {
+    return this.that.createdBy;
+  }
+
+  set createdBy(x) {
+    this.that.createdBy = x;
+  }
+
+  get lastModifiedBy() {
+    return this.that.lastModifiedBy;
+  }
+
+  set lastModifiedBy(x) {
+    this.that.lastModifiedBy = x;
+  }
+
+  get createdByUUID() {
+    return this.that.createdByUUID;
+  }
+
+  set createdByUUID(x) {
+    this.that.createdByUUID = x;
+  }
+
+  get lastModifiedByUUID() {
+    return this.that.lastModifiedByUUID;
+  }
+
+  set lastModifiedByUUID(x) {
+    this.that.lastModifiedByUUID = x;
+  }
+
   static createEmptyInstance({
     individual,
     program
@@ -220,6 +258,7 @@ class ProgramEnrolment extends _BaseEntity.default {
 
     if (!_lodash.default.isNil(resource.enrolmentLocation)) programEnrolment.enrolmentLocation = _Point.default.fromResource(resource.enrolmentLocation);
     if (!_lodash.default.isNil(resource.exitLocation)) programEnrolment.exitLocation = _Point.default.fromResource(resource.exitLocation);
+    (0, _AuditUtil.mapAuditFields)(programEnrolment, resource);
     return programEnrolment;
   }
 
@@ -636,13 +675,13 @@ class ProgramEnrolment extends _BaseEntity.default {
 _defineProperty(ProgramEnrolment, "schema", {
   name: _SchemaNames.default.ProgramEnrolment,
   primaryKey: "uuid",
-  properties: {
+  properties: _objectSpread({
     uuid: "string",
     program: "Program",
     enrolmentDateTime: "date",
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     programExitDateTime: {
       type: "date",
@@ -650,7 +689,7 @@ _defineProperty(ProgramEnrolment, "schema", {
     },
     programExitObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     programOutcome: {
       type: "ProgramOutcome",
@@ -666,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: {
@@ -684,9 +723,8 @@ _defineProperty(ProgramEnrolment, "schema", {
     latestEntityApprovalStatus: {
       type: "EntityApprovalStatus",
       optional: true
-    } //Reporting purposes
-
-  }
+    }
+  }, _AuditUtil.AuditFields)
 });
 
 _defineProperty(ProgramEnrolment, "merge", childEntityName => _MergeUtil.default.getMergeFunction(childEntityName, mergeMap));

package/dist/ReportCard.js

@@ -13,10 +13,16 @@ var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
 
 var _StandardReportCardType = _interopRequireDefault(require("./StandardReportCardType"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 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; }
 
+function throwInvalidIndexError(index, reportCardsLength) {
+  throw new Error(`Invalid index ${index} specified for reportCard with length ${reportCardsLength}`);
+}
+
 class ReportCard extends _BaseEntity.default {
   constructor(that = null) {
     super(that);
@@ -62,28 +68,68 @@ class ReportCard extends _BaseEntity.default {
     this.that.colour = x;
   }
 
+  get nested() {
+    return this.that.nested;
+  }
+
+  set nested(x) {
+    this.that.nested = x;
+  }
+
+  get countOfCards() {
+    return this.that.countOfCards;
+  }
+
+  set countOfCards(x) {
+    this.that.countOfCards = x;
+  }
+
   get iconName() {
     //TODO: right now not syncing the icon name uploaded from app designer.
-    return _.isNil(this.standardReportCardType) ? null : this.standardReportCardType.iconName;
+    return _lodash.default.isNil(this.standardReportCardType) ? null : this.standardReportCardType.iconName;
   }
 
   get cardColor() {
-    return _.isNil(this.standardReportCardType) ? this.colour : this.standardReportCardType.cardColor;
+    return _lodash.default.isNil(this.standardReportCardType) ? this.colour : this.standardReportCardType.cardColor;
   }
 
   get textColor() {
-    return _.isNil(this.standardReportCardType) ? '#ffffff' : this.standardReportCardType.textColor;
+    return _lodash.default.isNil(this.standardReportCardType) ? '#ffffff' : this.standardReportCardType.textColor;
+  }
+  /**
+   * Helper method used to generate unique key value for Nested Report Cards using UUID and Index of the Report Card.
+   * The Nested Report Card's query responses would be mapped to the corresponding Dashboard Report cards using the UUID and Index.
+   *
+   * @param index
+   * @returns {string}
+   */
+
+
+  getCardId(index = 0) {
+    return this.uuid + '#' + index;
+  }
+
+  getCardName(response, index = 0) {
+    return _lodash.default.get(response, `reportCards[${index}].name`) || this.name;
+  }
+
+  getCardColor(response, index = 0) {
+    return _lodash.default.get(response, `reportCards[${index}].cardColor`) || this.cardColor;
+  }
+
+  getTextColor(response, index = 0) {
+    return _lodash.default.get(response, `reportCards[${index}].textColor`) || this.textColor;
   }
 
   static fromResource(resource, entityService) {
-    const reportCard = _General.default.assignFields(resource, new ReportCard(), ["uuid", "name", "query", "description", "colour", "voided"]);
+    const reportCard = _General.default.assignFields(resource, new ReportCard(), ["uuid", "name", "query", "description", "colour", "voided", "nested", "countOfCards"]);
 
     reportCard.standardReportCardType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "standardReportCardUUID"), _StandardReportCardType.default.schema.name);
     return reportCard;
   }
 
   isStandardTaskType() {
-    return _.isNil(this.standardReportCardType) ? false : this.standardReportCardType.isTaskType();
+    return _lodash.default.isNil(this.standardReportCardType) ? false : this.standardReportCardType.isTaskType();
   }
 
 }
@@ -110,7 +156,18 @@ _defineProperty(ReportCard, "schema", {
     voided: {
       type: "bool",
       default: false
-    }
+    },
+    nested: {
+      type: "bool",
+      default: false,
+      optional: true
+    },
+    countOfCards: {
+      type: "int",
+      default: 1,
+      optional: true
+    } //Used only by nested ReportCards
+
   }
 });
 

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"));
@@ -191,18 +187,165 @@ 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; }
 
 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.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: ProgramConfig`);
+  newDB.deleteModel("ProgramConfig");
+  console.log(`deleting model: VisitScheduleConfig`);
+  newDB.deleteModel("VisitScheduleConfig");
+  console.log(`deleting model: VisitScheduleInterval`);
+  newDB.deleteModel("VisitScheduleInterval");
+  console.log(`deleting model: StringKeyNumericValue`);
+  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: 181,
+    schemaVersion: 186,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
 
@@ -798,6 +941,30 @@ function createRealmConfig() {
           rft.entityId = null;
         });
       }
+
+      if (oldDB.schemaVersion < 182) {
+        _lodash.default.forEach(newDB.objects(_ReportCard.default.schema.name), rc => {
+          rc.nested = false;
+          rc.countOfCards = 1;
+        });
+      }
+
+      if (newDB.schemaVersion < 183) {
+        const newObjects = newDB.objects("DashboardCache");
+        newDB.delete(newObjects);
+      }
+
+      if (oldDB.schemaVersion < 184) {
+        migrateEmbeddedObjects(oldDB, newDB);
+      }
+
+      if (oldDB.schemaVersion < 185) {
+        migrateGeoLocation(oldDB, newDB);
+      }
+
+      if (oldDB.schemaVersion < 186) {
+        migrateObservationsToEmbedded(oldDB, newDB);
+      }
     }
   };
 }

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");
@@ -27,7 +33,7 @@ _defineProperty(SchemaNames, "Identifier", "Identifier");
 
 _defineProperty(SchemaNames, "Form", "Form");
 
-_defineProperty(SchemaNames, "Format", "Format");
+_defineProperty(SchemaNames, "Format", "EmbeddedFormat");
 
 _defineProperty(SchemaNames, "FormElement", "FormElement");
 
@@ -35,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");
 
@@ -77,7 +83,7 @@ _defineProperty(SchemaNames, "ChecklistDetail", "ChecklistDetail");
 
 _defineProperty(SchemaNames, "ChecklistItemDetail", "ChecklistItemDetail");
 
-_defineProperty(SchemaNames, "ChecklistItemStatus", "ChecklistItemStatus");
+_defineProperty(SchemaNames, "ChecklistItemStatus", "EmbeddedChecklistItemStatus");
 
 _defineProperty(SchemaNames, "Comment", "Comment");
 
@@ -85,5 +91,7 @@ _defineProperty(SchemaNames, "Concept", "Concept");
 
 _defineProperty(SchemaNames, "EntityApprovalStatus", "EntityApprovalStatus");
 
+_defineProperty(SchemaNames, "EmbeddedPoint", "EmbeddedPoint");
+
 var _default = SchemaNames;
 exports.default = _default;

package/dist/SubjectMigration.js

@@ -11,8 +11,14 @@ var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
 var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
 
+var _AuditUtil = require("./utility/AuditUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 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 SubjectMigration extends _BaseEntity.default {
@@ -92,6 +98,38 @@ class SubjectMigration extends _BaseEntity.default {
     this.that.hasMigrated = x;
   }
 
+  get createdBy() {
+    return this.that.createdBy;
+  }
+
+  set createdBy(x) {
+    this.that.createdBy = x;
+  }
+
+  get lastModifiedBy() {
+    return this.that.lastModifiedBy;
+  }
+
+  set lastModifiedBy(x) {
+    this.that.lastModifiedBy = x;
+  }
+
+  get createdByUUID() {
+    return this.that.createdByUUID;
+  }
+
+  set createdByUUID(x) {
+    this.that.createdByUUID = x;
+  }
+
+  get lastModifiedByUUID() {
+    return this.that.lastModifiedByUUID;
+  }
+
+  set lastModifiedByUUID(x) {
+    this.that.lastModifiedByUUID = x;
+  }
+
   static create(subjectUUID, oldAddressLevelUUID, newAddressLevelUUID, oldSyncConcept1Value, newSyncConcept1Value, oldSyncConcept2Value, newSyncConcept2Value, subjectTypeUUID) {
     let subjectMigration = new SubjectMigration();
     subjectMigration.uuid = _General.default.randomUUID();
@@ -117,6 +155,7 @@ class SubjectMigration extends _BaseEntity.default {
     subjectMigration.newSyncConcept1Value = resource.newSyncConcept1Value;
     subjectMigration.oldSyncConcept2Value = resource.oldSyncConcept2Value;
     subjectMigration.newSyncConcept2Value = resource.newSyncConcept2Value;
+    (0, _AuditUtil.mapAuditFields)(subjectMigration, resource);
     return subjectMigration;
   }
 
@@ -140,7 +179,7 @@ class SubjectMigration extends _BaseEntity.default {
 _defineProperty(SubjectMigration, "schema", {
   name: 'SubjectMigration',
   primaryKey: 'uuid',
-  properties: {
+  properties: _objectSpread({
     uuid: 'string',
     subjectUUID: 'string',
     oldAddressLevelUUID: {
@@ -172,7 +211,7 @@ _defineProperty(SubjectMigration, "schema", {
       type: 'bool',
       default: false
     }
-  }
+  }, _AuditUtil.AuditFields)
 });
 
 var _default = SubjectMigration;

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: {