@bizmap/sdk 0.0.60 → 0.0.62

package/dist/main.d.ts

@@ -206,7 +206,7 @@ declare const CompanyDetails: z.ZodObject<{
         }, z.core.$strip>>;
         offeredServices: z.ZodObject<{
             deployed: z.ZodBoolean;
-            value: z.ZodRecord<z.ZodString, z.ZodObject<{
+            value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
                 createdAt: z.ZodReadonly<z.ZodInt>;
                 lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
                 currency: z.ZodEnum<{
@@ -361,7 +361,7 @@ declare const MutableCompanyDetails: z.ZodObject<{
         }, z.core.$strip>>>;
         offeredServices: z.ZodOptional<z.ZodObject<{
             deployed: z.ZodBoolean;
-            value: z.ZodRecord<z.ZodString, z.ZodObject<{
+            value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
                 createdAt: z.ZodReadonly<z.ZodInt>;
                 lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
                 currency: z.ZodEnum<{
@@ -454,7 +454,7 @@ declare const CompanyBilling: z.ZodObject<{
     }, z.core.$strip>>;
     offeredServices: z.ZodObject<{
         deployed: z.ZodBoolean;
-        value: z.ZodRecord<z.ZodString, z.ZodObject<{
+        value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
             createdAt: z.ZodReadonly<z.ZodInt>;
             lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
             currency: z.ZodEnum<{
@@ -525,7 +525,7 @@ declare const MutableCompanyBilling: z.ZodObject<{
     }, z.core.$strip>>;
     offeredServices: z.ZodObject<{
         deployed: z.ZodBoolean;
-        value: z.ZodRecord<z.ZodString, z.ZodObject<{
+        value: z.ZodRecord<z.ZodUUID, z.ZodObject<{
             createdAt: z.ZodReadonly<z.ZodInt>;
             lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
             currency: z.ZodEnum<{
@@ -633,8 +633,7 @@ declare const MutableCompanyPreferences: z.ZodObject<{
 }, z.core.$strip>;
 type MutableCompanyPreferences = z.infer<typeof MutableCompanyPreferences>;
 
-declare const CompanyStaff: z.ZodPipe<z.ZodObject<{
-    uid: z.ZodUUID;
+declare const CompanyStaff: z.ZodObject<{
     members: z.ZodRecord<z.ZodUUID, z.ZodObject<{
         uid: z.ZodUUID;
         roles: z.ZodPipe<z.ZodArray<z.ZodEnum<{
@@ -663,6 +662,7 @@ declare const CompanyStaff: z.ZodPipe<z.ZodObject<{
         email: z.ZodEmail;
         phoneNumber: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
+    uid: z.ZodUUID;
     partnerMap: z.ZodRecord<z.ZodUUID, z.ZodRecord<z.ZodUUID, z.ZodObject<{
         addedAt: z.ZodInt;
     }, z.core.$strip>>>;
@@ -686,75 +686,7 @@ declare const CompanyStaff: z.ZodPipe<z.ZodObject<{
         inviteAccepted: z.ZodNullable<z.ZodInt>;
     }, z.core.$strip>>;
     lastModified: z.ZodNullable<z.ZodInt>;
-}, z.core.$strip>, z.ZodTransform<{
-    uid: string;
-    members: Record<string, {
-        uid: string;
-        roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
-        isAvailable: boolean;
-        isBusy: boolean;
-        status: "inviteSent" | "active" | "inactive";
-        appointments: Record<"ongoing" | "completed", number>;
-        lastActive: number | null;
-        isAvailableLastModified: number | null;
-        isBusyLastModified: number | null;
-        name: Record<"first" | "last", string>;
-        email: string;
-        photoUrl?: string | null | undefined;
-        phoneNumber?: string | undefined;
-    }>;
-    partnerMap: Record<string, Record<string, {
-        addedAt: number;
-    }>>;
-    updateQueue: Record<string, {
-        $REMOVE?: {
-            addedAt: number;
-        } | undefined;
-        $CHANGE_ROLES?: {
-            newRoles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
-            addedAt: number;
-        } | undefined;
-    }>;
-    timeline: Record<string, {
-        inviteSent: number | null;
-        inviteAccepted: number | null;
-    }>;
-    lastModified: number | null;
-}, {
-    uid: string;
-    members: Record<string, {
-        uid: string;
-        roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
-        isAvailable: boolean;
-        isBusy: boolean;
-        status: "inviteSent" | "active" | "inactive";
-        appointments: Record<"ongoing" | "completed", number>;
-        lastActive: number | null;
-        isAvailableLastModified: number | null;
-        isBusyLastModified: number | null;
-        name: Record<"first" | "last", string>;
-        email: string;
-        photoUrl?: string | null | undefined;
-        phoneNumber?: string | undefined;
-    }>;
-    partnerMap: Record<string, Record<string, {
-        addedAt: number;
-    }>>;
-    updateQueue: Record<string, {
-        $REMOVE?: {
-            addedAt: number;
-        } | undefined;
-        $CHANGE_ROLES?: {
-            newRoles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
-            addedAt: number;
-        } | undefined;
-    }>;
-    timeline: Record<string, {
-        inviteSent: number | null;
-        inviteAccepted: number | null;
-    }>;
-    lastModified: number | null;
-}>>;
+}, z.core.$strip>;
 type CompanyStaff = z.infer<typeof CompanyStaff>;
 
 /** Can only be modifiede by the server */
@@ -780,6 +712,28 @@ declare const CompanyState: z.ZodObject<{
 }, z.core.$strip>;
 type CompanyState = z.infer<typeof CompanyState>;
 
+declare const MiniCompanyUser: z.ZodObject<{
+    uid: z.ZodUUID;
+    roles: z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        doc: "doc";
+        physAsst: "physAsst";
+        rcpst: "rcpst";
+        cshr: "cshr";
+        admin: "admin";
+    }>>, z.ZodTransform<("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[], ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[]>>;
+    isAvailable: z.ZodBoolean;
+    isBusy: z.ZodBoolean;
+    status: z.ZodEnum<{
+        inviteSent: "inviteSent";
+        active: "active";
+        inactive: "inactive";
+    }>;
+    appointments: z.ZodRecord<z.ZodLiteral<"ongoing" | "completed">, z.ZodInt>;
+    lastActive: z.ZodNullable<z.ZodInt>;
+    isAvailableLastModified: z.ZodNullable<z.ZodInt>;
+    isBusyLastModified: z.ZodNullable<z.ZodInt>;
+}, z.core.$strip>;
+type MiniCompanyUser = z.infer<typeof MiniCompanyUser>;
 declare const CompanyUser: z.ZodObject<{
     uid: z.ZodUUID;
     roles: z.ZodPipe<z.ZodArray<z.ZodEnum<{
@@ -872,22 +826,21 @@ declare const ClientIdentity: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodInt>;
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
     uid: z.ZodUUID;
-    email: z.ZodOptional<z.ZodNullable<z.ZodEmail>>;
-    address: z.ZodOptional<z.ZodObject<{
-        streetAddress: z.ZodString;
-        city: z.ZodOptional<z.ZodString>;
-        parish: z.ZodString;
-        country: z.ZodString;
-    }, z.core.$strip>>;
+    email: z.ZodEmail;
     phoneNumber: z.ZodOptional<z.ZodString>;
     name: z.ZodRecord<z.ZodEnum<{
         first: "first";
         last: "last";
     }>, z.ZodString>;
     photoUrl: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    linked: z.ZodBoolean;
     dob: z.ZodOptional<z.ZodInt>;
-    publicKey: z.ZodNullable<z.ZodString>;
-    activated: z.ZodBoolean;
+    address: z.ZodOptional<z.ZodObject<{
+        streetAddress: z.ZodString;
+        city: z.ZodOptional<z.ZodString>;
+        parish: z.ZodString;
+        country: z.ZodString;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 type ClientIdentity = z.infer<typeof ClientIdentity>;
 
@@ -989,14 +942,7 @@ declare const UserDetails: z.ZodObject<{
     createdAt: z.ZodReadonly<z.ZodInt>;
     lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
     uid: z.ZodUUID;
-    email: z.ZodOptional<z.ZodNullable<z.ZodEmail>>;
-    dob: z.ZodOptional<z.ZodInt>;
-    address: z.ZodOptional<z.ZodObject<{
-        streetAddress: z.ZodString;
-        city: z.ZodOptional<z.ZodString>;
-        parish: z.ZodString;
-        country: z.ZodString;
-    }, z.core.$strip>>;
+    email: z.ZodEmail;
     publicKey: z.ZodNullable<z.ZodString>;
     notifications: z.ZodArray<z.ZodObject<{
         code: z.ZodLiteral<"COMPANY_INVITE" | "INVITE_RESPONSE" | "DEV_MESSAGE" | "ALERT">;
@@ -1009,7 +955,7 @@ declare const UserDetails: z.ZodObject<{
         expiresAt: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
         createdAt: z.ZodInt;
     }, z.core.$strip>>;
-    activated: z.ZodBoolean;
+    linked: z.ZodBoolean;
     name: z.ZodRecord<z.ZodEnum<{
         first: "first";
         last: "last";
@@ -1339,22 +1285,21 @@ declare const AppointmentDetails: z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodInt>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
         uid: z.ZodUUID;
-        email: z.ZodOptional<z.ZodNullable<z.ZodEmail>>;
-        address: z.ZodOptional<z.ZodObject<{
-            streetAddress: z.ZodString;
-            city: z.ZodOptional<z.ZodString>;
-            parish: z.ZodString;
-            country: z.ZodString;
-        }, z.core.$strip>>;
+        email: z.ZodEmail;
         phoneNumber: z.ZodOptional<z.ZodString>;
         name: z.ZodRecord<z.ZodEnum<{
             first: "first";
             last: "last";
         }>, z.ZodString>;
         photoUrl: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        linked: z.ZodBoolean;
         dob: z.ZodOptional<z.ZodInt>;
-        publicKey: z.ZodNullable<z.ZodString>;
-        activated: z.ZodBoolean;
+        address: z.ZodOptional<z.ZodObject<{
+            streetAddress: z.ZodString;
+            city: z.ZodOptional<z.ZodString>;
+            parish: z.ZodString;
+            country: z.ZodString;
+        }, z.core.$strip>>;
     }, z.core.$strip>;
 }, z.core.$strip>;
 type AppointmentDetails = z.infer<typeof AppointmentDetails>;
@@ -1509,22 +1454,21 @@ declare const MutableAppointmentDetails: z.ZodObject<{
         createdAt: z.ZodReadonly<z.ZodInt>;
         lastModified: z.ZodOptional<z.ZodNullable<z.ZodInt>>;
         uid: z.ZodUUID;
-        email: z.ZodOptional<z.ZodNullable<z.ZodEmail>>;
-        address: z.ZodOptional<z.ZodObject<{
-            streetAddress: z.ZodString;
-            city: z.ZodOptional<z.ZodString>;
-            parish: z.ZodString;
-            country: z.ZodString;
-        }, z.core.$strip>>;
+        email: z.ZodEmail;
         phoneNumber: z.ZodOptional<z.ZodString>;
         name: z.ZodRecord<z.ZodEnum<{
             first: "first";
             last: "last";
         }>, z.ZodString>;
         photoUrl: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        linked: z.ZodBoolean;
         dob: z.ZodOptional<z.ZodInt>;
-        publicKey: z.ZodNullable<z.ZodString>;
-        activated: z.ZodBoolean;
+        address: z.ZodOptional<z.ZodObject<{
+            streetAddress: z.ZodString;
+            city: z.ZodOptional<z.ZodString>;
+            parish: z.ZodString;
+            country: z.ZodString;
+        }, z.core.$strip>>;
     }, z.core.$strip>;
     _hash: z.ZodString;
 }, z.core.$strip>;
@@ -1577,7 +1521,7 @@ declare const ScheduleAppointmentForm: z.ZodObject<{
 }, z.core.$strip>;
 type ScheduleAppointmentForm = z.infer<typeof ScheduleAppointmentForm>;
 
-declare function scheduleAppointment(request: {
+type RequestParameter = {
     form: ScheduleAppointmentForm;
     sender: UserDetails;
     billing: SafeOmit<CompanyBilling, "uid" | "prepayments" | "lastModified">;
@@ -1590,7 +1534,12 @@ declare function scheduleAppointment(request: {
     options?: Partial<{
         ignoreBalanceCheck: boolean;
     }>;
-}): Promise<{
+};
+/**
+ * @param {RequestParameter} request
+ * @returns {Promise<{updates: {state:CompanyState, staffDetails: CompanyStaff}, appointment: AppointmentDetails}>}
+ * */
+declare function scheduleAppointment(request: RequestParameter): Promise<{
     updates: {
         state: {
             uid: string;
@@ -1613,7 +1562,6 @@ declare function scheduleAppointment(request: {
             createdAt: number;
         };
         staffDetails: {
-            uid: string;
             members: Record<string, {
                 uid: string;
                 roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
@@ -1629,6 +1577,7 @@ declare function scheduleAppointment(request: {
                 photoUrl?: string | null | undefined;
                 phoneNumber?: string | undefined;
             }>;
+            uid: string;
             partnerMap: Record<string, Record<string, {
                 addedAt: number;
             }>>;
@@ -1714,20 +1663,19 @@ declare function scheduleAppointment(request: {
         client: {
             createdAt: number;
             uid: string;
+            email: string;
             name: Record<"first" | "last", string>;
-            publicKey: string | null;
-            activated: boolean;
+            linked: boolean;
             lastModified?: number | null | undefined;
-            email?: string | null | undefined;
+            phoneNumber?: string | undefined;
+            photoUrl?: string | null | undefined;
+            dob?: number | undefined;
             address?: {
                 streetAddress: string;
                 parish: string;
                 country: string;
                 city?: string | undefined;
             } | undefined;
-            phoneNumber?: string | undefined;
-            photoUrl?: string | null | undefined;
-            dob?: number | undefined;
         };
         _hash: string;
         lastModified?: number | null | undefined;
@@ -1780,12 +1728,26 @@ declare function scheduleAppointment(request: {
     };
 }>;
 
+/**
+ * @param {CompanyUserRole} role The role used to filter the staff members
+ * @param {CompanyStaff} staff The staff object to query
+ * @returns {string[]} The uids of the available staff members
+ */
 declare function findAvailableStaff(role: CompanyUserRole, staff: CompanyStaff): string[];
 
+/**
+ * @param {string[]} userUids The uids of the members we should query
+ * @param {CompanyPreferences["apptDistAlg"]} algorithm The algorithm we should use to find the staff
+ * @param {CompanyStaff} staff
+ * @returns {string|null}
+ */
 declare function findNextAvailableStaff(userUids: string[], algorithm: CompanyPreferences["apptDistAlg"], staff: CompanyStaff): string | null;
 
-/**@returns an array of the users that have conflicting roles or are incompatible with the other partners, or null if none was found. */
-declare const findConflictingPartners: (...partners: CompanyUser[]) => {
+/**
+ * @param {...CompanyUser|MiniCompanyUser} partners
+ * @returns {(CompanyUser|MiniCompanyUser)[]|null} an array of the users that have conflicting roles or roles that are
+ * incompatible with the other partners, or null if none was found. */
+declare const findConflictingPartners: (...partners: (CompanyUser | MiniCompanyUser)[]) => ({
     uid: string;
     roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
     isAvailable: boolean;
@@ -1799,8 +1761,21 @@ declare const findConflictingPartners: (...partners: CompanyUser[]) => {
     email: string;
     photoUrl?: string | null | undefined;
     phoneNumber?: string | undefined;
-}[] | null;
-/**@returns the roles that are compatible with the selected role. */
+} | {
+    uid: string;
+    roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "admin")[];
+    isAvailable: boolean;
+    isBusy: boolean;
+    status: "inviteSent" | "active" | "inactive";
+    appointments: Record<"ongoing" | "completed", number>;
+    lastActive: number | null;
+    isAvailableLastModified: number | null;
+    isBusyLastModified: number | null;
+})[] | null;
+/**
+ * @param {CompanyUserRole} role
+ * @returns {CompanyUserRole[]} The roles that are compatible with the selected role.
+ * */
 declare const getCompatibleRoles: (role: CompanyUserRole) => CompanyUserRole[];
 
-export { AppointmentDetails, type AppointmentDistAlg, ClientIdentity, CompanyBilling, CompanyDetails, CompanyIdentity, CompanyInviteList, CompanyNotifications, type CompanyPartnerRole, CompanyPreferences, type CompanyServiceSelector, CompanyStaff, CompanyState, CompanyUser, type CompanyUserRole, CreditCurrency, type EmployeeRole, type HealthcareProviderRole, InviteResponse, InvoiceNo, MedicalDetails, Medicine, MiniAppointmentDetails, MutableAppointmentDetails, MutableCompanyBilling, MutableCompanyDetails, MutableCompanyIdentity, MutableCompanyPreferences, Notification, type PaymentMethod, PriceAdjustment, PriceTag, Reason, Receipts, ScheduleAppointmentForm, StandardTime, TicketNo, type Tier, TierList, TimeLog, Timestamp, UserDetails, Vitals, appointmentDistAlgs, companyPartnerRoles, companyServiceSelectors, companyUserRoles, employeeRoles, findAvailableStaff, findConflictingPartners, findNextAvailableStaff, getCompatibleRoles, healthcareProviderRoles, paymentMethods, scheduleAppointment, serviceProviders, tiers, vitalKeys };
+export { AppointmentDetails, type AppointmentDistAlg, ClientIdentity, CompanyBilling, CompanyDetails, CompanyIdentity, CompanyInviteList, CompanyNotifications, type CompanyPartnerRole, CompanyPreferences, type CompanyServiceSelector, CompanyStaff, CompanyState, CompanyUser, type CompanyUserRole, CreditCurrency, type EmployeeRole, type HealthcareProviderRole, InviteResponse, InvoiceNo, MedicalDetails, Medicine, MiniAppointmentDetails, MiniCompanyUser, MutableAppointmentDetails, MutableCompanyBilling, MutableCompanyDetails, MutableCompanyIdentity, MutableCompanyPreferences, Notification, type PaymentMethod, PriceAdjustment, PriceTag, Reason, Receipts, ScheduleAppointmentForm, StandardTime, TicketNo, type Tier, TierList, TimeLog, Timestamp, UserDetails, Vitals, appointmentDistAlgs, companyPartnerRoles, companyServiceSelectors, companyUserRoles, employeeRoles, findAvailableStaff, findConflictingPartners, findNextAvailableStaff, getCompatibleRoles, healthcareProviderRoles, paymentMethods, scheduleAppointment, serviceProviders, tiers, vitalKeys };

package/dist/main.js

@@ -151,7 +151,9 @@ var CompanyBilling = z8.object({
   offeredServices: z8.object({
     /** Forces service selectors to use the list of service(s) that you've created. */
     deployed: z8.boolean(),
-    value: z8.record(z8.string(), PriceTag.omit({ uid: true }))
+    // 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);
     if (services.length > 150) {
@@ -164,13 +166,6 @@ var CompanyBilling = z8.object({
         "You must create at least (1) service in order to deploy your service list."
       );
     }
-    for (const [key, value] of services) {
-      if (key !== value.createdAt.toString()) {
-        ctx.addIssue(
-          `The key for every service must be the same its correlating "createdAt" timestamp.`
-        );
-      }
-    }
   }),
   lastModified: Timestamp.nullable()
 });
@@ -322,27 +317,17 @@ import { UserModel as UserModel2 } from "@wavy/util";
 import * as z14 from "zod";
 
 // src/schemas/User.ts
-import { Address as Address2, UserModel } from "@wavy/util";
+import { UserModel } from "@wavy/util";
 import * as z13 from "zod";
 var UserDetails = z13.object({
   ...UserModel.shape,
   uid: z13.uuidv4(),
-  email: UserModel.shape.email.nullish(),
-  dob: Timestamp.optional(),
-  address: Address2.optional(),
+  email: UserModel.shape.email,
   publicKey: z13.string().nullable(),
   notifications: z13.array(Notification),
-  activated: z13.boolean(),
+  /** Only true when linked to a client */
+  linked: z13.boolean(),
   ...TimeLog.shape
-}).superRefine((data, ctx) => {
-  if (data.activated && data.publicKey === null) {
-    ctx.addIssue("An activated user must have a valid public key.");
-  } else if (!data.activated && data.publicKey !== null) {
-    ctx.addIssue("An inactive user can't have a public key.");
-  }
-  if (data.activated && !data.email) {
-    ctx.addIssue("An activated user must have a valid email.");
-  }
 });
 
 // src/functions/helper-functions.ts
@@ -377,8 +362,7 @@ var getCompatibleRoles = (role) => {
 };
 
 // src/schemas/company/components/User.ts
-var CompanyUser = z14.object({
-  ...UserModel2.shape,
+var MiniCompanyUser2 = z14.object({
   uid: UserDetails.shape.uid,
   roles: z14.array(companyUserRoles).transform((roles) => {
     const newRoles = [];
@@ -408,27 +392,24 @@ var CompanyUser = z14.object({
     );
   }
 });
+var CompanyUser = z14.object({
+  ...UserModel2.shape,
+  ...MiniCompanyUser2.shape
+});
 
 // src/schemas/company/components/Staff.ts
-var RawCompanyStaff = z15.object({
-  uid: CompanyState.shape.uid,
-  members: z15.record(CompanyUser.shape.uid, CompanyUser).superRefine((data, ctx) => {
-    const emails = [];
-    for (const [uid, user] of Object.entries(data)) {
-      if (uid !== user.uid) {
-        ctx.addIssue(
-          `User found with a uid that doesn't match their respective key. (${uid} !== ${user.uid}).`
-        );
-      }
-      if (!!user.email && emails.includes(user.email.toLowerCase())) {
-        ctx.addIssue(
-          `Having multiple members with the same email is prohibited. (${user.email})`
-        );
-      } else if (!!user.email) {
-        emails.push(user.email.toLowerCase());
-      }
+var refineMembers = (data, ctx) => {
+  for (const [uid, user] of Object.entries(data)) {
+    if (uid !== user.uid) {
+      ctx.addIssue(
+        `User found with a uid that doesn't match their respective key. (${uid} !== ${user.uid}).`
+      );
     }
-  }),
+  }
+};
+var MiniRawCompanyStaff = z15.object({
+  uid: CompanyState.shape.uid,
+  members: z15.record(MiniCompanyUser2.shape.uid, MiniCompanyUser2).superRefine(refineMembers),
   /**
    * @relationship one -> many
    *@description A map of doctor `uids` to their assistants `uids` */
@@ -455,60 +436,68 @@ var RawCompanyStaff = z15.object({
   ),
   lastModified: Timestamp.nullable()
 });
-var CompanyStaff = RawCompanyStaff.transform((d) => {
-  const copy = structuredClone(d);
-  for (const uid of Object.keys(copy.updateQueue)) {
-    if (uid in copy.members) {
-      const userUpdates = copy.updateQueue[uid];
-      if ("$REMOVE" in userUpdates) {
-        copy.updateQueue[uid] = { $REMOVE: userUpdates.$REMOVE };
-      } else if (userUpdates.$CHANGE_ROLES && userUpdates.$CHANGE_ROLES.newRoles.length === copy.members[uid].roles.length && userUpdates.$CHANGE_ROLES.newRoles.every(
-        (role) => copy.members[uid].roles.includes(role)
-      )) {
-        delete copy.updateQueue[uid].$CHANGE_ROLES;
+var RawCompanyStaff = z15.object({
+  ...MiniRawCompanyStaff.shape,
+  members: z15.record(CompanyUser.shape.uid, CompanyUser).superRefine(refineMembers)
+});
+var transformStaff = (object16) => {
+  return object16.transform((d) => {
+    const copy = structuredClone(d);
+    for (const uid of Object.keys(copy.updateQueue)) {
+      if (uid in copy.members) {
+        const userUpdates = copy.updateQueue[uid];
+        if ("$REMOVE" in userUpdates) {
+          copy.updateQueue[uid] = { $REMOVE: userUpdates.$REMOVE };
+        } else if (userUpdates.$CHANGE_ROLES && userUpdates.$CHANGE_ROLES.newRoles.length === copy.members[uid].roles.length && userUpdates.$CHANGE_ROLES.newRoles.every(
+          (role) => copy.members[uid].roles.includes(role)
+        )) {
+          delete copy.updateQueue[uid].$CHANGE_ROLES;
+        }
+        if (Object.keys(userUpdates).length < 1) delete copy.updateQueue[uid];
+      } else {
+        delete copy.updateQueue[uid];
       }
-      if (Object.keys(userUpdates).length < 1) delete copy.updateQueue[uid];
-    } else {
-      delete copy.updateQueue[uid];
     }
-  }
-  for (const [docUid, assts] of Object.entries(copy.partnerMap)) {
-    if (docUid in d.members) {
-      for (const asstUid of Object.keys(assts)) {
-        if (asstUid in d.members) continue;
-        delete copy.partnerMap[docUid][asstUid];
+    for (const [docUid, assts] of Object.entries(copy.partnerMap)) {
+      if (docUid in d.members) {
+        for (const asstUid of Object.keys(assts)) {
+          if (asstUid in d.members) continue;
+          delete copy.partnerMap[docUid][asstUid];
+        }
+      } else {
+        delete copy.partnerMap[docUid];
       }
-    } else {
-      delete copy.partnerMap[docUid];
     }
-  }
-  return copy;
-}).superRefine((details, ctx) => {
-  for (const user of Object.values(details.members)) {
-    if (user.roles.includes("doc") && user.uid in details.partnerMap) {
-      for (const asstUid of Object.keys(details.partnerMap[user.uid])) {
-        if (!details.members[asstUid].roles.includes("physAsst")) {
-          ctx.addIssue(
-            `A partner group member must have the "physAsst" role (${user.uid}) -> (${asstUid}).`
-          );
+    return copy;
+  }).superRefine((details, ctx) => {
+    for (const user of Object.values(details.members)) {
+      if (user.roles.includes("doc") && user.uid in details.partnerMap) {
+        for (const asstUid of Object.keys(details.partnerMap[user.uid])) {
+          if (!details.members[asstUid].roles.includes("physAsst")) {
+            ctx.addIssue(
+              `A partner group member must have the "physAsst" role (${user.uid}) -> (${asstUid}).`
+            );
+          }
         }
+      } else if (user.uid in details.partnerMap) {
+        ctx.addIssue(
+          `A partner group leader must have the "doc" role. (${user.uid})`
+        );
+      } else if (user.roles.includes("doc")) {
+        ctx.addIssue(
+          `All users that have the "doc" role must be the leader of a partner group. (${user.uid})`
+        );
+      }
+      if (!user.isBusy && user.uid in details.updateQueue) {
+        ctx.addIssue(
+          `Having users that aren't busy in the update queue is prohibited.`
+        );
       }
-    } else if (user.uid in details.partnerMap) {
-      ctx.addIssue(
-        `A partner group leader must have the "doc" role. (${user.uid})`
-      );
-    } else if (user.roles.includes("doc")) {
-      ctx.addIssue(
-        `All users that have the "doc" role must be the leader of a partner group. (${user.uid})`
-      );
-    }
-    if (!user.isBusy && user.uid in details.updateQueue) {
-      ctx.addIssue(
-        `Having users that aren't busy in the update queue is prohibited.`
-      );
     }
-  }
-});
+  });
+};
+var CompanyStaff = transformStaff(RawCompanyStaff);
+var MiniCompanyStaff = transformStaff(MiniRawCompanyStaff);
 var MutableCompanyStaff = RawCompanyStaff.pick({
   updateQueue: true,
   partnerMap: true
@@ -544,58 +533,68 @@ var CompanyInviteList = z17.record(
 );
 
 // src/schemas/appointment/components/Client.ts
-var ClientIdentity = UserDetails.omit({ notifications: true });
+import * as z18 from "zod";
+import { Address as Address2 } from "@wavy/util";
+var ClientIdentity = UserDetails.omit({
+  notifications: true,
+  publicKey: true
+}).safeExtend(
+  z18.object({
+    dob: Timestamp.optional(),
+    address: Address2.optional()
+  }).shape
+);
 
 // src/schemas/appointment/components/payload/Medical.ts
-import * as z18 from "zod";
-var Vitals = z18.record(
+import * as z19 from "zod";
+var Vitals = z19.record(
   vitalKeys,
-  z18.object({
-    value: z18.string().trim().regex(/^\d{0,3}((\/|\.)\d{1,3})?/),
+  z19.object({
+    value: z19.string().trim().regex(/^\d{0,3}((\/|\.)\d{1,3})?/),
     lastModified: Timestamp.nullable()
   })
 );
-var Medicine = z18.object({
-  brand: z18.string().trim(),
+var Medicine = z19.object({
+  brand: z19.string().trim(),
   expiresAt: Timestamp.nullish(),
-  quantity: z18.string().trim().regex(/^\d+(\.\d{1,3})? ?[a-zA-Z]{1,20}/, {
+  quantity: z19.string().trim().regex(/^\d+(\.\d{1,3})? ?[a-zA-Z]{1,20}/, {
     error: "Failed to match the pattern <number>+(.<number>{1,3})? ?[a-zA-Z]{1,20}"
   }),
-  refills: z18.string().trim().regex(/^[0-8]/, { error: "Must be between 0 and 8" }),
-  directions: z18.string().trim().max(100, { error: "Must be 100 characters or less" }),
+  refills: z19.string().trim().regex(/^[0-8]/, { error: "Must be between 0 and 8" }),
+  directions: z19.string().trim().max(100, { error: "Must be 100 characters or less" }),
   ...TimeLog.shape
 });
-var MedicalDetails = z18.object({
+var MedicalDetails = z19.object({
   vitals: Vitals,
-  prescriptions: z18.array(z18.array(Medicine)).nullish(),
-  doctorNote: z18.object({
-    value: z18.string(),
+  prescriptions: z19.array(z19.array(Medicine)).nullish(),
+  doctorNote: z19.object({
+    value: z19.string(),
     lastModified: Timestamp.nullable()
   }),
-  physAsstNotes: z18.array(
-    z18.object({
-      title: z18.string(),
-      content: z18.string(),
+  physAsstNotes: z19.array(
+    z19.object({
+      title: z19.string(),
+      content: z19.string(),
       ...TimeLog.shape
     })
   ).optional()
 });
 
 // src/schemas/appointment/Appointment.ts
-import * as z19 from "zod";
-var TimelineActivity = z19.object({
+import * as z20 from "zod";
+var TimelineActivity = z20.object({
   postedAt: Timestamp.nullish(),
   userUid: CompanyUser.shape.uid.nonoptional()
 });
-var MiniAppointmentDetails = z19.object({
+var MiniAppointmentDetails = z20.object({
   /** A random uid that identifies the document. */
-  _id: z19.uuidv4(),
+  _id: z20.uuidv4(),
   /** The company's uid */
   src: CompanyState.shape.uid,
   /** The ticket number */
   tkt: TicketNo,
   /**The reason for the service */
-  reason: z19.object({
+  reason: z20.object({
     value: Reason.shape.value,
     ...TimeLog.shape
   }).optional(),
@@ -607,24 +606,24 @@ var MiniAppointmentDetails = z19.object({
    */
   invoiceNo: InvoiceNo.optional(),
   /** The services that the client has done/will do. */
-  charges: z19.array(PriceTag.omit({ uid: true })).max(4),
+  charges: z20.array(PriceTag.omit({ uid: true })).max(4),
   /**Required to calculate the accurate grandTotal of the charges */
-  additionalFees: z19.array(PriceAdjustment).nullable().readonly(),
+  additionalFees: z20.array(PriceAdjustment).nullable().readonly(),
   /**Required to calculate the accurate grandTotal of the charges */
-  discounts: z19.array(PriceAdjustment).nullable().readonly(),
-  prepayments: z19.array(PriceAdjustment).nullable(),
+  discounts: z20.array(PriceAdjustment).nullable().readonly(),
+  prepayments: z20.array(PriceAdjustment).nullable(),
   /** The client's identity */
   clientUid: ClientIdentity.shape.uid,
   /**
    * Data that is specific to the entity (for now it's just medical data).
    * It will only be defined for the participants that have access to it.
    */
-  payload: z19.object({
+  payload: z20.object({
     ...MedicalDetails.shape,
-    lastModified: z19.number().nullable()
+    lastModified: z20.number().nullable()
   }).nullish(),
   /** Only defined when either the service provider or the client cancelled their appointment */
-  cancelled: z19.object({
+  cancelled: z20.object({
     /** The time that the confirm cancel button was clicked */
     doneAt: Timestamp,
     reason: Reason,
@@ -632,16 +631,16 @@ var MiniAppointmentDetails = z19.object({
   }).optional(),
   /** Add this after consulting with company owners about payment expectations */
   // paymentDueDate: Timestamp.nullish(),
-  payments: z19.array(
-    z19.object({
+  payments: z20.array(
+    z20.object({
       method: paymentMethods,
-      amount: z19.number().positive(),
+      amount: z20.number().positive(),
       ...TimeLog.shape
     })
   ).max(100).nullish(),
-  timeline: z19.object({
+  timeline: z20.object({
     scheduler: TimelineActivity,
-    physAsst: TimelineActivity.or(z19.literal("none")),
+    physAsst: TimelineActivity.or(z20.literal("none")),
     doctor: TimelineActivity,
     cashier: TimelineActivity.nullable()
   }),
@@ -649,17 +648,17 @@ var MiniAppointmentDetails = z19.object({
 });
 var AppointmentDetails = MiniAppointmentDetails.omit({
   clientUid: true
-}).extend(z19.object({ client: ClientIdentity }).shape);
+}).extend(z20.object({ client: ClientIdentity }).shape);
 var MutableAppointmentDetails = AppointmentDetails.safeExtend(
-  z19.object({
+  z20.object({
     /**
-     * @description An encrypted copy of the last state of the service.
-     * @note Used to accurately update the service without having to query the database
+     * @description An encrypted copy of the last state of the appointment.
+     * @note Used to accurately update the appointment without having to query the database
      */
-    _hash: z19.string()
+    _hash: z20.string()
   }).shape
 );
-var ScheduleAppointmentForm = z19.object({
+var ScheduleAppointmentForm = z20.object({
   clientUid: ClientIdentity.shape.uid,
   /** A nullish value === next_available */
   serviceProviderUid: CompanyUser.shape.uid.nullish(),
@@ -686,12 +685,13 @@ function findAvailableStaff(role, staff) {
 // src/functions/findNextAvailableStaff.ts
 function findNextAvailableStaff(userUids, algorithm, staff) {
   let nextAvailable = null;
-  if (userUids.length === 1) return userUids[0];
+  if (userUids.length <= 1) return userUids[0] ?? null;
   switch (algorithm) {
     case "RR": {
-      nextAvailable = userUids.find(
-        (uid) => staff.members[uid].appointments.ongoing < staff.members[userUids[0]].appointments.ongoing
-      ) || userUids[0];
+      nextAvailable = userUids.find((uid) => {
+        const calcTotalAppts = (appointments) => appointments.ongoing + appointments.completed;
+        return calcTotalAppts(staff.members[uid].appointments) < calcTotalAppts(staff.members[userUids[0]].appointments);
+      }) || userUids[0];
       break;
     }
     case "LOR": {
@@ -856,6 +856,7 @@ export {
   MedicalDetails,
   Medicine,
   MiniAppointmentDetails,
+  MiniCompanyUser2 as MiniCompanyUser,
   MutableAppointmentDetails,
   MutableCompanyBilling,
   MutableCompanyDetails,

package/package.json

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