openchs-models 1.32.54 → 1.32.56

package/dist/Concept.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MediaType = exports.default = void 0;
+exports.default = void 0;
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
@@ -17,8 +17,6 @@ var _SingleCodedValue = _interopRequireDefault(require("./observation/SingleCode
 
 var _PrimitiveValue = _interopRequireDefault(require("./observation/PrimitiveValue"));
 
-var _Duration = _interopRequireDefault(require("./Duration"));
-
 var _CompositeDuration = _interopRequireDefault(require("./CompositeDuration"));
 
 var _KeyValue = _interopRequireDefault(require("./application/KeyValue"));
@@ -33,6 +31,8 @@ var _RepeatableQuestionGroup = _interopRequireDefault(require("./observation/Rep
 
 var _ConceptAnswer = _interopRequireDefault(require("./ConceptAnswer"));
 
+var _ConceptMedia = _interopRequireDefault(require("./ConceptMedia"));
+
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -84,20 +84,30 @@ class Concept extends _BaseEntity.default {
     this.that.unit = x;
   }
 
-  get mediaUrl() {
-    return this.that.mediaUrl;
+  getImageMedia() {
+    return this.media.filter(m => m.isImage());
+  }
+
+  getVideoMedia() {
+    return this.media.filter(m => m.isVideo());
   }
 
-  set mediaUrl(x) {
-    this.that.mediaUrl = x;
+  hasImage() {
+    return this.getImageMedia().length > 0;
   }
 
-  get mediaType() {
-    return this.that.mediaType;
+  hasVideo() {
+    return this.getVideoMedia().length > 0;
   }
 
-  set mediaType(x) {
-    this.that.mediaType = x;
+  getImageUrl() {
+    const imageMedia = this.getImageMedia();
+    return imageMedia.length > 0 ? imageMedia[0].url : null;
+  }
+
+  getVideoUrl() {
+    const videoMedia = this.getVideoMedia();
+    return videoMedia.length > 0 ? videoMedia[0].url : null;
   }
 
   get name() {
@@ -132,6 +142,14 @@ class Concept extends _BaseEntity.default {
     this.that.keyValues = this.fromEntityList(x);
   }
 
+  get media() {
+    return this.toEntityList("media", _ConceptMedia.default);
+  }
+
+  set media(x) {
+    this.that.media = this.fromEntityList(x);
+  }
+
   static fromResource(conceptResource, entityService) {
     const concept = new Concept();
     concept.name = conceptResource.name;
@@ -144,9 +162,12 @@ class Concept extends _BaseEntity.default {
     concept.unit = conceptResource.unit;
     concept.voided = conceptResource.voided || false; //This change should be independently deployable irrespective of server
 
-    concept.keyValues = _lodash.default.map(conceptResource.keyValues, _KeyValue.default.fromResource);
-    concept.mediaUrl = conceptResource.mediaUrl;
-    concept.mediaType = conceptResource.mediaType;
+    concept.keyValues = _lodash.default.map(conceptResource.keyValues, _KeyValue.default.fromResource); // Handle media array format from server
+
+    if (conceptResource.media) {
+      concept.media = _lodash.default.map(conceptResource.media, _ConceptMedia.default.fromResource);
+    }
+
     return concept;
   }
 
@@ -351,24 +372,12 @@ class Concept extends _BaseEntity.default {
     return keyValue === _KeyValue.default.ContactYesValue;
   }
 
-  isMediaTypeImage() {
-    return this.mediaType === MediaType.Image;
-  }
-
-  hasMediaType() {
-    return !_lodash.default.isNil(this.mediaType);
-  }
-
-  hasMediaUrl() {
-    return !_lodash.default.isNil(this.mediaUrl) && this.mediaUrl !== '';
-  }
-
   hasAnswersWithMedia() {
-    return _lodash.default.some(this.answers, answer => answer.concept.hasMediaUrl() || answer.concept.hasMediaType());
+    return _lodash.default.some(this.answers, answer => answer.concept.hasMedia());
   }
 
   hasMedia() {
-    return this.hasMediaUrl() || this.hasMediaType() || this.hasAnswersWithMedia();
+    return this.media.length > 0 || this.hasAnswersWithMedia();
   }
 
 }
@@ -419,13 +428,10 @@ _defineProperty(Concept, "schema", {
       type: "bool",
       default: false
     },
-    mediaUrl: {
-      type: "string",
-      optional: true
-    },
-    mediaType: {
-      type: "string",
-      optional: true
+    media: {
+      type: "list",
+      objectType: "ConceptMedia",
+      default: []
     }
   }
 });
@@ -474,9 +480,4 @@ _defineProperty(Concept, "dataType", {
 
 });
 
-_defineProperty(Concept, "merge", () => _BaseEntity.default.mergeOn("answers"));
-
-const MediaType = {
-  Image: "Image"
-};
-exports.MediaType = MediaType;
+_defineProperty(Concept, "merge", () => _BaseEntity.default.mergeOn("answers"));

package/dist/ConceptMedia.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
+
+var _General = _interopRequireDefault(require("./utility/General"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+class ConceptMedia extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+
+  get url() {
+    return this.that.url;
+  }
+
+  set url(x) {
+    this.that.url = x;
+  }
+
+  get type() {
+    return this.that.type;
+  }
+
+  set type(x) {
+    this.that.type = x;
+  }
+
+  static fromResource(resource) {
+    const conceptMedia = new ConceptMedia();
+    conceptMedia.uuid = resource.uuid || _General.default.randomUUID();
+    conceptMedia.url = resource.url;
+    conceptMedia.type = resource.type;
+    return conceptMedia;
+  }
+
+  isImage() {
+    return this.type === 'Image';
+  }
+
+  isVideo() {
+    return this.type === 'Video';
+  }
+
+}
+
+exports.default = ConceptMedia;
+
+_defineProperty(ConceptMedia, "schema", {
+  name: "ConceptMedia",
+  embedded: true,
+  primaryKey: "uuid",
+  properties: {
+    uuid: "string",
+    url: {
+      type: "string",
+      optional: true
+    },
+    type: {
+      type: "string",
+      optional: true
+    }
+  }
+});

package/dist/Schema.js

@@ -13,6 +13,8 @@ var _Concept = _interopRequireDefault(require("./Concept"));
 
 var _ConceptAnswer = _interopRequireDefault(require("./ConceptAnswer"));
 
+var _ConceptMedia = _interopRequireDefault(require("./ConceptMedia"));
+
 var _Individual = _interopRequireDefault(require("./Individual"));
 
 var _Family = _interopRequireDefault(require("./Family"));
@@ -193,7 +195,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.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];
+const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _ConceptMedia.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.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}`);
@@ -283,7 +285,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 203,
+    schemaVersion: 204,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
       if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
@@ -994,6 +996,21 @@ function createRealmConfig() {
           }
         });
       }
+
+      if (oldDB.schemaVersion < 204) {
+        _lodash.default.forEach(newDB.objects(_Concept.default.schema.name), concept => {
+          if (!concept.media) {
+            concept.media = [];
+          }
+        }); // Reset EntitySyncStatus for Concept to refetch media URLs
+
+
+        _lodash.default.forEach(newDB.objects(_EntitySyncStatus.default.schema.name), ess => {
+          if (ess.entityName === 'Concept') {
+            ess.loadedSince = _EntitySyncStatus.default.REALLY_OLD_DATE;
+          }
+        });
+      }
     }
   };
 }

package/dist/SchemaNames.js

@@ -89,6 +89,8 @@ _defineProperty(SchemaNames, "Comment", "Comment");
 
 _defineProperty(SchemaNames, "Concept", "Concept");
 
+_defineProperty(SchemaNames, "ConceptMedia", "ConceptMedia");
+
 _defineProperty(SchemaNames, "EntityApprovalStatus", "EntityApprovalStatus");
 
 _defineProperty(SchemaNames, "Point", "Point");

package/dist/index.js

@@ -75,6 +75,12 @@ Object.defineProperty(exports, "ConceptAnswer", {
     return _ConceptAnswer.default;
   }
 });
+Object.defineProperty(exports, "ConceptMedia", {
+  enumerable: true,
+  get: function () {
+    return _ConceptMedia.default;
+  }
+});
 Object.defineProperty(exports, "Duration", {
   enumerable: true,
   get: function () {
@@ -842,6 +848,8 @@ var _Concept = _interopRequireDefault(require("./Concept"));
 
 var _ConceptAnswer = _interopRequireDefault(require("./ConceptAnswer"));
 
+var _ConceptMedia = _interopRequireDefault(require("./ConceptMedia"));
+
 var _Duration = _interopRequireDefault(require("./Duration"));
 
 var _Encounter = _interopRequireDefault(require("./Encounter"));

package/package.json

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