Applied Lib Refactor

Author: perki

common-data-defs.js

@@ -68,7 +68,7 @@ const v2 = {
 function utilGetPermissions (questionaryId) {
   const preRequest = v2[questionaryId].permissionsPreRequest || [];
   const itemKeys = utilGetAllItemKeys(questionaryId);
-  const permissions = hdsModel().authorizationForItemKeys(itemKeys, { preRequest });
+  const permissions = hdsModel().authorizations.forItemKeys(itemKeys, { preRequest });
   return permissions
 }
 

dr-lib.js

@@ -173,7 +173,7 @@ async function getPatientDetails(questionaryId, patientEvent) {
 
   // get the last value of each itemKey
   const apiCalls = formProfile.itemKeys.map((itemKey) => {
-    const itemDef = hdsModel().itemDefForKey(itemKey);
+    const itemDef = hdsModel().itemsDefs.forKey(itemKey);
     return {
       method: "events.get",
       params: {
@@ -202,7 +202,7 @@ function getFirstFormFields(questionaryId) {
   const firstForm = Object.values(forms)[0];
   const itemDefs = [];
   for (const itemKey of firstForm.itemKeys) {
-    itemDefs.push(hdsModel().itemDefForKey(itemKey));
+    itemDefs.push(hdsModel().itemsDefs.forKey(itemKey));
   }
 
   return itemDefs;
@@ -213,7 +213,7 @@ function getFirstFormFields(questionaryId) {
  * @param {*} event
  */
 function dataFieldFromEvent(event) {
-  const itemDef = hdsModel().itemDefForEvent(event, false);
+  const itemDef = hdsModel().itemsDefs.forEvent(event, false);
   if (!itemDef) {
     console.error("## itemDef not found for event", event);
     return null;

dr-patient-view-lib.js

@@ -51,7 +51,7 @@ function getLineForEvent (event, questionaryId) {
     description: ''
   }
 
-  const itemDef = model.itemDefForEvent(event, false);
+  const itemDef = model.itemsDefs.forEvent(event, false);
   if (itemDef) {
     line.streamId = event.streamIds[0];
     line.eventType = event.type;

patient-home-lib.js

@@ -97,7 +97,7 @@ async function grantAccess (formInfo, formDetails) {
   console.log('#FormDetails', {formInfo, formDetails});
   // create needed base streams
   const itemKeys = dataDefs.utilGetAllItemKeys(formInfo.questionaryId);
-  const baseStreams = hdsModel().streamsGetNecessaryListForItemKeys(itemKeys);
+  const baseStreams = hdsModel().streams.getNecessaryListForItemKeys(itemKeys);
   await createsPatientAccountStreams(connection, baseStreams);
 
   // remove unecessary permissions details

patient-lib.js

@@ -80,7 +80,7 @@ async function getForms (questionaryId) {
 async function getFormHistorical (questionaryId, formKey) {
   const form = dataDefs.v2questionnaires[questionaryId].forms[formKey];
   const formFields = form.itemKeys.map((itemKey) => {
-    const itemDef = (hdsModel().itemDefForKey(itemKey));
+    const itemDef = (hdsModel().itemsDefs.forKey(itemKey));
 
     return {
       id: itemDef.key,
@@ -102,7 +102,7 @@ async function getFormHistorical (questionaryId, formKey) {
 async function getFormPermanentContent (questionaryId, formKey) {
   const form = dataDefs.v2questionnaires[questionaryId].forms[formKey];
   // get formItems
-  const formItemDefs = form.itemKeys.map((itemKey) => (hdsModel().itemDefForKey(itemKey)));
+  const formItemDefs = form.itemKeys.map((itemKey) => (hdsModel().itemsDefs.forKey(itemKey)));
   // get the values from the API
   const apiCalls = formItemDefs.map(itemDef => ({
     method: 'events.get',
@@ -143,7 +143,7 @@ async function getFormPermanentContent (questionaryId, formKey) {
 
 async function getHistoricalContent(questionaryId, formKey) {
   const form = dataDefs.v2questionnaires[questionaryId].forms[formKey];
-  const itemDefs = form.itemKeys.map((itemKey) => (hdsModel().itemDefForKey(itemKey)));
+  const itemDefs = form.itemKeys.map((itemKey) => (hdsModel().itemsDefs.forKey(itemKey)));
   const tableHeaders = itemDefs.map(itemDef => ({
     fieldId: itemDef.key,
     label: itemDef.data.label.en,
@@ -152,7 +152,7 @@ async function getHistoricalContent(questionaryId, formKey) {
 
   const valuesByDateStr = {};
   function addEntry (event) {
-    const itemDef = hdsModel().itemDefForEvent(event, false);
+    const itemDef = hdsModel().itemsDefs.forEvent(event, false);
     if (itemDef == null) {
       console.log('Historical content -- unkown event', event);
       return;