openchs-models 1.27.7 → 1.27.9

package/Makefile

@@ -1,24 +1,20 @@
-check-node-v:
-ifneq ($(shell node -v),$(shell cat .nvmrc))
-	@echo '\nPlease run `nvm use` in your terminal to change node version\n'
-	@exit 1
-endif
-	@node -v
+set_node_version:
+	. ${NVM_DIR}/nvm.sh && nvm use
 
 clean:
 	rm -rf node_modules
 
-deps:
-	@rm -rf package-lock.json
+deps: set_node_version
+	@rm -f package-lock.json
 	yarn install
 
-tests:
+tests: set_node_version
 	yarn test
 
-build:
+build: set_node_version
 	yarn run build
 
-release:
+release: set_node_version
 	git pull --tags
 	git pull --rebase
 	@echo "Ensure version changes follow semantic versioning - https://classic.yarnpkg.com/en/docs/dependency-versions#toc-semantic-versioning"
@@ -36,7 +32,7 @@ deploy-to-avni-client-only:
 
 deploy-to-avni-client: build deploy-to-avni-client-only
 
-deploy-to-avni-web:
+deploy-to-avni-project: build
 	$(if $(local),$(call _deploy,$(local)/node_modules/openchs-models))
 
 deploy-as-source-to-avni-client:

package/dist/AbstractEncounter.js

@@ -27,11 +27,97 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _Observation = _interopRequireDefault(require("./Observation"));
 
+var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
+
 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 AbstractEncounter extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get latestEntityApprovalStatus() {
+    return this.toEntity("latestEntityApprovalStatus", _EntityApprovalStatus.default);
+  }
+
+  set latestEntityApprovalStatus(x) {
+    this.that.latestEntityApprovalStatus = this.fromObject(x);
+  }
+
+  get name() {
+    return this.that.name;
+  }
+
+  set name(x) {
+    this.that.name = x;
+  }
+
+  get earliestVisitDateTime() {
+    return this.that.earliestVisitDateTime;
+  }
+
+  set earliestVisitDateTime(x) {
+    this.that.earliestVisitDateTime = x;
+  }
+
+  get maxVisitDateTime() {
+    return this.that.maxVisitDateTime;
+  }
+
+  set maxVisitDateTime(x) {
+    this.that.maxVisitDateTime = x;
+  }
+
+  get encounterType() {
+    return this.toEntity("encounterType", _EncounterType.default);
+  }
+
+  set encounterType(x) {
+    this.that.encounterType = this.fromObject(x);
+  }
+
+  get encounterDateTime() {
+    return this.that.encounterDateTime;
+  }
+
+  set encounterDateTime(x) {
+    this.that.encounterDateTime = x;
+  }
+
+  get observations() {
+    return this.toEntityList("observations", _Observation.default);
+  }
+
+  set observations(x) {
+    this.that.observations = this.fromEntityList(x);
+  }
+
+  get cancelLocation() {
+    return this.toEntity("cancelLocation", _Point.default);
+  }
+
+  set cancelLocation(x) {
+    this.that.cancelLocation = this.fromObject(x);
+  }
+
+  get cancelObservations() {
+    return this.toEntityList("cancelObservations", _Observation.default);
+  }
+
+  set cancelObservations(x) {
+    this.that.cancelObservations = this.fromEntityList(x);
+  }
+
+  get cancelDateTime() {
+    return this.that.cancelDateTime;
+  }
+
+  set cancelDateTime(x) {
+    this.that.cancelDateTime = x;
+  }
+
   validate() {
     return _lodash.default.isNil(this.encounterDateTime) ? [new _ValidationResult.default(false, AbstractEncounter.fieldKeys.ENCOUNTER_DATE_TIME, "emptyValidationMessage")] : [_ValidationResult.default.successful(AbstractEncounter.fieldKeys.ENCOUNTER_DATE_TIME)];
   }
@@ -59,8 +145,7 @@ class AbstractEncounter extends _BaseEntity.default {
     return resource;
   }
 
-  static createEmptyInstance() {
-    const encounter = new this();
+  static createEmptyInstance(encounter) {
     encounter.voided = false;
     encounter.uuid = _General.default.randomUUID();
     encounter.observations = [];
@@ -92,9 +177,7 @@ class AbstractEncounter extends _BaseEntity.default {
     return encounter;
   }
 
-  static fromResource(resource, entityService) {
-    const encounter = new this();
-
+  static fromResource(resource, entityService, encounter) {
     _General.default.assignFields(resource, encounter, ["uuid", "voided"], ["encounterDateTime"], ["observations", "cancelObservations"], entityService);
 
     encounter.encounterType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "encounterTypeUUID"), _EncounterType.default.schema.name);
@@ -109,9 +192,7 @@ class AbstractEncounter extends _BaseEntity.default {
 
   getEncounterDateValues() {
     return {
-      [AbstractEncounter.fieldKeys.ENCOUNTER_DATE_TIME]: this.encounterDateTime,
-      [ProgramEncounter.fieldKeys.SCHEDULED_DATE_TIME]: this.earliestVisitDateTime,
-      [ProgramEncounter.fieldKeys.MAX_DATE_TIME]: this.maxVisitDateTime
+      [AbstractEncounter.fieldKeys.ENCOUNTER_DATE_TIME]: this.encounterDateTime
     };
   }
 

package/dist/AddressLevel.js

@@ -13,6 +13,10 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _Observation = _interopRequireDefault(require("./Observation"));
+
+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; }
@@ -21,6 +25,26 @@ const PARENT_LOCATION_UUID = "parentLocationUUID";
 const CHILD_LOCATION_UUID = "locationUUID";
 
 class LocationMapping extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get parent() {
+    return this.toEntity("parent", AddressLevel);
+  }
+
+  set parent(x) {
+    this.that.parent = this.fromObject(x);
+  }
+
+  get child() {
+    return this.toEntity("child", AddressLevel);
+  }
+
+  set child(x) {
+    this.that.child = this.fromObject(x);
+  }
+
   static create({
     uuid,
     parent,
@@ -49,7 +73,7 @@ class LocationMapping extends _BaseEntity.default {
 exports.LocationMapping = LocationMapping;
 
 _defineProperty(LocationMapping, "schema", {
-  name: "LocationMapping",
+  name: _SchemaNames.default.LocationMapping,
   primaryKey: "uuid",
   properties: {
     uuid: "string",
@@ -65,12 +89,72 @@ _defineProperty(LocationMapping, "schema", {
 _defineProperty(LocationMapping, "parentAssociations", () => new Map([[AddressLevel, PARENT_LOCATION_UUID]]));
 
 class AddressLevel extends _BaseEntity.default {
-  constructor(...args) {
-    super(...args);
+  constructor(that = null) {
+    super(that);
+  }
+
+  get name() {
+    return this.that.name;
+  }
+
+  set name(x) {
+    this.that.name = x;
+  }
+
+  get level() {
+    return this.that.level;
+  }
+
+  set level(x) {
+    this.that.level = x;
+  }
 
-    _defineProperty(this, "uuid", void 0);
+  get type() {
+    return this.that.type;
+  }
+
+  set type(x) {
+    this.that.type = x;
+  }
+
+  get locationMappings() {
+    return this.toEntityList("locationMappings", LocationMapping);
+  }
+
+  set locationMappings(x) {
+    this.that.locationMappings = this.fromEntityList(x);
+  }
+
+  get locationProperties() {
+    return this.toEntityList("locationProperties", _Observation.default);
+  }
+
+  set locationProperties(x) {
+    this.that.locationProperties = this.fromEntityList(x);
+  }
+
+  get titleLineage() {
+    return this.that.titleLineage;
+  }
+
+  set titleLineage(x) {
+    this.that.titleLineage = x;
+  }
+
+  get parentUuid() {
+    return this.that.parentUuid;
+  }
+
+  set parentUuid(x) {
+    this.that.parentUuid = x;
+  }
+
+  get typeUuid() {
+    return this.that.typeUuid;
+  }
 
-    _defineProperty(this, "name", void 0);
+  set typeUuid(x) {
+    this.that.typeUuid = x;
   }
 
   static create({

package/dist/ApprovalStatus.js

@@ -14,6 +14,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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 ApprovalStatus extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get status() {
+    return this.that.status;
+  }
+
+  set status(x) {
+    this.that.status = x;
+  }
+
   get isPending() {
     return this.status === ApprovalStatus.statuses.Pending;
   }

package/dist/BaseEntity.js

@@ -15,11 +15,35 @@ var _SyncError = _interopRequireDefault(require("./error/SyncError"));
 
 var _ErrorCodes = require("./error/ErrorCodes");
 
+var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
+
+var _ArrayHelper = _interopRequireDefault(require("./framework/ArrayHelper"));
+
 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 BaseEntity {
+class BaseEntity extends _PersistedObject.default {
+  constructor(that) {
+    super(that);
+  }
+
+  get voided() {
+    return this.that.voided;
+  }
+
+  set voided(x) {
+    this.that.voided = x;
+  }
+
+  set uuid(x) {
+    this.that.uuid = x;
+  }
+
+  get uuid() {
+    return this.that.uuid;
+  }
+
   static mergeOn(key) {
     return entities => {
       return entities.reduce((acc, entity) => {
@@ -30,10 +54,15 @@ class BaseEntity {
       });
     };
   }
+  /*
+  to be used only during sync where entities are handled generically and not via model classes
+   */
+
 
   static addNewChild(newChild, existingChildren) {
     if (!BaseEntity.collectionHasEntity(existingChildren, newChild)) {
-      existingChildren.push(newChild);
+      const child = _lodash.default.isNil(newChild.that) ? newChild : newChild.that;
+      existingChildren.push(child);
     }
   }
 
@@ -42,7 +71,7 @@ class BaseEntity {
   }
 
   static removeFromCollection(collection, entity) {
-    _lodash.default.remove(collection, item => item.uuid === entity.uuid);
+    _ArrayHelper.default.remove(collection, item => item.uuid === entity.uuid);
   }
 
   equals(other) {

package/dist/BeneficiaryModePin.js

@@ -5,9 +5,27 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
+
+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; }
 
-class BeneficiaryModePin {
+class BeneficiaryModePin extends _PersistedObject.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get pin() {
+    return this.that.pin;
+  }
+
+  set pin(x) {
+    this.that.pin = x;
+  }
+
   pinMatches(enteredPin) {
     return enteredPin === this.pin;
   }
@@ -15,7 +33,7 @@ class BeneficiaryModePin {
 }
 
 _defineProperty(BeneficiaryModePin, "schema", {
-  name: "BeneficiaryModePin",
+  name: _SchemaNames.default.BeneficiaryModePin,
   properties: {
     pin: "int"
   }

package/dist/Checklist.js

@@ -19,11 +19,49 @@ var _ChecklistItem = _interopRequireDefault(require("./ChecklistItem"));
 
 var _ChecklistDetail = _interopRequireDefault(require("./ChecklistDetail"));
 
+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; }
 
 class Checklist extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get detail() {
+    return this.toEntity("detail", _ChecklistDetail.default);
+  }
+
+  set detail(x) {
+    this.that.detail = this.fromObject(x);
+  }
+
+  get baseDate() {
+    return this.that.baseDate;
+  }
+
+  set baseDate(x) {
+    this.that.baseDate = x;
+  }
+
+  get items() {
+    return this.toEntityList("items", _ChecklistItem.default);
+  }
+
+  set items(x) {
+    this.that.items = this.fromEntityList(x);
+  }
+
+  get programEnrolment() {
+    return this.toEntity("programEnrolment", _ProgramEnrolment.default);
+  }
+
+  set programEnrolment(x) {
+    this.that.programEnrolment = this.fromObject(x);
+  }
+
   static create() {
     const checklist = new Checklist();
     checklist.uuid = _General.default.randomUUID();
@@ -91,7 +129,7 @@ class Checklist extends _BaseEntity.default {
 }
 
 _defineProperty(Checklist, "schema", {
-  name: "Checklist",
+  name: _SchemaNames.default.Checklist,
   primaryKey: "uuid",
   properties: {
     uuid: "string",

package/dist/ChecklistDetail.js

@@ -5,23 +5,39 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
-
 var _General = _interopRequireDefault(require("./utility/General"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
 var _ChecklistItemDetail = _interopRequireDefault(require("./ChecklistItemDetail"));
 
-var _ProgramEncounter = _interopRequireDefault(require("./ProgramEncounter"));
-
-var _Checklist = _interopRequireDefault(require("./Checklist"));
+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; }
 
 class ChecklistDetail extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get name() {
+    return this.that.name;
+  }
+
+  set name(x) {
+    this.that.name = x;
+  }
+
+  get items() {
+    return this.toEntityList("items", _ChecklistItemDetail.default);
+  }
+
+  set items(x) {
+    this.that.items = this.fromEntityList(x);
+  }
+
   static fromResource(checklistResource, entityService) {
     const checklistDetail = _General.default.assignFields(checklistResource, new ChecklistDetail(), ["uuid", "name", "voided"]);
 
@@ -47,7 +63,7 @@ class ChecklistDetail extends _BaseEntity.default {
 }
 
 _defineProperty(ChecklistDetail, "schema", {
-  name: "ChecklistDetail",
+  name: _SchemaNames.default.ChecklistDetail,
   primaryKey: "uuid",
   properties: {
     uuid: "string",

package/dist/ChecklistItem.js

@@ -23,11 +23,61 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
+var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
+
+var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
+
+var _Observation = _interopRequireDefault(require("./Observation"));
+
 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 ChecklistItem {
+class ChecklistItem extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get detail() {
+    return this.toEntity("detail", _ChecklistItemDetail.default);
+  }
+
+  set detail(x) {
+    this.that.detail = this.fromObject(x);
+  }
+
+  get completionDate() {
+    return this.that.completionDate;
+  }
+
+  set completionDate(x) {
+    this.that.completionDate = x;
+  }
+
+  get observations() {
+    return this.toEntityList("observations", _Observation.default);
+  }
+
+  set observations(x) {
+    this.that.observations = this.fromEntityList(x);
+  }
+
+  get checklist() {
+    return this.toEntity("checklist", _Checklist.default);
+  }
+
+  set checklist(x) {
+    this.that.checklist = this.fromObject(x);
+  }
+
+  get latestEntityApprovalStatus() {
+    return this.toEntity("latestEntityApprovalStatus", _EntityApprovalStatus.default);
+  }
+
+  set latestEntityApprovalStatus(x) {
+    this.that.latestEntityApprovalStatus = this.fromObject(x);
+  }
+
   static create({
     uuid = _General.default.randomUUID(),
     observations = [],
@@ -233,7 +283,7 @@ class ChecklistItem {
 }
 
 _defineProperty(ChecklistItem, "schema", {
-  name: "ChecklistItem",
+  name: _SchemaNames.default.ChecklistItem,
   primaryKey: "uuid",
   properties: {
     uuid: "string",

package/dist/ChecklistItemDetail.js

@@ -21,15 +21,89 @@ var _Concept = _interopRequireDefault(require("./Concept"));
 
 var _ChecklistItemStatus = _interopRequireDefault(require("./ChecklistItemStatus"));
 
-var _ProgramEncounter = _interopRequireDefault(require("./ProgramEncounter"));
-
-var _Checklist = _interopRequireDefault(require("./Checklist"));
+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; }
 
 class ChecklistItemDetail extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get concept() {
+    return this.toEntity("concept", _Concept.default);
+  }
+
+  set concept(x) {
+    this.that.concept = this.fromObject(x);
+  }
+
+  get stateConfig() {
+    return this.toEntityList("stateConfig", _ChecklistItemStatus.default);
+  }
+
+  set stateConfig(x) {
+    this.that.stateConfig = this.fromEntityList(x);
+  }
+
+  get form() {
+    return this.toEntity("form", _Form.default);
+  }
+
+  set form(x) {
+    this.that.form = this.fromObject(x);
+  }
+
+  get checklistDetail() {
+    return this.toEntity("checklistDetail", _ChecklistDetail.default);
+  }
+
+  set checklistDetail(x) {
+    this.that.checklistDetail = this.fromObject(x);
+  }
+
+  get dependentOn() {
+    return this.toEntity("dependentOn", ChecklistItemDetail);
+  }
+
+  set dependentOn(x) {
+    this.that.dependentOn = this.fromObject(x);
+  }
+
+  get scheduleOnExpiryOfDependency() {
+    return this.that.scheduleOnExpiryOfDependency;
+  }
+
+  set scheduleOnExpiryOfDependency(x) {
+    this.that.scheduleOnExpiryOfDependency = x;
+  }
+
+  get minDaysFromStartDate() {
+    return this.that.minDaysFromStartDate;
+  }
+
+  set minDaysFromStartDate(x) {
+    this.that.minDaysFromStartDate = x;
+  }
+
+  get minDaysFromDependent() {
+    return this.that.minDaysFromDependent;
+  }
+
+  set minDaysFromDependent(x) {
+    this.that.minDaysFromDependent = x;
+  }
+
+  get expiresAfter() {
+    return this.that.expiresAfter;
+  }
+
+  set expiresAfter(x) {
+    this.that.expiresAfter = x;
+  }
+
   static fromResource(checklistItemResource, entityService, resourcesInCurrentPage) {
     const checklistDetail = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(checklistItemResource, "checklistDetailUUID"), _ChecklistDetail.default.schema.name);
     const form = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(checklistItemResource, "formUUID"), _Form.default.schema.name);
@@ -65,7 +139,7 @@ class ChecklistItemDetail extends _BaseEntity.default {
 }
 
 _defineProperty(ChecklistItemDetail, "schema", {
-  name: "ChecklistItemDetail",
+  name: _SchemaNames.default.ChecklistItemDetail,
   primaryKey: "uuid",
   properties: {
     uuid: "string",