@bizmap/sdk 0.0.99 → 0.0.100

package/dist/main.d.ts

@@ -1083,17 +1083,16 @@ declare const MiniAppointmentDetails: z.ZodObject<{
         value: z.ZodString;
     }, z.core.$strip>>;
     invoiceNo: z.ZodOptional<z.ZodString>;
-    charges: z.ZodArray<z.ZodObject<{
+    charges: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
-        uid: z.ZodUUID;
-        item: z.ZodString;
-        cost: z.ZodNumber;
         currency: z.ZodEnum<{
             JMD: "JMD";
         }>;
-    }, z.core.$strip>>;
-    additionalFees: z.ZodReadonly<z.ZodNullable<z.ZodArray<z.ZodObject<{
+        item: z.ZodString;
+        cost: z.ZodNumber;
+    }, z.core.$strip>>>>;
+    additionalFees: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1106,7 +1105,7 @@ declare const MiniAppointmentDetails: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>>>;
-    discounts: z.ZodReadonly<z.ZodNullable<z.ZodArray<z.ZodObject<{
+    discounts: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1119,7 +1118,7 @@ declare const MiniAppointmentDetails: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>>>;
-    prepayments: z.ZodNullable<z.ZodArray<z.ZodObject<{
+    prepayments: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1131,7 +1130,7 @@ declare const MiniAppointmentDetails: z.ZodObject<{
         }, z.core.$strip>;
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
-    }, z.core.$strip>>>;
+    }, z.core.$strip>>>>;
     clientUid: z.ZodUUID;
     payload: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodNumber>;
@@ -1216,7 +1215,7 @@ declare const AppointmentDetails: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodISODateTime>;
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
     _id: z.ZodUUID;
-    additionalFees: z.ZodReadonly<z.ZodNullable<z.ZodArray<z.ZodObject<{
+    additionalFees: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1229,7 +1228,7 @@ declare const AppointmentDetails: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>>>;
-    discounts: z.ZodReadonly<z.ZodNullable<z.ZodArray<z.ZodObject<{
+    discounts: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1242,7 +1241,7 @@ declare const AppointmentDetails: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>>>;
-    prepayments: z.ZodNullable<z.ZodArray<z.ZodObject<{
+    prepayments: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1254,7 +1253,7 @@ declare const AppointmentDetails: z.ZodObject<{
         }, z.core.$strip>;
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
-    }, z.core.$strip>>>;
+    }, z.core.$strip>>>>;
     payload: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodNumber>;
         vitals: z.ZodRecord<z.ZodEnum<{
@@ -1296,16 +1295,15 @@ declare const AppointmentDetails: z.ZodObject<{
         value: z.ZodString;
     }, z.core.$strip>>;
     invoiceNo: z.ZodOptional<z.ZodString>;
-    charges: z.ZodArray<z.ZodObject<{
+    charges: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
-        uid: z.ZodUUID;
-        item: z.ZodString;
-        cost: z.ZodNumber;
         currency: z.ZodEnum<{
             JMD: "JMD";
         }>;
-    }, z.core.$strip>>;
+        item: z.ZodString;
+        cost: z.ZodNumber;
+    }, z.core.$strip>>>>;
     cancelled: z.ZodOptional<z.ZodObject<{
         doneAt: z.ZodISODateTime;
         reason: z.ZodObject<{
@@ -1396,7 +1394,7 @@ declare const MutableAppointmentDetails: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodISODateTime>;
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
     _id: z.ZodUUID;
-    additionalFees: z.ZodReadonly<z.ZodNullable<z.ZodArray<z.ZodObject<{
+    additionalFees: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1409,7 +1407,7 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>>>;
-    discounts: z.ZodReadonly<z.ZodNullable<z.ZodArray<z.ZodObject<{
+    discounts: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1422,7 +1420,7 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>>>;
-    prepayments: z.ZodNullable<z.ZodArray<z.ZodObject<{
+    prepayments: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1434,7 +1432,7 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         }, z.core.$strip>;
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
-    }, z.core.$strip>>>;
+    }, z.core.$strip>>>>;
     payload: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodNumber>;
         vitals: z.ZodRecord<z.ZodEnum<{
@@ -1476,16 +1474,15 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         value: z.ZodString;
     }, z.core.$strip>>;
     invoiceNo: z.ZodOptional<z.ZodString>;
-    charges: z.ZodArray<z.ZodObject<{
+    charges: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
-        uid: z.ZodUUID;
-        item: z.ZodString;
-        cost: z.ZodNumber;
         currency: z.ZodEnum<{
             JMD: "JMD";
         }>;
-    }, z.core.$strip>>;
+        item: z.ZodString;
+        cost: z.ZodNumber;
+    }, z.core.$strip>>>>;
     cancelled: z.ZodOptional<z.ZodObject<{
         doneAt: z.ZodISODateTime;
         reason: z.ZodObject<{
@@ -1584,17 +1581,16 @@ declare const ScheduleAppointmentForm: z.ZodObject<{
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         value: z.ZodString;
     }, z.core.$strip>>;
-    charges: z.ZodOptional<z.ZodArray<z.ZodObject<{
+    charges: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
-        uid: z.ZodUUID;
-        item: z.ZodString;
-        cost: z.ZodNumber;
         currency: z.ZodEnum<{
             JMD: "JMD";
         }>;
-    }, z.core.$strip>>>;
-    prepayments: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
+        item: z.ZodString;
+        cost: z.ZodNumber;
+    }, z.core.$strip>>>>>;
+    prepayments: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodUUID, z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         description: z.ZodString;
@@ -1606,7 +1602,7 @@ declare const ScheduleAppointmentForm: z.ZodObject<{
         }, z.core.$strip>;
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
-    }, z.core.$strip>>>>;
+    }, z.core.$strip>>>>>;
     payments: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodISODateTime>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
@@ -1702,50 +1698,9 @@ declare function scheduleAppointment(request: RequestParameter): Promise<{
     appointment: {
         createdAt: string;
         _id: string;
-        additionalFees: readonly {
-            createdAt: string;
-            description: string;
-            fixedAmount: {
-                value: number;
-                currency: "JMD";
-            };
-            percentage: number;
-            isOptional: boolean;
-            lastModified?: string | null | undefined;
-        }[] | null;
-        discounts: readonly {
-            createdAt: string;
-            description: string;
-            fixedAmount: {
-                value: number;
-                currency: "JMD";
-            };
-            percentage: number;
-            isOptional: boolean;
-            lastModified?: string | null | undefined;
-        }[] | null;
-        prepayments: {
-            createdAt: string;
-            description: string;
-            fixedAmount: {
-                value: number;
-                currency: "JMD";
-            };
-            percentage: number;
-            isOptional: boolean;
-            lastModified?: string | null | undefined;
-        }[] | null;
         src: string;
         tkt: number;
         category: number;
-        charges: {
-            createdAt: string;
-            uid: string;
-            item: string;
-            cost: number;
-            currency: "JMD";
-            lastModified?: string | null | undefined;
-        }[];
         timeline: {
             scheduler: {
                 userUid: string;
@@ -1803,6 +1758,39 @@ declare function scheduleAppointment(request: RequestParameter): Promise<{
         };
         _hash: string;
         lastModified?: string | null | undefined;
+        additionalFees?: Record<string, {
+            createdAt: string;
+            description: string;
+            fixedAmount: {
+                value: number;
+                currency: "JMD";
+            };
+            percentage: number;
+            isOptional: boolean;
+            lastModified?: string | null | undefined;
+        }> | null | undefined;
+        discounts?: Record<string, {
+            createdAt: string;
+            description: string;
+            fixedAmount: {
+                value: number;
+                currency: "JMD";
+            };
+            percentage: number;
+            isOptional: boolean;
+            lastModified?: string | null | undefined;
+        }> | null | undefined;
+        prepayments?: Record<string, {
+            createdAt: string;
+            description: string;
+            fixedAmount: {
+                value: number;
+                currency: "JMD";
+            };
+            percentage: number;
+            isOptional: boolean;
+            lastModified?: string | null | undefined;
+        }> | null | undefined;
         payload?: {
             lastModified: number | null;
             vitals: Record<"heartRate" | "respiratoryRate" | "bloodPressure" | "bloodOxygen" | "bodyTemp", {
@@ -1835,6 +1823,13 @@ declare function scheduleAppointment(request: RequestParameter): Promise<{
             lastModified?: string | null | undefined;
         } | undefined;
         invoiceNo?: string | undefined;
+        charges?: Record<string, {
+            createdAt: string;
+            currency: "JMD";
+            item: string;
+            cost: number;
+            lastModified?: string | null | undefined;
+        }> | null | undefined;
         cancelled?: {
             doneAt: string;
             reason: {

package/dist/main.js

@@ -774,13 +774,15 @@ var MedicalDetails = z20.object({
 });
 
 // src/schemas/appointment/Appointment.ts
-import * as z21 from "zod";
 import { sumOf as sumOf2 } from "@wavy/fn";
+import * as z21 from "zod";
 
 // src/functions/calcAppointmentFee.ts
 import { sumOf } from "@wavy/fn";
 function calcAppointmentFee(appointment) {
-  const subtotal = sumOf(appointment.charges?.map((c) => c.cost));
+  const subtotal = sumOf(
+    Object.values(appointment.charges || {})?.map((c) => c.cost)
+  );
   const discount = calcAdjustment(appointment.discounts, subtotal);
   const additionalFees = calcAdjustment(appointment.additionalFees, subtotal);
   const prepayments = calcAdjustment(appointment.prepayments, subtotal);
@@ -788,9 +790,10 @@ function calcAppointmentFee(appointment) {
   return subtotal + additionalFees - (discount + prepayments);
 }
 var calcAdjustment = (adjustments, subtotal) => {
-  if (!adjustments || adjustments.length < 1) return 0;
+  const castedAdjustments = !adjustments ? [] : Object.values(adjustments);
+  if (!adjustments || castedAdjustments.length < 1) return 0;
   return sumOf(
-    adjustments?.map(
+    castedAdjustments?.map(
       (d) => (d.fixedAmount?.value || 0) + (d.percentage ? d.percentage * 0.01 * subtotal : 0)
     )
   );
@@ -805,7 +808,6 @@ var MiniAppointmentDetails = z21.object({
   /** A random uid that identifies the document. */
   _id: z21.uuidv4(),
   // This helps to identify the urgency of the appointment
-  // 3
   category: z21.int().min(1).max(3),
   /** The company's uid */
   src: CompanyState.shape._id,
@@ -824,12 +826,15 @@ var MiniAppointmentDetails = z21.object({
    */
   invoiceNo: InvoiceNo.optional(),
   /** The services that the client has done/will do. */
-  charges: z21.array(PriceTag).max(20),
+  charges: CompanyBilling.shape.offeredServices.nullish().refine(
+    (d) => !d || Object.keys(d).length <= 20,
+    "Expected no more than (20) charges."
+  ),
   /**Required to calculate the accurate grandTotal of the charges */
-  additionalFees: z21.array(PriceAdjustment).nullable().readonly(),
+  additionalFees: CompanyBilling.shape.additionalFees.nullish(),
   /**Required to calculate the accurate grandTotal of the charges */
-  discounts: z21.array(PriceAdjustment).nullable().readonly(),
-  prepayments: z21.array(PriceAdjustment).nullable(),
+  discounts: CompanyBilling.shape.discounts.nullish(),
+  prepayments: CompanyBilling.shape.prepayments.nullish(),
   /** The client's identity */
   clientUid: ClientIdentity.shape._id,
   /**
@@ -959,6 +964,7 @@ async function scheduleAppointment(request) {
   const companyUser = request.staff?.members[request.sender._id];
   const staffDetailsCopy = CompanyStaff.parse(structuredClone(request.staff));
   const stateCopy = CompanyState.parse(structuredClone(request.state));
+  const castedFormCharges = Object.values(request.form?.charges || {});
   let selectedDoctor = null;
   let selectedPhysAsst = null;
   const availableDoctors = findAvailableStaff("doc", staffDetailsCopy);
@@ -996,9 +1002,9 @@ async function scheduleAppointment(request) {
       staffDetailsCopy
     );
   }
-  if (request.preferences.serviceSelector === "scheduler" && (!request.form.charges || request.form.charges.length < 1)) {
+  if (request.preferences.serviceSelector === "scheduler" && (!request.form.charges || castedFormCharges.length < 1)) {
     throw new Error("Insufficient services selected.");
-  } else if (request.preferences.serviceSelector === "scheduler" && request.billing.offeredServices.deployed && request.form.charges.find(
+  } else if (request.preferences.serviceSelector === "scheduler" && request.billing.offeredServices.deployed && castedFormCharges.find(
     (charge) => !!Object.values(request.billing.offeredServices).find(
       (createdCharge) => findChanges(charge, createdCharge).length > 0
     )
@@ -1009,7 +1015,7 @@ async function scheduleAppointment(request) {
     throw new Error("Insufficient payment transactions recorded.");
   } else if (request.preferences.enforcePaidAppointments) {
     const maxIterations = Math.max(
-      request.form.charges.length,
+      castedFormCharges.length,
       request.form.payments.length
     );
     let totalPaid = 0;
@@ -1043,15 +1049,19 @@ async function scheduleAppointment(request) {
     src: stateCopy._id,
     tkt: request.state.tktNoCounter,
     category: request.form.category,
-    discounts: Object.values(request.billing.discounts || {}).filter(
-      (disc) => !disc.isOptional
+    discounts: Object.fromEntries(
+      Object.entries(request.billing.discounts || {}).filter(
+        ([_, disc]) => !disc.isOptional
+      )
     ),
-    additionalFees: Object.values(request.billing.additionalFees || {}).filter(
-      (fee) => !fee.isOptional
+    additionalFees: Object.fromEntries(
+      Object.entries(request.billing.additionalFees || {}).filter(
+        ([_, fee]) => !fee.isOptional
+      )
     ),
     payments: request.preferences.enforcePaidAppointments ? request.form.payments : null,
-    prepayments: request.preferences.enforcePaidAppointments ? request.form.prepayments || [] : null,
-    charges: request.preferences.serviceSelector === "scheduler" ? request.form.charges : [],
+    prepayments: request.preferences.enforcePaidAppointments ? request.form?.prepayments ?? null : null,
+    charges: request.preferences.serviceSelector === "scheduler" ? request.form?.charges ?? null : null,
     client: await request.findClient(request.form.clientId),
     _hash: "aa.aa.aa",
     lastModified: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bizmap/sdk",
-  "version": "0.0.99",
+  "version": "0.0.100",
   "main": "./dist/main.js",
   "types": "./dist/main.d.ts",
   "type": "module",