@bizmap/sdk 0.0.94 → 0.0.96

package/dist/main.d.ts

@@ -181,6 +181,7 @@ declare const CompanyDetails: z.ZodObject<{
             RR: "RR";
             LOR: "LOR";
         }>>;
+        servicesDeployed: z.ZodBoolean;
     }, z.core.$strip>;
     billing: z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodInt>;
@@ -224,18 +225,15 @@ declare const CompanyDetails: z.ZodObject<{
             percentage: z.ZodNumber;
             isOptional: z.ZodBoolean;
         }, z.core.$strip>>;
-        offeredServices: z.ZodObject<{
-            deployed: z.ZodBoolean;
-            value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
-                createdAt: z.ZodReadonly<z.ZodInt>;
-                lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
-                currency: z.ZodEnum<{
-                    JMD: "JMD";
-                }>;
-                item: z.ZodString;
-                cost: z.ZodNumber;
-            }, z.core.$strip>>;
-        }, z.core.$strip>;
+        offeredServices: z.ZodRecord<z.ZodUUID, z.ZodObject<{
+            createdAt: z.ZodReadonly<z.ZodInt>;
+            lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
+            currency: z.ZodEnum<{
+                JMD: "JMD";
+            }>;
+            item: z.ZodString;
+            cost: z.ZodNumber;
+        }, z.core.$strip>>;
     }, z.core.$strip>;
     staff: z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodInt>;
@@ -322,6 +320,7 @@ declare const MutableCompanyDetails: z.ZodObject<{
             RR: "RR";
             LOR: "LOR";
         }>>>;
+        servicesDeployed: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strip>>;
     billing: z.ZodOptional<z.ZodObject<{
         version: z.ZodOptional<z.ZodInt>;
@@ -365,18 +364,15 @@ declare const MutableCompanyDetails: z.ZodObject<{
             percentage: z.ZodNumber;
             isOptional: z.ZodBoolean;
         }, z.core.$strip>>>;
-        offeredServices: z.ZodOptional<z.ZodObject<{
-            deployed: z.ZodBoolean;
-            value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
-                createdAt: z.ZodReadonly<z.ZodInt>;
-                lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
-                currency: z.ZodEnum<{
-                    JMD: "JMD";
-                }>;
-                item: z.ZodString;
-                cost: z.ZodNumber;
-            }, z.core.$strip>>;
-        }, z.core.$strip>>;
+        offeredServices: z.ZodOptional<z.ZodRecord<z.ZodUUID, z.ZodObject<{
+            createdAt: z.ZodReadonly<z.ZodInt>;
+            lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
+            currency: z.ZodEnum<{
+                JMD: "JMD";
+            }>;
+            item: z.ZodString;
+            cost: z.ZodNumber;
+        }, z.core.$strip>>>;
     }, z.core.$strip>>;
     staff: z.ZodOptional<z.ZodObject<{
         partnerMap: z.ZodOptional<z.ZodRecord<z.ZodUUID, z.ZodRecord<z.ZodUUID, z.ZodObject<{
@@ -443,18 +439,15 @@ declare const CompanyBilling: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>;
-    offeredServices: z.ZodObject<{
-        deployed: z.ZodBoolean;
-        value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
-            createdAt: z.ZodReadonly<z.ZodInt>;
-            lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
-            currency: z.ZodEnum<{
-                JMD: "JMD";
-            }>;
-            item: z.ZodString;
-            cost: z.ZodNumber;
-        }, z.core.$strip>>;
-    }, z.core.$strip>;
+    offeredServices: z.ZodRecord<z.ZodUUID, z.ZodObject<{
+        createdAt: z.ZodReadonly<z.ZodInt>;
+        lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
+        currency: z.ZodEnum<{
+            JMD: "JMD";
+        }>;
+        item: z.ZodString;
+        cost: z.ZodNumber;
+    }, z.core.$strip>>;
     version: z.ZodInt;
     lastModified: z.ZodNullable<z.ZodInt>;
 }, z.core.$strip>;
@@ -501,18 +494,15 @@ declare const MutableCompanyBilling: z.ZodObject<{
         percentage: z.ZodNumber;
         isOptional: z.ZodBoolean;
     }, z.core.$strip>>;
-    offeredServices: z.ZodObject<{
-        deployed: z.ZodBoolean;
-        value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
-            createdAt: z.ZodReadonly<z.ZodInt>;
-            lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
-            currency: z.ZodEnum<{
-                JMD: "JMD";
-            }>;
-            item: z.ZodString;
-            cost: z.ZodNumber;
-        }, z.core.$strip>>;
-    }, z.core.$strip>;
+    offeredServices: z.ZodRecord<z.ZodUUID, z.ZodObject<{
+        createdAt: z.ZodReadonly<z.ZodInt>;
+        lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
+        currency: z.ZodEnum<{
+            JMD: "JMD";
+        }>;
+        item: z.ZodString;
+        cost: z.ZodNumber;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 type MutableCompanyBilling = z.infer<typeof MutableCompanyBilling>;
 
@@ -601,6 +591,7 @@ declare const CompanyPreferences: z.ZodObject<{
         RR: "RR";
         LOR: "LOR";
     }>>;
+    servicesDeployed: z.ZodBoolean;
     version: z.ZodInt;
     lastModified: z.ZodNullable<z.ZodInt>;
 }, z.core.$strip>;
@@ -617,6 +608,7 @@ declare const MutableCompanyPreferences: z.ZodObject<{
         RR: "RR";
         LOR: "LOR";
     }>>;
+    servicesDeployed: z.ZodBoolean;
 }, z.core.$strip>;
 type MutableCompanyPreferences = z.infer<typeof MutableCompanyPreferences>;
 
@@ -1031,7 +1023,6 @@ declare const ClientIdentity: z.ZodObject<{
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
     version: z.ZodInt;
     _id: z.ZodUUID;
-    phoneNumber: z.ZodOptional<z.ZodString>;
     photoUrl: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     firstName: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     middleName: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
@@ -1044,6 +1035,8 @@ declare const ClientIdentity: z.ZodObject<{
     }>;
     isGlobal: z.ZodBoolean;
     origin: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+    visits: z.ZodOptional<z.ZodRecord<z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>, z.ZodArray<z.ZodInt>>>;
+    phoneNumber: z.ZodOptional<z.ZodString>;
     nid: z.ZodOptional<z.ZodObject<{
         trn: z.ZodOptional<z.ZodString>;
         nin: z.ZodOptional<z.ZodString>;
@@ -1081,6 +1074,7 @@ declare const MiniAppointmentDetails: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodInt>;
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
     _id: z.ZodUUID;
+    category: z.ZodInt;
     src: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     tkt: z.ZodReadonly<z.ZodInt>;
     reason: z.ZodOptional<z.ZodObject<{
@@ -1295,6 +1289,7 @@ declare const AppointmentDetails: z.ZodObject<{
     }, z.core.$strip>>>;
     src: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     tkt: z.ZodReadonly<z.ZodInt>;
+    category: z.ZodInt;
     reason: z.ZodOptional<z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodInt>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
@@ -1361,7 +1356,6 @@ declare const AppointmentDetails: z.ZodObject<{
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
         version: z.ZodInt;
         _id: z.ZodUUID;
-        phoneNumber: z.ZodOptional<z.ZodString>;
         photoUrl: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         firstName: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
         middleName: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
@@ -1374,6 +1368,8 @@ declare const AppointmentDetails: z.ZodObject<{
         }>;
         isGlobal: z.ZodBoolean;
         origin: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+        visits: z.ZodOptional<z.ZodRecord<z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>, z.ZodArray<z.ZodInt>>>;
+        phoneNumber: z.ZodOptional<z.ZodString>;
         nid: z.ZodOptional<z.ZodObject<{
             trn: z.ZodOptional<z.ZodString>;
             nin: z.ZodOptional<z.ZodString>;
@@ -1473,6 +1469,7 @@ declare const MutableAppointmentDetails: z.ZodObject<{
     }, z.core.$strip>>>;
     src: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     tkt: z.ZodReadonly<z.ZodInt>;
+    category: z.ZodInt;
     reason: z.ZodOptional<z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodInt>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
@@ -1539,7 +1536,6 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
         version: z.ZodInt;
         _id: z.ZodUUID;
-        phoneNumber: z.ZodOptional<z.ZodString>;
         photoUrl: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         firstName: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
         middleName: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
@@ -1552,6 +1548,8 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         }>;
         isGlobal: z.ZodBoolean;
         origin: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+        visits: z.ZodOptional<z.ZodRecord<z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>, z.ZodArray<z.ZodInt>>>;
+        phoneNumber: z.ZodOptional<z.ZodString>;
         nid: z.ZodOptional<z.ZodObject<{
             trn: z.ZodOptional<z.ZodString>;
             nin: z.ZodOptional<z.ZodString>;
@@ -1578,8 +1576,14 @@ type MutableAppointmentDetails = z.infer<typeof MutableAppointmentDetails>;
 declare const ScheduleAppointmentForm: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodInt>;
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
-    clientUid: z.ZodUUID;
-    serviceProviderUid: z.ZodOptional<z.ZodNullable<z.ZodUUID>>;
+    clientId: z.ZodUUID;
+    serviceProviderId: z.ZodUnion<[z.ZodUUID, z.ZodLiteral<"next">]>;
+    category: z.ZodInt;
+    appointmentReason: z.ZodOptional<z.ZodObject<{
+        createdAt: z.ZodReadonly<z.ZodInt>;
+        lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
+        value: z.ZodString;
+    }, z.core.$strip>>;
     charges: z.ZodOptional<z.ZodArray<z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodInt>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
@@ -1733,6 +1737,7 @@ declare function scheduleAppointment(request: RequestParameter): Promise<{
         }[] | null;
         src: string;
         tkt: number;
+        category: number;
         charges: {
             createdAt: number;
             uid: string;
@@ -1779,9 +1784,10 @@ declare function scheduleAppointment(request: RequestParameter): Promise<{
                 firstSchoolName?: string | undefined;
             };
             lastModified?: number | null | undefined;
-            phoneNumber?: string | undefined;
             photoUrl?: string | null | undefined;
             email?: string | undefined;
+            visits?: Record<string, number[]> | undefined;
+            phoneNumber?: string | undefined;
             nid?: {
                 trn?: string | undefined;
                 nin?: string | undefined;

package/dist/main.js

@@ -191,24 +191,13 @@ var CompanyBilling = z8.object({
   discounts: createAdjustments("discount"),
   /** Optionally deductable from bills */
   prepayments: createAdjustments("pre-payment"),
-  offeredServices: z8.object({
-    /** Forces service selectors to use the list of service(s) that you've created. */
-    deployed: z8.boolean(),
-    // An object is used instead of an array so that updates to a particular service is accurate
-    // and consistent.
-    value: z8.record(z8.uuidv4(), PriceTag.omit({ uid: true }))
-  }).superRefine((data, ctx) => {
-    const services = Object.entries(data.value);
+  offeredServices: z8.record(z8.uuidv4(), PriceTag.omit({ uid: true })).superRefine((data, ctx) => {
+    const services = Object.entries(data);
     if (services.length > 150) {
       ctx.addIssue(
         "Creating more services than the max allowed services (150) is prohibited."
       );
     }
-    if (data.deployed && services.length < 1) {
-      ctx.addIssue(
-        "You must create at least (1) service in order to deploy your service list."
-      );
-    }
   }),
   version: Version,
   lastModified: Timestamp.nullable()
@@ -407,6 +396,7 @@ var CompanyPreferences = z12.object({
    * @property LOR (Least Outstanding Requests): Distribute based on availability.
    */
   apptDistAlg: appointmentDistAlgs.default("RR"),
+  servicesDeployed: z12.boolean(),
   version: Version,
   lastModified: Timestamp.nullable()
 }).refine(
@@ -460,7 +450,7 @@ var UserDetails = z13.object({
 }).omit({ uid: true });
 
 // src/schemas/profiles/Client.ts
-import { Address as Address2 } from "@wavy/util";
+import { Address as Address2, PhoneNumber as PhoneNumber2 } from "@wavy/util";
 var Name = z14.string().trim().min(2).max(MAX_NAME_LENGTH).transform((d) => d.replace(/-+/g, "-").replace(/'+/g, "'")).superRefine((data, ctx) => {
   const invalidCharIdx = data.search(/[^a-z'-]/i);
   if (invalidCharIdx >= 0) {
@@ -485,6 +475,8 @@ var ClientIdentity = UserDetails.pick({
     sex: genders,
     isGlobal: z14.boolean(),
     origin: CompanyIdentity.shape._id,
+    visits: z14.record(CompanyIdentity.shape._id, z14.array(Timestamp).min(1)).optional(),
+    phoneNumber: PhoneNumber2.optional(),
     // aka. National id
     nid: z14.object({
       trn: Trn,
@@ -499,7 +491,6 @@ var ClientIdentity = UserDetails.pick({
       motherMiddleName: Name,
       oldestSiblingMiddleName: Name,
       firstSchoolName: z14.string().trim().min(3).max(60)
-      // nickname: z.string().trim().min(1).max(40),
     }).partial().refine(
       (data) => Object.keys(data).length > 0,
       "At least (1) attribute must be defined."
@@ -816,6 +807,9 @@ var TimelineActivity = z21.object({
 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,
   /** The ticket number */
@@ -900,9 +894,10 @@ var MutableAppointmentDetails = AppointmentDetails.safeExtend(
   }).shape
 );
 var ScheduleAppointmentForm = z21.object({
-  clientUid: ClientIdentity.shape._id,
-  /** A nullish value === next_available */
-  serviceProviderUid: CompanyUser.shape._id.nullish(),
+  clientId: ClientIdentity.shape._id,
+  serviceProviderId: CompanyUser.shape._id.or(z21.literal("next")),
+  category: AppointmentDetails.shape.category,
+  appointmentReason: AppointmentDetails.shape.reason,
   charges: AppointmentDetails.shape.charges.optional(),
   prepayments: AppointmentDetails.shape.prepayments.optional(),
   payments: AppointmentDetails.shape.payments.optional(),
@@ -910,7 +905,7 @@ var ScheduleAppointmentForm = z21.object({
 });
 
 // src/functions/scheduleAppointment.ts
-import { findChanges, omit } from "@wavy/fn";
+import { findChanges, omit, TODO } from "@wavy/fn";
 import { v4 } from "uuid";
 
 // src/functions/findAvailableStaff.ts
@@ -952,6 +947,7 @@ function findNextAvailableStaff(userUids, algorithm, staff) {
 
 // src/functions/scheduleAppointment.ts
 async function scheduleAppointment(request) {
+  TODO("Revise this fn (some things have changed in the form etc.)");
   request.form = ScheduleAppointmentForm.parse(request.form);
   request.sender = UserDetails.parse(request.sender);
   request.preferences = CompanyPreferences.omit({
@@ -976,14 +972,16 @@ async function scheduleAppointment(request) {
   if (availableDoctors.length < 1) {
     throw new Error("Insufficient staff available.");
   }
-  if (request.form.serviceProviderUid && availableDoctors.includes(request.form.serviceProviderUid)) {
-    selectedDoctor = request.form.serviceProviderUid;
-  } else if (request.form.serviceProviderUid && staffDetailsCopy.members[request.form.serviceProviderUid]?.roles?.includes?.("doc")) {
+  if (request.form.serviceProviderId && availableDoctors.includes(request.form.serviceProviderId)) {
+    selectedDoctor = request.form.serviceProviderId;
+  } else if (request.form.serviceProviderId && staffDetailsCopy.members[request.form.serviceProviderId]?.roles?.includes?.(
+    "doc"
+  )) {
     throw new Error("Unavailable doctor selected.");
-  } else if (request.form.serviceProviderUid) {
+  } else if (request.form.serviceProviderId) {
     throw new Error("Invalid doctor selected.");
   }
-  if (request.form.serviceProviderUid === null || request.form.serviceProviderUid === void 0) {
+  if (request.form.serviceProviderId === null || request.form.serviceProviderId === void 0) {
     selectedDoctor = findNextAvailableStaff(
       availableDoctors,
       request.preferences.apptDistAlg,
@@ -1004,7 +1002,7 @@ async function scheduleAppointment(request) {
   if (request.preferences.serviceSelector === "scheduler" && (!request.form.charges || request.form.charges.length < 1)) {
     throw new Error("Insufficient services selected.");
   } else if (request.preferences.serviceSelector === "scheduler" && request.billing.offeredServices.deployed && request.form.charges.find(
-    (charge) => !!Object.values(request.billing.offeredServices.value).find(
+    (charge) => !!Object.values(request.billing.offeredServices).find(
       (createdCharge) => findChanges(charge, createdCharge).length > 0
     )
   )) {
@@ -1047,6 +1045,7 @@ async function scheduleAppointment(request) {
     _id: v4(),
     src: stateCopy._id,
     tkt: request.state.tktNoCounter,
+    category: request.form.category,
     discounts: Object.values(request.billing.discounts || {}).filter(
       (disc) => !disc.isOptional
     ),
@@ -1056,7 +1055,7 @@ async function scheduleAppointment(request) {
     payments: request.preferences.enforcePaidAppointments ? request.form.payments : null,
     prepayments: request.preferences.enforcePaidAppointments ? request.form.prepayments || [] : null,
     charges: request.preferences.serviceSelector === "scheduler" ? request.form.charges : [],
-    client: await request.findClient(request.form.clientUid),
+    client: await request.findClient(request.form.clientId),
     _hash: "aa.aa.aa",
     lastModified: null,
     timeline: {

package/package.json

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