@bizmap/sdk 0.0.106 → 0.0.108

package/dist/main.d.ts

@@ -45,12 +45,6 @@ declare const industries: z.ZodEnum<{
     healthcare: "healthcare";
 }>;
 type Industry = z.infer<typeof industries>;
-declare const companyUserStatus: z.ZodEnum<{
-    inviteSent: "inviteSent";
-    active: "active";
-    inactive: "inactive";
-}>;
-type CompanyUserStatus = z.infer<typeof companyUserStatus>;
 
 declare const tiers: z.ZodEnum<{
     basic: "basic";
@@ -239,15 +233,9 @@ declare const CompanyDetails: z.ZodObject<{
         lastModified: z.ZodNullable<z.ZodISODateTime>;
         version: z.ZodInt;
         members: z.ZodRecord<z.ZodUUID, z.ZodObject<{
-            inviteSent: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
             lastModified: z.ZodNullable<z.ZodISODateTime>;
             email: z.ZodEmail;
             name: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
-            status: z.ZodEnum<{
-                inviteSent: "inviteSent";
-                active: "active";
-                inactive: "inactive";
-            }>;
             isBusy: z.ZodObject<{
                 value: z.ZodBoolean;
                 lastModified: z.ZodNullable<z.ZodISODateTime>;
@@ -261,8 +249,10 @@ declare const CompanyDetails: z.ZodObject<{
                 "a/r": "a/r";
                 founder: "founder";
             }>>, z.ZodTransform<("doc" | "physAsst" | "rcpst" | "cshr" | "a/r" | "founder")[], ("doc" | "physAsst" | "rcpst" | "cshr" | "a/r" | "founder")[]>>;
-            lastActive: z.ZodNullable<z.ZodISODateTime>;
+            lastOnline: z.ZodNullable<z.ZodISODateTime>;
+            inviteSent: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
             inviteAccepted: z.ZodNullable<z.ZodISODateTime>;
+            isOnline: z.ZodBoolean;
         }, z.core.$strip>>;
         partnerMap: z.ZodRecord<z.ZodUUID, z.ZodRecord<z.ZodUUID, z.ZodObject<{
             addedAt: z.ZodISODateTime;
@@ -615,15 +605,9 @@ type MutableCompanyPreferences = z.infer<typeof MutableCompanyPreferences>;
 
 declare const CompanyStaff: z.ZodObject<{
     members: z.ZodRecord<z.ZodUUID, z.ZodObject<{
-        inviteSent: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         lastModified: z.ZodNullable<z.ZodISODateTime>;
         email: z.ZodEmail;
         name: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
-        status: z.ZodEnum<{
-            inviteSent: "inviteSent";
-            active: "active";
-            inactive: "inactive";
-        }>;
         isBusy: z.ZodObject<{
             value: z.ZodBoolean;
             lastModified: z.ZodNullable<z.ZodISODateTime>;
@@ -637,8 +621,10 @@ declare const CompanyStaff: z.ZodObject<{
             "a/r": "a/r";
             founder: "founder";
         }>>, z.ZodTransform<("doc" | "physAsst" | "rcpst" | "cshr" | "a/r" | "founder")[], ("doc" | "physAsst" | "rcpst" | "cshr" | "a/r" | "founder")[]>>;
-        lastActive: z.ZodNullable<z.ZodISODateTime>;
+        lastOnline: z.ZodNullable<z.ZodISODateTime>;
+        inviteSent: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
         inviteAccepted: z.ZodNullable<z.ZodISODateTime>;
+        isOnline: z.ZodBoolean;
     }, z.core.$strip>>;
     _id: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
     partnerMap: z.ZodRecord<z.ZodUUID, z.ZodRecord<z.ZodUUID, z.ZodObject<{
@@ -722,7 +708,7 @@ declare const CompanyUserSession: z.ZodObject<{
 }, z.core.$strip>;
 type CompanyUserSession = z.infer<typeof CompanyUserSession>;
 declare const MiniCompanyUser: z.ZodObject<{
-    lastActive: z.ZodNullable<z.ZodISODateTime>;
+    lastOnline: z.ZodNullable<z.ZodISODateTime>;
     inviteSent: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
     inviteAccepted: z.ZodNullable<z.ZodISODateTime>;
     lastModified: z.ZodNullable<z.ZodISODateTime>;
@@ -743,15 +729,11 @@ declare const MiniCompanyUser: z.ZodObject<{
 }, z.core.$strip>;
 type MiniCompanyUser = z.infer<typeof MiniCompanyUser>;
 declare const CompanyUser: z.ZodObject<{
-    status: z.ZodEnum<{
-        inviteSent: "inviteSent";
-        active: "active";
-        inactive: "inactive";
-    }>;
+    isOnline: z.ZodBoolean;
     _id: z.ZodUUID;
     email: z.ZodEmail;
     name: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
-    lastActive: z.ZodNullable<z.ZodISODateTime>;
+    lastOnline: z.ZodNullable<z.ZodISODateTime>;
     inviteSent: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
     inviteAccepted: z.ZodNullable<z.ZodISODateTime>;
     lastModified: z.ZodNullable<z.ZodISODateTime>;
@@ -1688,15 +1670,15 @@ declare function scheduleAppointment(request: RequestParameter): Promise<{
                 lastModified: string | null;
                 email: string;
                 name: string;
-                status: "inviteSent" | "active" | "inactive";
                 isBusy: {
                     value: boolean;
                     lastModified: string | null;
                 };
                 appointments: Record<"ongoing" | "completed", number>;
                 roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "a/r" | "founder")[];
-                lastActive: string | null;
+                lastOnline: string | null;
                 inviteAccepted: string | null;
+                isOnline: boolean;
                 inviteSent?: string | null | undefined;
             }>;
             _id: string;
@@ -1897,11 +1879,11 @@ declare function findNextAvailableStaff(userUids: string[], algorithm: CompanyPr
  * @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)[]) => ({
-    status: "inviteSent" | "active" | "inactive";
+    isOnline: boolean;
     _id: string;
     email: string;
     name: string;
-    lastActive: string | null;
+    lastOnline: string | null;
     inviteAccepted: string | null;
     lastModified: string | null;
     isBusy: {
@@ -1912,7 +1894,7 @@ declare const findConflictingPartners: (...partners: (CompanyUser | MiniCompanyU
     roles: ("doc" | "physAsst" | "rcpst" | "cshr" | "a/r" | "founder")[];
     inviteSent?: string | null | undefined;
 } | {
-    lastActive: string | null;
+    lastOnline: string | null;
     inviteAccepted: string | null;
     lastModified: string | null;
     isBusy: {
@@ -1929,6 +1911,7 @@ declare const findConflictingPartners: (...partners: (CompanyUser | MiniCompanyU
  * @returns {CompanyUserRole[]} The roles that are compatible with the selected role.
  * */
 declare const getCompatibleRoles: (role: CompanyUserRole) => CompanyUserRole[];
+declare const getIncompatibleRoles: (role: CompanyUserRole) => CompanyUserRole[];
 declare const normalizeCompanyId: (id: string) => string;
 declare const normalizeNidKey: (value: keyof NonNullable<ClientIdentity["nid"]>) => string;
 declare const parseClientName: ({ firstName, middleName, lastName, }: Pick<ClientIdentity, "firstName" | "middleName" | "lastName">) => string;
@@ -1938,4 +1921,4 @@ declare function createNotifId(options?: {
     to: string;
 }): string;
 
-export { type AcceptedCurrency, AlphaNumeric, AppointmentDetails, type AppointmentDistAlg, AppointmentSeverity, ClientForm, ClientIdentity, CompanyBilling, CompanyDetails, CompanyIdentity, CompanyInviteList, CompanyNotifications, type CompanyPartnerRole, CompanyPreferences, type CompanyServiceSelector, CompanyStaff, CompanyState, CompanyUser, type CompanyUserRole, CompanyUserSession, type CompanyUserStatus, CreateCompanyForm, CreditCurrency, type EmployeeRole, type Gender, type HealthcareProviderRole, type Industry, InviteResponse, InvoiceNo, MAX_COMPANY_PRICE_MODS, MedicalDetails, Medicine, MiniAppointmentDetails, MiniCompanyUser, MutableAppointmentDetails, MutableCompanyBilling, MutableCompanyDetails, MutableCompanyIdentity, MutableCompanyPreferences, Notification, PaymentDetails, type PaymentMethod, PriceMod, PriceModList, PriceTag, Reason, Receipts, ScheduleAppointmentForm, StandardTime, TicketNo, type Tier, TierList, TimeLog, Timestamp, Trn, UserDetails, Version, Vitals, acceptedCurrencies, adminRoles, appointmentDistAlgs, calcBalance, calcPriceMod, companyPartnerRoles, companyServiceSelectors, companyUserRoles, companyUserStatus, createNotifId, employeeRoles, findAvailableStaff, findConflictingPartners, findNextAvailableStaff, genders, getCompatibleRoles, healthcareProviderRoles, industries, normalizeCompanyId, normalizeNidKey, parseClientName, paymentMethods, scheduleAppointment, serviceProviders, tiers, vitalKeys };
+export { type AcceptedCurrency, AlphaNumeric, AppointmentDetails, type AppointmentDistAlg, AppointmentSeverity, ClientForm, ClientIdentity, CompanyBilling, CompanyDetails, CompanyIdentity, CompanyInviteList, CompanyNotifications, type CompanyPartnerRole, CompanyPreferences, type CompanyServiceSelector, CompanyStaff, CompanyState, CompanyUser, type CompanyUserRole, CompanyUserSession, CreateCompanyForm, CreditCurrency, type EmployeeRole, type Gender, type HealthcareProviderRole, type Industry, InviteResponse, InvoiceNo, MAX_COMPANY_PRICE_MODS, MedicalDetails, Medicine, MiniAppointmentDetails, MiniCompanyUser, MutableAppointmentDetails, MutableCompanyBilling, MutableCompanyDetails, MutableCompanyIdentity, MutableCompanyPreferences, Notification, PaymentDetails, type PaymentMethod, PriceMod, PriceModList, PriceTag, Reason, Receipts, ScheduleAppointmentForm, StandardTime, TicketNo, type Tier, TierList, TimeLog, Timestamp, Trn, UserDetails, Version, Vitals, acceptedCurrencies, adminRoles, appointmentDistAlgs, calcBalance, calcPriceMod, companyPartnerRoles, companyServiceSelectors, companyUserRoles, createNotifId, employeeRoles, findAvailableStaff, findConflictingPartners, findNextAvailableStaff, genders, getCompatibleRoles, getIncompatibleRoles, healthcareProviderRoles, industries, normalizeCompanyId, normalizeNidKey, parseClientName, paymentMethods, scheduleAppointment, serviceProviders, tiers, vitalKeys };

package/dist/main.js

@@ -25,7 +25,6 @@ var industries = z.enum([
   "healthcare"
   // "Pharmaceutical",
 ]);
-var companyUserStatus = z.enum(["inviteSent", "active", "inactive"]);
 
 // src/enums/Global.ts
 import { currencies } from "@wavy/util";
@@ -536,6 +535,10 @@ var getCompatibleRoles = (role) => {
   }
   return companyUserRoles.exclude([role]).options;
 };
+var getIncompatibleRoles = (role) => {
+  const compatibleRoles = getCompatibleRoles(role);
+  return companyUserRoles.options.filter((r) => !compatibleRoles.includes(r) && r !== role);
+};
 var normalizeCompanyId = (id) => {
   return id.split("-").map((value) => upperFirst2(value.toLowerCase())).join(" ");
 };
@@ -573,8 +576,8 @@ var CompanyUserSession = z15.object({
     }
     return newRoles.sort();
   }).refine((roles) => {
-    return roles.every(
-      (role, i) => i === 0 || getCompatibleRoles(roles[0]).includes(role)
+    return !roles.find(
+      (role) => getIncompatibleRoles(role).some((r) => roles.includes(r))
     );
   }, "A user is not allowed to have conflicting roles."),
   ttl: z15.number(),
@@ -591,18 +594,16 @@ var MiniCompanyUser2 = z15.object({
     appointments: true
   }).shape,
   /** The time before the company session gets deleted */
-  lastActive: Timestamp.nullable(),
+  lastOnline: Timestamp.nullable(),
   inviteSent: Timestamp.nullish(),
   inviteAccepted: Timestamp.nullable()
 });
 var CompanyUser = z15.object({
   ...MiniCompanyUser2.shape,
   ...CompanyUserSession.shape.user.shape,
-  // Determined based on:
-  //  [1] where the data was retrieved from (if it is from the session pool then status === "active")
-  //  [2] user's roles
-  //  [3] inviteSent timestamp (if it )
-  status: companyUserStatus
+  // Only true when the user's data is retrieved from the session pool
+  // NB: This property is purely cosmetic (so need to store this on the server)
+  isOnline: z15.boolean()
 });
 
 // src/schemas/company/components/Staff.ts
@@ -926,7 +927,7 @@ function findAvailableStaff(role, staff) {
   return Object.keys(role === "doc" ? staff.partnerMap : staff.members).filter(
     (uid) => {
       const user = staff.members[uid];
-      return !(uid in staff.updateQueue) && user.roles.includes(role) && user.status === "active";
+      return !(uid in staff.updateQueue) && user.roles.includes(role) && user.isOnline;
     }
   );
 }
@@ -1170,7 +1171,6 @@ export {
   companyPartnerRoles,
   companyServiceSelectors,
   companyUserRoles,
-  companyUserStatus,
   createNotifId,
   employeeRoles,
   findAvailableStaff,
@@ -1178,6 +1178,7 @@ export {
   findNextAvailableStaff,
   genders,
   getCompatibleRoles,
+  getIncompatibleRoles,
   healthcareProviderRoles,
   industries,
   normalizeCompanyId,

package/package.json

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