@bahmni/services 0.0.1-dev.395 → 0.0.1-dev.401

package/dist/api/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAU7C,QAAA,MAAM,MAAM,EAAE,aAA8B,CAAC;AAiD7C,eAAe,MAAM,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAU7C,QAAA,MAAM,MAAM,EAAE,aAA8B,CAAC;AAkD7C,eAAe,MAAM,CAAC"}

package/dist/encounterSessionService/encounterSessionService.d.ts

@@ -21,17 +21,20 @@ export declare function getEncounterSessionDuration(): Promise<number>;
  * Filters encounters to find those belonging to the active visit
  * @param encounters - Array of encounters to filter
  * @param patientUUID - Patient UUID
+ * @param currentEpisodeEncounterUuids - Array of known encounters UUIDs of current EOC
  * @returns Promise resolving to encounter within active visit or null
  */
-export declare function filterByActiveVisit(encounters: Encounter[], patientUUID: string): Promise<Encounter | null>;
+export declare function filterByActiveVisit(encounters: Encounter[], patientUUID: string, currentEpisodeEncounterUuids?: string[]): Promise<Encounter | null>;
 /**
  * Finds an active encounter within the session duration for a patient and practitioner
  * @param patientUUID - Patient UUID
  * @param practitionerUUID - Practitioner UUID (optional, for practitioner-specific sessions)
  * @param sessionDurationMinutes - Session duration in minutes (optional, will fetch from config if not provided)
+ * @param encounterTypeUUID - Encounter type UUID (optional, filters by type)
+ * @param currentEpisodeEncounterUuids - The current episode of care's own known encounter UUIDs
  * @returns Promise resolving to active encounter or null
  */
-export declare function findActiveEncounterInSession(patientUUID: string, practitionerUUID?: string, sessionDurationMinutes?: number, encounterTypeUUID?: string): Promise<Encounter | null>;
+export declare function findActiveEncounterInSession(patientUUID: string, practitionerUUID?: string, sessionDurationMinutes?: number, encounterTypeUUID?: string, currentEpisodeEncounterUuids?: string[]): Promise<Encounter | null>;
 /**
  * Checks if there is an active encounter session for a patient and practitioner
  * @param patientUUID - Patient UUID

package/dist/encounterSessionService/encounterSessionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encounterSessionService.d.ts","sourceRoot":"","sources":["../../src/encounterSessionService/encounterSessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,SAAS,CAAC;AAQ5C,UAAU,qBAAqB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBtB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAUnE;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,SAAS,EAAE,EACvB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAkB3B;AAED;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAiC3B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,OAAO,CAAC,CAMlB"}
+{"version":3,"file":"encounterSessionService.d.ts","sourceRoot":"","sources":["../../src/encounterSessionService/encounterSessionService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,SAAS,CAAC;AAQ5C,UAAU,qBAAqB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,EAAE,CAAC,CAkBtB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAUnE;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,SAAS,EAAE,EACvB,WAAW,EAAE,MAAM,EACnB,4BAA4B,CAAC,EAAE,MAAM,EAAE,GACtC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAsB3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,EACzB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,iBAAiB,CAAC,EAAE,MAAM,EAC1B,4BAA4B,CAAC,EAAE,MAAM,EAAE,GACtC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAqC3B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,WAAW,EAAE,MAAM,EACnB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,OAAO,CAAC,CAMlB"}

package/dist/errorHandling/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/errorHandling/utils.ts"],"names":[],"mappings":"AA2CA,eAAO,MAAM,2BAA2B,4BAA4B,CAAC;AAsBrE;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,OAAO,OAAO,KACb;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CA+FlC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/errorHandling/utils.ts"],"names":[],"mappings":"AA2CA,eAAO,MAAM,2BAA2B,4BAA4B,CAAC;AAsBrE;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,OAAO,OAAO,KACb;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAqGlC,CAAC"}

package/dist/index.js

@@ -2267,26 +2267,26 @@ function yi(t) {
     return yi(ot(t, s));
   }, r;
 }
-const me = yi(Gt);
-me.Axios = rt;
-me.CanceledError = Kt;
-me.CancelToken = Sl;
-me.isCancel = li;
-me.VERSION = ms;
-me.toFormData = nn;
-me.AxiosError = z;
-me.Cancel = me.CanceledError;
-me.all = function(e) {
+const he = yi(Gt);
+he.Axios = rt;
+he.CanceledError = Kt;
+he.CancelToken = Sl;
+he.isCancel = li;
+he.VERSION = ms;
+he.toFormData = nn;
+he.AxiosError = z;
+he.Cancel = he.CanceledError;
+he.all = function(e) {
   return Promise.all(e);
 };
-me.spread = Ol;
-me.isAxiosError = Al;
-me.mergeConfig = ot;
-me.AxiosHeaders = Pe;
-me.formToJSON = (t) => ui(A.isHTMLForm(t) ? new FormData(t) : t);
-me.getAdapter = mi.getAdapter;
-me.HttpStatusCode = Qn;
-me.default = me;
+he.spread = Ol;
+he.isAxiosError = Al;
+he.mergeConfig = ot;
+he.AxiosHeaders = Pe;
+he.formToJSON = (t) => ui(A.isHTMLForm(t) ? new FormData(t) : t);
+he.getAdapter = mi.getAdapter;
+he.HttpStatusCode = Qn;
+he.default = he;
 const {
   Axios: Xw,
   AxiosError: Zw,
@@ -2305,7 +2305,7 @@ const {
   getAdapter: fE,
   mergeConfig: pE,
   create: hE
-} = me, Pl = (t) => typeof t == "object" && t !== null && "resourceType" in t && t.resourceType === "OperationOutcome", Nl = (t) => {
+} = he, Pl = (t) => typeof t == "object" && t !== null && "resourceType" in t && t.resourceType === "OperationOutcome", Nl = (t) => {
   if (!t.issue || !Array.isArray(t.issue))
     return null;
   for (const e of t.issue)
@@ -2318,7 +2318,7 @@ const {
     return { title: e, message: r };
   if (typeof t == "string")
     r = t;
-  else if (me.isAxiosError(t)) {
+  else if (he.isAxiosError(t)) {
     const n = t;
     if (n?.response) {
       const s = n.response.status, o = n.response.config ?? n.config;
@@ -2341,9 +2341,12 @@ const {
         case 401:
           e = "Unauthorized", r = "You are not authorized to perform this action. Please log in again.";
           break;
-        case 403:
-          e = "Unauthorized", r = "You are not authorized to perform this action. Please log in again.";
+        case 403: {
+          e = "Forbidden";
+          const a = n.response.data;
+          r = a?.error?.message ?? a?.message ?? "You are not authorized to perform this action.";
           break;
+        }
         case 404:
           e = "Not Found", r = "The requested resource was not found.";
           break;
@@ -2487,15 +2490,15 @@ const Bl = process.env.PUBLIC_URL ?? "/", ne = "/openmrs/ws/fhir2/R4", W = "/ope
     return e;
   }
   return t;
-}, Gl = (t) => t.includes("/openmrs/ws"), Kl = (t) => t.includes(Es), Wl = (t) => t.url ?? t.baseURL ?? "", Ke = me.create();
+}, Gl = (t) => t.includes("/openmrs/ws"), Kl = (t) => t.includes(Es), Wl = (t) => t.url ?? t.baseURL ?? "", Ke = he.create();
 Ke.defaults.headers.common["Content-Type"] = "application/json";
 Ke.interceptors.request.use(
   function(t) {
     return t;
   },
   function(t) {
-    const { title: e, message: r } = Yr(t);
-    return Promise.reject(`${e}: ${r}`);
+    const { message: e } = Yr(t);
+    throw new Error(e);
   }
 );
 Ke.interceptors.response.use(
@@ -2504,15 +2507,21 @@ Ke.interceptors.response.use(
       const e = Wl(t.config);
       return Gl(e) && !Kl(e) && !Cl.includes(t.config.responseType) && (t.data = Xn(t.data)), t;
     } catch (e) {
-      const { title: r, message: n } = Yr(e);
-      return Promise.reject(`${r}: ${n}`);
+      const { message: r } = Yr(e);
+      throw new Error(r);
     }
   },
-  function(t) {
-    if (me.isAxiosError(t) && t.response?.status === 401)
-      return globalThis.location.href = Ei, Promise.reject(t);
-    const { title: e, message: r } = Yr(t);
-    return r.startsWith("ERROR_") || /^[A-Z_]+$/.test(r) ? Promise.reject(new Error(r)) : Promise.reject(`${e}: ${r}`);
+  async function(t) {
+    if (he.isAxiosError(t) && t.response?.status === 401)
+      throw globalThis.location.href = Ei, t;
+    if (he.isAxiosError(t) && t.response?.data instanceof Blob)
+      try {
+        const r = await t.response.data.text();
+        t.response.data = JSON.parse(r);
+      } catch {
+      }
+    const { message: e } = Yr(t);
+    throw new Error(e);
   }
 );
 const B = async (t, e) => (await Ke.get(t, e)).data, ge = async (t, e) => (await Ke.post(t, e)).data, Ti = async (t, e) => (await Ke.put(t, e)).data, gE = async (t, e) => (await Ke.patch(t, e)).data, Ri = async (t) => (await Ke.delete(t)).data, Q = (t) => typeof t == "string", It = () => {
@@ -6235,7 +6244,7 @@ function _e(t, e) {
     rest: t.rest
   };
 }
-function he(t, e) {
+function me(t, e) {
   const r = e.match(t);
   return r ? {
     value: parseInt(r[0], 10),
@@ -6258,34 +6267,34 @@ function qe(t, e) {
   };
 }
 function Ji(t) {
-  return he(Ee.anyDigitsSigned, t);
+  return me(Ee.anyDigitsSigned, t);
 }
 function we(t, e) {
   switch (t) {
     case 1:
-      return he(Ee.singleDigit, e);
+      return me(Ee.singleDigit, e);
     case 2:
-      return he(Ee.twoDigits, e);
+      return me(Ee.twoDigits, e);
     case 3:
-      return he(Ee.threeDigits, e);
+      return me(Ee.threeDigits, e);
     case 4:
-      return he(Ee.fourDigits, e);
+      return me(Ee.fourDigits, e);
     default:
-      return he(new RegExp("^\\d{1," + t + "}"), e);
+      return me(new RegExp("^\\d{1," + t + "}"), e);
   }
 }
 function Zr(t, e) {
   switch (t) {
     case 1:
-      return he(Ee.singleDigitSigned, e);
+      return me(Ee.singleDigitSigned, e);
     case 2:
-      return he(Ee.twoDigitsSigned, e);
+      return me(Ee.twoDigitsSigned, e);
     case 3:
-      return he(Ee.threeDigitsSigned, e);
+      return me(Ee.threeDigitsSigned, e);
     case 4:
-      return he(Ee.fourDigitsSigned, e);
+      return me(Ee.fourDigitsSigned, e);
     default:
-      return he(new RegExp("^-?\\d{1," + t + "}"), e);
+      return me(new RegExp("^-?\\d{1," + t + "}"), e);
   }
 }
 function Os(t) {
@@ -6594,7 +6603,7 @@ class Jp extends ue {
       // 1, 2, ..., 12
       case "M":
         return _e(
-          he(Ee.month, e),
+          me(Ee.month, e),
           s
         );
       // 01, 02, ..., 12
@@ -6642,7 +6651,7 @@ class Qp extends ue {
       // 1, 2, ..., 12
       case "L":
         return _e(
-          he(Ee.month, e),
+          me(Ee.month, e),
           s
         );
       // 01, 02, ..., 12
@@ -6706,7 +6715,7 @@ class Zp extends ue {
   parse(e, r, n) {
     switch (r) {
       case "w":
-        return he(Ee.week, e);
+        return me(Ee.week, e);
       case "wo":
         return n.ordinalNumber(e, { unit: "week" });
       default:
@@ -6744,7 +6753,7 @@ class th extends ue {
   parse(e, r, n) {
     switch (r) {
       case "I":
-        return he(Ee.week, e);
+        return me(Ee.week, e);
       case "Io":
         return n.ordinalNumber(e, { unit: "week" });
       default:
@@ -6794,7 +6803,7 @@ class sh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "d":
-        return he(Ee.date, e);
+        return me(Ee.date, e);
       case "do":
         return n.ordinalNumber(e, { unit: "date" });
       default:
@@ -6830,7 +6839,7 @@ class oh extends ue {
     switch (r) {
       case "D":
       case "DD":
-        return he(Ee.dayOfYear, e);
+        return me(Ee.dayOfYear, e);
       case "Do":
         return n.ordinalNumber(e, { unit: "date" });
       default:
@@ -7245,7 +7254,7 @@ class hh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "h":
-        return he(Ee.hour12h, e);
+        return me(Ee.hour12h, e);
       case "ho":
         return n.ordinalNumber(e, { unit: "hour" });
       default:
@@ -7266,7 +7275,7 @@ class mh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "H":
-        return he(Ee.hour23h, e);
+        return me(Ee.hour23h, e);
       case "Ho":
         return n.ordinalNumber(e, { unit: "hour" });
       default:
@@ -7286,7 +7295,7 @@ class gh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "K":
-        return he(Ee.hour11h, e);
+        return me(Ee.hour11h, e);
       case "Ko":
         return n.ordinalNumber(e, { unit: "hour" });
       default:
@@ -7306,7 +7315,7 @@ class yh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "k":
-        return he(Ee.hour24h, e);
+        return me(Ee.hour24h, e);
       case "ko":
         return n.ordinalNumber(e, { unit: "hour" });
       default:
@@ -7327,7 +7336,7 @@ class wh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "m":
-        return he(Ee.minute, e);
+        return me(Ee.minute, e);
       case "mo":
         return n.ordinalNumber(e, { unit: "minute" });
       default:
@@ -7347,7 +7356,7 @@ class Eh extends ue {
   parse(e, r, n) {
     switch (r) {
       case "s":
-        return he(Ee.second, e);
+        return me(Ee.second, e);
       case "so":
         return n.ordinalNumber(e, { unit: "second" });
       default:
@@ -13454,30 +13463,34 @@ async function yc() {
     return 30;
   }
 }
-async function nw(t, e) {
+async function nw(t, e, r) {
   if (!t.length) return null;
   try {
-    const r = await mn(e);
-    return r ? t.find((n) => {
-      const s = n.partOf?.reference?.split("/")[1];
-      return r.id === s;
+    const n = await mn(e);
+    return n ? t.find((s) => {
+      const o = s.partOf?.reference?.split("/")[1];
+      return n.id !== o ? !1 : r ? !!s.id && r.includes(s.id) : !0;
     }) ?? null : null;
   } catch {
     return null;
   }
 }
-async function Jb(t, e, r, n) {
+async function Jb(t, e, r, n, s) {
   try {
     if (!t) return null;
-    const s = r ?? await yc(), a = `ge${new Date(Date.now() - s * 60 * 1e3).toISOString()}`, i = {
+    const o = r ?? await yc(), i = `ge${new Date(Date.now() - o * 60 * 1e3).toISOString()}`, c = {
       patient: t,
       _tag: "encounter",
-      _lastUpdated: a,
+      _lastUpdated: i,
       type: n
     };
-    e && (i.participant = e);
-    const c = await os(i);
-    return c.length === 0 ? null : await nw(c, t);
+    e && (c.participant = e);
+    const u = await os(c);
+    return u.length === 0 ? null : await nw(
+      u,
+      t,
+      s
+    );
   } catch {
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bahmni/services",
-  "version": "0.0.1-dev.395",
+  "version": "0.0.1-dev.401",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",