openchs-models 1.31.35 → 1.31.36

package/dist/UserInfo.js

@@ -58,6 +58,14 @@ class UserInfo extends _BaseEntity.default {
     this.that.syncSettings = x;
   }
 
+  get userUUID() {
+    return this.that.userUUID;
+  }
+
+  set userUUID(x) {
+    this.that.userUUID = x;
+  }
+
   static fromResource(resource) {
     let userInfo = new UserInfo();
     userInfo.username = resource.username;
@@ -66,6 +74,7 @@ class UserInfo extends _BaseEntity.default {
     userInfo.settings = _lodash.default.isNil(resource.settings) ? UserInfo.DEFAULT_SETTINGS : JSON.stringify(resource.settings);
     userInfo.name = resource.name;
     userInfo.syncSettings = _lodash.default.isNil(resource.syncSettings) ? '{}' : JSON.stringify(resource.syncSettings);
+    userInfo.userUUID = resource.userUUID;
     return userInfo;
   }
 
@@ -131,6 +140,10 @@ _defineProperty(UserInfo, "schema", {
     syncSettings: {
       type: "string",
       optional: true
+    },
+    userUUID: {
+      type: "string",
+      optional: true
     }
   }
 });

package/dist/application/DashboardCacheFilter.js

@@ -0,0 +1,80 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+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 overwriteField(field, source, destination, force) {
+  if (_lodash.default.isNil(destination[field]) || force) destination[field] = source[field];
+}
+
+class DashboardCacheFilter {
+  constructor() {
+    _defineProperty(this, "filterDate", void 0);
+
+    _defineProperty(this, "selectedPrograms", void 0);
+
+    _defineProperty(this, "selectedEncounterTypes", void 0);
+
+    _defineProperty(this, "selectedGeneralEncounterTypes", void 0);
+
+    _defineProperty(this, "selectedCustomFilters", void 0);
+
+    _defineProperty(this, "selectedGenders", void 0);
+
+    _defineProperty(this, "individualFilters", void 0);
+
+    _defineProperty(this, "encountersFilters", void 0);
+
+    _defineProperty(this, "enrolmentFilters", void 0);
+
+    _defineProperty(this, "dueChecklistFilter", void 0);
+
+    _defineProperty(this, "generalEncountersFilters", void 0);
+
+    _defineProperty(this, "selectedSubjectTypeUUID", void 0);
+
+    _defineProperty(this, "selectedLocations", void 0);
+
+    _defineProperty(this, "selectedAddressesInfo", void 0);
+  }
+
+  static overwriteFields(from, dashboardCacheFilter, force) {
+    overwriteField("filterDate", from, dashboardCacheFilter, force);
+    overwriteField("selectedPrograms", from, dashboardCacheFilter, force);
+    overwriteField("selectedEncounterTypes", from, dashboardCacheFilter, force);
+    overwriteField("selectedGeneralEncounterTypes", from, dashboardCacheFilter, force);
+    overwriteField("selectedCustomFilters", from, dashboardCacheFilter, force);
+    overwriteField("selectedGenders", from, dashboardCacheFilter, force);
+    overwriteField("individualFilters", from, dashboardCacheFilter, force);
+    overwriteField("encountersFilters", from, dashboardCacheFilter, force);
+    overwriteField("enrolmentFilters", from, dashboardCacheFilter, force);
+    overwriteField("generalEncountersFilters", from, dashboardCacheFilter, force);
+    overwriteField("selectedSubjectTypeUUID", from, dashboardCacheFilter, force);
+    overwriteField("dueChecklistFilter", from, dashboardCacheFilter, force);
+    overwriteField("selectedLocations", from, dashboardCacheFilter, force);
+    overwriteField("selectedAddressesInfo", from, dashboardCacheFilter, force);
+  }
+
+  static createEmptyInstance() {
+    const dashboardCacheFilter = new DashboardCacheFilter();
+    dashboardCacheFilter.selectedPrograms = [];
+    dashboardCacheFilter.selectedEncounterTypes = [];
+    dashboardCacheFilter.selectedGeneralEncounterTypes = [];
+    dashboardCacheFilter.selectedCustomFilters = [];
+    dashboardCacheFilter.selectedGenders = [];
+    dashboardCacheFilter.selectedLocations = [];
+    return dashboardCacheFilter;
+  }
+
+}
+
+var _default = DashboardCacheFilter;
+exports.default = _default;

package/dist/application/FormElement.js

@@ -143,9 +143,7 @@ class FormElement extends _BaseEntity.default {
     formElement.formElementGroup = formElementGroup;
     formElement.groupUuid = _ResourceUtil.default.getUUIDFor(resource, "groupQuestionUUID");
     formElement.documentation = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "documentationUUID"), _Documentation.default.schema.name);
-    formElement.concept = concept; //remove orphan keyValues (because KeyValue doesn't have primary key
-
-    entityService.deleteObjects(resource["uuid"], FormElement.schema.name, "keyValues");
+    formElement.concept = concept;
     formElement.keyValues = _lodash.default.map(resource.keyValues, _KeyValue.default.fromResource);
     formElement.validFormat = _Format.default.fromResource(resource["validFormat"]);
     return formElement;
@@ -394,7 +392,7 @@ class FormElement extends _BaseEntity.default {
     formElement.name = this.name;
     formElement.displayOrder = this.displayOrder;
     formElement.mandatory = this.mandatory;
-    formElement.keyValues = this.keyValues;
+    formElement.keyValues = _lodash.default.map(this.keyValues, _KeyValue.default.fromResource);
     formElement.concept = this.concept;
     formElement.type = this.type;
     formElement.formElementGroup = this.formElementGroup;
@@ -418,7 +416,7 @@ _defineProperty(FormElement, "schema", {
     mandatory: "bool",
     keyValues: {
       type: "list",
-      objectType: "KeyValue"
+      objectType: _SchemaNames.default.KeyValue
     },
     concept: "Concept",
     type: {
@@ -427,7 +425,7 @@ _defineProperty(FormElement, "schema", {
     },
     formElementGroup: "FormElementGroup",
     validFormat: {
-      type: "Format",
+      type: _SchemaNames.default.Format,
       optional: true
     },
     voided: {

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

@@ -17,7 +17,7 @@ class KeyValue extends _PersistedObject.default {
   static fromResource(resource) {
     const keyValue = new KeyValue();
     keyValue.key = resource.key;
-    keyValue.value = JSON.stringify(resource.value);
+    keyValue.value = typeof resource.value !== "string" ? JSON.stringify(resource.value) : resource.value;
     return keyValue;
   }
 
@@ -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/assignment/UserSubjectAssignment.js

@@ -11,8 +11,14 @@ var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
 
 var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
+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 UserSubjectAssignment extends _BaseEntity.default {
@@ -28,10 +34,43 @@ class UserSubjectAssignment extends _BaseEntity.default {
     this.that.subjectUUID = 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 fromResource(resource) {
     const userSubjectAssignment = new UserSubjectAssignment();
     userSubjectAssignment.uuid = resource.uuid;
     userSubjectAssignment.subjectUUID = _ResourceUtil.default.getUUIDFor(resource, 'subjectUUID');
+    (0, _AuditUtil.mapAuditFields)(userSubjectAssignment, resource);
     return userSubjectAssignment;
   }
 
@@ -40,10 +79,10 @@ class UserSubjectAssignment extends _BaseEntity.default {
 _defineProperty(UserSubjectAssignment, "schema", {
   name: _SchemaNames.default.UserSubjectAssignment,
   primaryKey: 'uuid',
-  properties: {
+  properties: _objectSpread({
     uuid: 'string',
     subjectUUID: 'string'
-  }
+  }, _AuditUtil.AuditFields)
 });
 
 var _default = UserSubjectAssignment;

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

@@ -55,6 +55,14 @@ class RealmProxy {
   close() {
     return this.realmDb.close();
   }
+  /**
+   *
+   * @param schemaName
+   * @param properties
+   * @param updateMode , all === true, modified , never === false
+   * @returns {*}
+   */
+
 
   create(schemaName, properties, updateMode = "never") {
     const underlyingObject = _lodash.default.isNil(properties.that) ? properties : properties.that;
@@ -70,7 +78,7 @@ class RealmProxy {
       });
 
       if (emptyMandatoryProperties.length > 0) {
-        throw new Error(`${emptyMandatoryProperties.join(",")} are mandatory for ${schemaName}, Keys being saved - ${saveObjectKeys}`);
+        throw new Error(`${emptyMandatoryProperties.join(",")} are mandatory for ${schemaName}, Keys being saved - ${saveObjectKeys}. UUID: ${underlyingObject.uuid}`);
       }
     }
 

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

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "AddressLevel", {
     return _AddressLevel.default;
   }
 });
-Object.defineProperty(exports, "LocationMapping", {
-  enumerable: true,
-  get: function () {
-    return _AddressLevel.LocationMapping;
-  }
-});
 Object.defineProperty(exports, "BaseEntity", {
   enumerable: true,
   get: function () {
@@ -393,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 () {
@@ -813,10 +795,16 @@ Object.defineProperty(exports, "AgeUtil", {
     return _AgeUtil.default;
   }
 });
+Object.defineProperty(exports, "DashboardCacheFilter", {
+  enumerable: true,
+  get: function () {
+    return _DashboardCacheFilter.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
-var _AddressLevel = _interopRequireWildcard(require("./AddressLevel"));
+var _AddressLevel = _interopRequireDefault(require("./AddressLevel"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
@@ -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"));
@@ -1074,6 +1058,8 @@ var _CustomDashboardCache = _interopRequireDefault(require("./CustomDashboardCac
 
 var _AgeUtil = _interopRequireDefault(require("./utility/AgeUtil"));
 
+var _DashboardCacheFilter = _interopRequireDefault(require("./application/DashboardCacheFilter"));
+
 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; }

package/dist/program/SubjectProgramEligibility.js

@@ -23,8 +23,14 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
+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 SubjectProgramEligibility extends _BaseEntity.default {
@@ -72,6 +78,38 @@ class SubjectProgramEligibility extends _BaseEntity.default {
     this.that.observations = 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(program, subject) {
     const subjectProgramEligibility = new SubjectProgramEligibility();
     subjectProgramEligibility.checkDate = new Date();
@@ -107,6 +145,7 @@ class SubjectProgramEligibility extends _BaseEntity.default {
 
     subjectProgramEligibility.program = program;
     subjectProgramEligibility.subject = subject;
+    (0, _AuditUtil.mapAuditFields)(subjectProgramEligibility, resource);
     return subjectProgramEligibility;
   }
 
@@ -171,7 +210,7 @@ class SubjectProgramEligibility extends _BaseEntity.default {
 _defineProperty(SubjectProgramEligibility, "schema", {
   name: _SchemaNames.default.SubjectProgramEligibility,
   primaryKey: "uuid",
-  properties: {
+  properties: _objectSpread({
     uuid: "string",
     subject: "Individual",
     program: "Program",
@@ -182,13 +221,13 @@ _defineProperty(SubjectProgramEligibility, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     voided: {
       type: "bool",
       default: false
     }
-  }
+  }, _AuditUtil.AuditFields)
 });
 
 var _default = SubjectProgramEligibility;

package/dist/relationship/IndividualRelationship.js

@@ -21,15 +21,17 @@ var _Observation = _interopRequireDefault(require("../Observation"));
 
 var _SchemaNames = _interopRequireDefault(require("../SchemaNames"));
 
+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 IndividualRelationship extends _BaseEntity.default {
-  constructor(that = null) {
-    super(that);
-  }
-
   get relationship() {
     return this.toEntity("relationship", _IndividualRelationshipType.default);
   }
@@ -78,6 +80,38 @@ class IndividualRelationship extends _BaseEntity.default {
     this.that.exitObservations = 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() {
     const individualRelationship = new IndividualRelationship();
     individualRelationship.uuid = _General.default.randomUUID();
@@ -109,6 +143,7 @@ class IndividualRelationship extends _BaseEntity.default {
     individualRelationship.relationship = relationshipType;
     individualRelationship.individualA = individualA;
     individualRelationship.individualB = individualB;
+    (0, _AuditUtil.mapAuditFields)(individualRelationship, resource);
     return individualRelationship;
   }
 
@@ -157,7 +192,7 @@ class IndividualRelationship extends _BaseEntity.default {
 _defineProperty(IndividualRelationship, "schema", {
   name: _SchemaNames.default.IndividualRelationship,
   primaryKey: "uuid",
-  properties: {
+  properties: _objectSpread({
     uuid: "string",
     relationship: "IndividualRelationshipType",
     individualA: "Individual",
@@ -172,13 +207,13 @@ _defineProperty(IndividualRelationship, "schema", {
     },
     exitObservations: {
       type: "list",
-      objectType: "Observation"
+      objectType: "EmbeddedObservation"
     },
     voided: {
       type: "bool",
       default: false
     }
-  }
+  }, _AuditUtil.AuditFields)
 });
 
 var _default = IndividualRelationship;