openchs-models 1.31.34 → 1.31.35

package/.circleci/config.yml

@@ -8,7 +8,6 @@ defaults: &defaults
 jobs:
   build:
     <<: *defaults
-    resource_class: large
     steps:
       - checkout
 

package/Makefile

@@ -28,12 +28,8 @@ deploy-to-avni-client-only:
 deploy-to-avni-web-only:
 	$(call _deploy,../avni-webapp/node_modules/openchs-models)
 
-deploy-to-avni-rule-server-only:
-	$(call _deploy,../rule-server/node_modules/openchs-models)
-
 deploy-to-avni-client: build deploy-to-avni-client-only
 deploy-to-avni-web: build deploy-to-avni-web-only
-deploy-to-avni-rule-server: build deploy-to-avni-rule-server-only
 
 deploy-to-avni-project: build
 	$(if $(local),$(call _deploy,$(local)/node_modules/openchs-models))

package/dist/AbstractEncounter.js

@@ -33,8 +33,6 @@ 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 _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; }
@@ -138,54 +136,6 @@ class AbstractEncounter 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;
-  }
-
-  get filledBy() {
-    return this.that.filledBy;
-  }
-
-  set filledBy(x) {
-    this.that.filledBy = x;
-  }
-
-  get filledByUUID() {
-    return this.that.filledByUUID;
-  }
-
-  set filledByUUID(x) {
-    this.that.filledByUUID = 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)];
   }
@@ -256,9 +206,6 @@ class AbstractEncounter extends _BaseEntity.default {
     encounter.name = resource.name;
     if (!_lodash.default.isNil(resource.encounterLocation)) encounter.encounterLocation = _Point.default.fromResource(resource.encounterLocation);
     if (!_lodash.default.isNil(resource.cancelLocation)) encounter.cancelLocation = _Point.default.fromResource(resource.cancelLocation);
-    (0, _AuditUtil.mapAuditFields)(encounter, resource);
-    encounter.filledBy = _ResourceUtil.default.getFieldValue(resource, "filledBy");
-    encounter.filledByUUID = _ResourceUtil.default.getFieldValue(resource, "filledByUUID");
     return encounter;
   }
 

package/dist/AddressLevel.js

@@ -261,7 +261,7 @@ _defineProperty(AddressLevel, "schema", {
     },
     locationProperties: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     titleLineage: {
       type: "string",

package/dist/Checklist.js

@@ -23,14 +23,8 @@ var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
-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 Checklist extends _BaseEntity.default {
@@ -70,38 +64,6 @@ class Checklist extends _BaseEntity.default {
     this.that.programEnrolment = this.fromObject(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() {
     const checklist = new Checklist();
     checklist.uuid = _General.default.randomUUID();
@@ -117,7 +79,6 @@ class Checklist extends _BaseEntity.default {
     const checklistDetail = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(checklistResource, "checklistDetailUUID"), _ChecklistDetail.default.schema.name);
     checklist.programEnrolment = programEnrolment;
     checklist.detail = checklistDetail;
-    (0, _AuditUtil.mapAuditFields)(checklist, checklistResource);
     return checklist;
   }
 
@@ -176,7 +137,7 @@ class Checklist extends _BaseEntity.default {
 _defineProperty(Checklist, "schema", {
   name: _SchemaNames.default.Checklist,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     detail: "ChecklistDetail",
     baseDate: "date",
@@ -185,7 +146,7 @@ _defineProperty(Checklist, "schema", {
       objectType: "ChecklistItem"
     },
     programEnrolment: "ProgramEnrolment"
-  }, _AuditUtil.AuditFields)
+  }
 });
 
 _defineProperty(Checklist, "merge", () => _BaseEntity.default.mergeOn("items"));

package/dist/ChecklistItem.js

@@ -31,14 +31,8 @@ var _Observation = _interopRequireDefault(require("./Observation"));
 
 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.EntityApprovalStatus, "approvalStatuses"]]);
@@ -84,38 +78,6 @@ class ChecklistItem extends _BaseEntity.default {
     return _lodash.default.maxBy(this.approvalStatuses, 'statusDateTime');
   }
 
-  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({
     uuid = _General.default.randomUUID(),
     observations = [],
@@ -138,7 +100,6 @@ class ChecklistItem extends _BaseEntity.default {
 
     checklistItem.checklist = checklist;
     checklistItem.detail = checklistItemDetail;
-    (0, _AuditUtil.mapAuditFields)(checklistItem, checklistItemResource);
     return checklistItem;
   }
 
@@ -353,7 +314,7 @@ class ChecklistItem extends _BaseEntity.default {
 _defineProperty(ChecklistItem, "schema", {
   name: _SchemaNames.default.ChecklistItem,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     detail: "ChecklistItemDetail",
     completionDate: {
@@ -362,7 +323,7 @@ _defineProperty(ChecklistItem, "schema", {
     },
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     checklist: "Checklist",
     approvalStatuses: {
@@ -372,8 +333,9 @@ _defineProperty(ChecklistItem, "schema", {
     latestEntityApprovalStatus: {
       type: "EntityApprovalStatus",
       optional: true
-    }
-  }, _AuditUtil.AuditFields)
+    } //Reporting purposes
+
+  }
 });
 
 _defineProperty(ChecklistItem, "merge", childEntityName => _MergeUtil.default.getMergeFunction(childEntityName, mergeMap));

package/dist/ChecklistItemDetail.js

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

package/dist/ChecklistItemStatus.js

@@ -126,11 +126,10 @@ class ChecklistItemStatus extends _PersistedObject.default {
 
 _defineProperty(ChecklistItemStatus, "schema", {
   name: _SchemaNames.default.ChecklistItemStatus,
-  embedded: true,
   properties: {
     state: "string",
-    from: _SchemaNames.default.StringKeyNumericValue,
-    to: _SchemaNames.default.StringKeyNumericValue,
+    from: "StringKeyNumericValue",
+    to: "StringKeyNumericValue",
     color: {
       type: "string",
       default: "yellow"

package/dist/Comment.js

@@ -19,14 +19,8 @@ var _CommentThread = _interopRequireDefault(require("./CommentThread"));
 
 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 Comment extends _BaseEntity.default {
@@ -90,38 +84,6 @@ class Comment extends _BaseEntity.default {
     this.that.commentThread = this.fromObject(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;
-  }
-
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid", "text", "voided"]);
 
@@ -136,7 +98,6 @@ class Comment extends _BaseEntity.default {
     comment.createdByUsername = resource["createdBy"];
     comment.subject = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "individualUUID"), _Individual.default.schema.name);
     comment.commentThread = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "commentThreadUUID"), _CommentThread.default.schema.name);
-    (0, _AuditUtil.mapAuditFields)(comment, resource);
     return comment;
   }
 
@@ -193,7 +154,7 @@ class Comment extends _BaseEntity.default {
 _defineProperty(Comment, "schema", {
   name: _SchemaNames.default.Comment,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     text: "string",
     subject: "Individual",
@@ -206,7 +167,7 @@ _defineProperty(Comment, "schema", {
       type: "bool",
       default: false
     }
-  }, _AuditUtil.AuditFields)
+  }
 });
 
 var _default = Comment;

package/dist/Concept.js

@@ -127,7 +127,9 @@ class Concept extends _BaseEntity.default {
     concept.hiNormal = conceptResource.highNormal;
     concept.unit = conceptResource.unit;
     concept.voided = conceptResource.voided || false; //This change should be independently deployable irrespective of server
+    //remove orphan keyValues (because KeyValue doesn't have primary key
 
+    entityService && entityService.deleteObjects(conceptResource["uuid"], Concept.schema.name, "keyValues");
     concept.keyValues = _lodash.default.map(conceptResource.keyValues, _KeyValue.default.fromResource);
     return concept;
   }
@@ -153,18 +155,20 @@ class Concept extends _BaseEntity.default {
     concept.name = name;
     concept.datatype = dataType;
     concept.uuid = uuid;
-    concept.keyValues = _lodash.default.map(keyValues, _KeyValue.default.fromResource);
+    concept.keyValues = keyValues;
     return concept;
   }
-  /**
-   * This should never be cloned and used for reference as this is metadata which is not to be modified during transactional data operations
-   *
-   * @returns {Concept}
-   */
-
 
   cloneForReference() {
-    return this;
+    const concept = Concept.create(this.name, this.datatype, this.keyValues);
+    concept.uuid = this.uuid;
+    concept.unit = this.unit;
+    concept.lowAbsolute = this.lowAbsolute;
+    concept.lowNormal = this.lowNormal;
+    concept.hiNormal = this.hiNormal;
+    concept.hiAbsolute = this.hiAbsolute;
+    concept.answers = this.answers || [];
+    return concept;
   }
 
   _valuePresent(value) {
@@ -371,7 +375,7 @@ _defineProperty(Concept, "schema", {
     },
     keyValues: {
       type: "list",
-      objectType: _SchemaNames.default.KeyValue
+      objectType: "KeyValue"
     },
     voided: {
       type: "bool",

package/dist/DashboardCache.js

@@ -5,12 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
-
-var _DashboardCacheFilter = _interopRequireDefault(require("./application/DashboardCacheFilter"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
+
 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; }
@@ -20,6 +18,14 @@ class DashboardCache extends _BaseEntity.default {
     super(that);
   }
 
+  get updatedAt() {
+    return this.that.updatedAt;
+  }
+
+  set updatedAt(x) {
+    this.that.updatedAt = x;
+  }
+
   get cardJSON() {
     return this.that.cardJSON;
   }
@@ -36,34 +42,43 @@ class DashboardCache extends _BaseEntity.default {
     this.that.filterJSON = x;
   }
 
-  static createEmptyInstance() {
+  static create(updatedAt, cardJSON, filterJSON) {
     const dashboardCache = new DashboardCache();
     dashboardCache.uuid = this.rowUUID;
-    dashboardCache.filterJSON = JSON.stringify(_DashboardCacheFilter.default.createEmptyInstance());
-    dashboardCache.cardJSON = "{}";
+    dashboardCache.updatedAt = updatedAt;
+    dashboardCache.cardJSON = cardJSON;
+    dashboardCache.filterJSON = filterJSON;
     return dashboardCache;
   }
 
-  getCard() {
-    return this.cardJSON && JSON.parse(this.cardJSON) || {};
+  static getFilterJSONFromState(state) {
+    const filterCache = {
+      date: state.date,
+      selectedPrograms: state.selectedPrograms,
+      selectedEncounterTypes: state.selectedEncounterTypes,
+      selectedGeneralEncounterTypes: state.selectedGeneralEncounterTypes,
+      selectedCustomFilters: state.selectedCustomFilters,
+      selectedGenders: state.selectedGenders,
+      programs: state.programs,
+      individualFilters: state.individualFilters,
+      encountersFilters: state.encountersFilters,
+      enrolmentFilters: state.enrolmentFilters,
+      generalEncountersFilters: state.generalEncountersFilters,
+      selectedSubjectType: state.subjectType
+    };
+    return state.subjectType && _lodash.default.isEmpty(state.subjectType.name) ? _lodash.default.omit(filterCache, ['selectedSubjectType']) : filterCache;
   }
 
-  getFilter() {
-    const filter = this.filterJSON && JSON.parse(this.filterJSON) || {};
-
-    if (!_lodash.default.isEmpty(filter.filterDate)) {
-      filter.filterDate = new Date(filter.filterDate);
-    }
-
-    return filter;
+  static createEmptyInstance() {
+    return new DashboardCache();
   }
 
-  setFilter(value) {
-    this.filterJSON = JSON.stringify(value);
+  getCardJSON() {
+    return this.cardJSON && JSON.parse(this.cardJSON) || {};
   }
 
-  setCard(value) {
-    this.cardJSON = JSON.stringify(value);
+  getFilterJSON() {
+    return this.filterJSON && JSON.parse(this.filterJSON) || {};
   }
 
 }
@@ -75,6 +90,7 @@ _defineProperty(DashboardCache, "schema", {
   primaryKey: "uuid",
   properties: {
     uuid: "string",
+    updatedAt: "date",
     cardJSON: "string",
     filterJSON: "string"
   }

package/dist/Encounter.js

@@ -19,20 +19,16 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
+var _Point = _interopRequireDefault(require("./geo/Point"));
+
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
 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 Encounter extends _AbstractEncounter.default {
@@ -122,7 +118,7 @@ class Encounter extends _AbstractEncounter.default {
 _defineProperty(Encounter, "schema", {
   name: _SchemaNames.default.Encounter,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     encounterType: "EncounterType",
     encounterDateTime: {
@@ -132,10 +128,10 @@ _defineProperty(Encounter, "schema", {
     individual: _SchemaNames.default.Individual,
     observations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     encounterLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: "Point",
       optional: true
     },
     name: {
@@ -156,10 +152,10 @@ _defineProperty(Encounter, "schema", {
     },
     cancelObservations: {
       type: "list",
-      objectType: "EmbeddedObservation"
+      objectType: "Observation"
     },
     cancelLocation: {
-      type: _SchemaNames.default.EmbeddedPoint,
+      type: "Point",
       optional: true
     },
     voided: {
@@ -173,17 +169,9 @@ _defineProperty(Encounter, "schema", {
     latestEntityApprovalStatus: {
       type: "EntityApprovalStatus",
       optional: true
-    }
-  }, _AuditUtil.AuditFields, {
-    filledBy: {
-      type: "string",
-      optional: true
-    },
-    filledByUUID: {
-      type: "string",
-      optional: true
-    }
-  })
+    } //Reporting purposes
+
+  }
 });
 
 _defineProperty(Encounter, "validationKeys", {

package/dist/EntityApprovalStatus.js

@@ -17,14 +17,8 @@ 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; }
 
 function getMatchingApprovalStatusEntities(entities, approvalStatus_status) {
@@ -108,38 +102,6 @@ class EntityApprovalStatus extends _BaseEntity.default {
     this.that.autoApproved = 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;
-  }
-
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid", "entityType", "approvalStatusComment", "autoApproved", "voided"]);
 
@@ -155,7 +117,6 @@ class EntityApprovalStatus extends _BaseEntity.default {
 
     entityApprovalStatus.approvalStatus = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "approvalStatusUUID"), _ApprovalStatus.default.schema.name);
     entityApprovalStatus.entityUUID = _ResourceUtil.default.getUUIDFor(resource, "entityUUID");
-    (0, _AuditUtil.mapAuditFields)(entityApprovalStatus, resource);
     return entityApprovalStatus;
   }
 
@@ -212,7 +173,7 @@ class EntityApprovalStatus extends _BaseEntity.default {
 _defineProperty(EntityApprovalStatus, "schema", {
   name: _SchemaNames.default.EntityApprovalStatus,
   primaryKey: "uuid",
-  properties: _objectSpread({
+  properties: {
     uuid: "string",
     entityUUID: "string",
     approvalStatus: "ApprovalStatus",
@@ -234,7 +195,7 @@ _defineProperty(EntityApprovalStatus, "schema", {
       type: "bool",
       default: false
     }
-  }, _AuditUtil.AuditFields)
+  }
 });
 
 _defineProperty(EntityApprovalStatus, "entityType", {