fix the prefetch bug

Author: smalho01

src/PrefetchTemplate.js

@@ -11,7 +11,7 @@ export class PrefetchTemplate {
     );
     const PATIENT_PREFETCH = new PrefetchTemplate('{{context.patientId}}');
 
-    const PHARMACY_PREFETCH = new PrefetchTemplate('Organization/pharm0111');
+    const PHARMACY_PREFETCH = new PrefetchTemplate('Organization/{{context.pharmacyId}}');
 
     const ALL_REQUESTS_PREFETCH = new PrefetchTemplate(
       'MedicationRequest?subject={{context.patientId}}&_include=MedicationRequest:medication'
@@ -52,32 +52,38 @@ export class PrefetchTemplate {
     return paramElementMap;
   }
 
-  static generateQueries(requestBundle, patientReference, userReference, ...prefetchKeys) {
-    var resolvedQueries = new Map();
-    for (var i = 0; i < prefetchKeys.length; i++) {
-      var prefetchKey = prefetchKeys[i];
-      var query = prefetchMap.get(prefetchKey).getQuery();
+  static generateQueries(requestBundle, patientReference, userReference, pharmacyId, ...prefetchKeys) {
+  var resolvedQueries = new Map();
+  for (var i = 0; i < prefetchKeys.length; i++) {
+    var prefetchKey = prefetchKeys[i];
+    var query = prefetchMap.get(prefetchKey).getQuery();
       // Regex source: https://regexland.com/all-between-specified-characters/
-      var parametersToFill = query.match(/(?<={{).*?(?=}})/gs);
-      var resolvedQuery = query.slice();
+    var parametersToFill = query.match(/(?<={{).*?(?=}})/gs);
+    var resolvedQuery = query.slice();
       for (var j = 0; j < parametersToFill.length; j++) {
         var unresolvedParameter = parametersToFill[j];
         var resolvedParameter;
         if (requestBundle) {
-          resolvedParameter = PrefetchTemplate.resolveParameter(unresolvedParameter, requestBundle);
+          if (unresolvedParameter === 'context.pharmacyId') {
+            resolvedParameter = pharmacyId; 
+          } else {
+            resolvedParameter = PrefetchTemplate.resolveParameter(unresolvedParameter, requestBundle);
+          }
         } else {
           if (unresolvedParameter === 'context.patientId') {
             resolvedParameter = patientReference;
           } else if (unresolvedParameter === 'context.userId') {
             resolvedParameter = userReference;
+          } else if (unresolvedParameter === 'context.pharmacyId') {
+            resolvedParameter = pharmacyId; 
           }
         }
         resolvedQuery = resolvedQuery.replace('{{' + unresolvedParameter + '}}', resolvedParameter);
       }
-      resolvedQueries.set(prefetchKey, resolvedQuery);
-    }
-    return resolvedQueries;
+    resolvedQueries.set(prefetchKey, resolvedQuery);
   }
+  return resolvedQueries;
+}
 
   // Source: https://www.tutorialspoint.com/accessing-nested-javascript-objects-with-string-key
   static getProp(object, path) {

src/components/SMARTBox/PatientBox.jsx

@@ -167,17 +167,27 @@ const PatientBox = props => {
   const fetchResources = queries => {
     let requests = [];
     callback('prefetchCompleted', false);
+    console.log('🔍 PHARMACY DEBUG - All queries to fetch:', queries); // ADD THIS
+    
     queries.forEach((query, queryKey) => {
+      console.log(`🔍 PHARMACY DEBUG - Processing ${queryKey}: ${query}`); // ADD THIS
       const urlQuery = '/' + query;
       requests.push(
         client
           .request(urlQuery)
           .then(response => {
-            console.log(response);
+            console.log(`🔍 PHARMACY DEBUG - SUCCESS for ${queryKey}:`, response); // ADD THIS
             return response;
           })
+          .catch(error => {
+            console.log(`🔍 PHARMACY DEBUG - FAILED for ${queryKey}:`, error); // ADD THIS
+            return null; // Return null so Promise.all doesn't fail completely
+          })
           .then(resource => {
-            callbackMap('prefetchedResources', queryKey, resource);
+            if (resource) {
+              console.log(`🔍 PHARMACY DEBUG - Calling callbackMap for ${queryKey}`); // ADD THIS
+              callbackMap('prefetchedResources', queryKey, resource);
+            }
           })
       );
     });
@@ -202,9 +212,11 @@ const PatientBox = props => {
         request,
         patientReference,
         userReference,
+        'pharm0111',
         'request',
         'patient',
-        'practitioner'
+        'practitioner',
+        'pharmacy'
       );
       fetchResources(queries);
 
@@ -218,9 +230,11 @@ const PatientBox = props => {
         request,
         patientReference,
         userReference,
+        'pharm0111',
         'patient',
         'practitioner',
-        'medicationRequests'
+        'medicationRequests',
+        'pharmacy'
       );
       fetchResources(queries);
     }

src/containers/RequestBuilder.jsx

@@ -48,6 +48,7 @@ const RequestBuilder = props => {
   const displayRequestBox = !!globalState.patient?.id;
 
   useEffect(() => {
+    console.log('Prefetched Resources updated:');
     console.log(state.prefetchedResources);
   }, [state.prefetchedResources]);
 
@@ -181,7 +182,8 @@ const RequestBuilder = props => {
       prefetch,
       globalState.sendPrefetch,
       hook,
-      hookConfig
+      hookConfig,
+      'pharm0111'
     );
 
     let baseUrl = globalState.baseUrl;

src/util/buildRequest.js

@@ -9,7 +9,9 @@ export default function buildRequest(
   prefetch,
   includePrefetch,
   hook,
-  hookConfig
+  hookConfig,
+  pharmacyId = 'pharm0111'
+
 ) {
   // Use the provided user if there is no request for this hook
   let userId = 'Practitioner/' + user;
@@ -31,7 +33,8 @@ export default function buildRequest(
     context: {
       userId: userId,
       patientId: patient.id,
-      encounterId: 'enc89284'
+      encounterId: 'enc89284',
+      pharmacyId: pharmacyId 
     }
   };