@blazeo.com/appointment-client 1.0.11 → 1.0.14

package/src/calendar/mapToDesiredResponse.ts

@@ -24,22 +24,33 @@ export function mapToDesiredCalendarResponse(payload: any, openingHours: any[] =
   }));
 
   // Map opening hours with typename and raw fields
-  const mappedOpeningHours = openingHours.map(oh => ({
-    id: pick(oh, "id", "Id") ?? 0,
-    createdOn: pick(oh, "createdOn", "CreatedOn", "created_on") ?? "0001-01-01T00:00:00.000Z",
-    modifiedOn: pick(oh, "modifiedOn", "ModifiedOn", "modified_on") ?? "0001-01-01T00:00:00.000Z",
-    member: pick(oh, "member", "Member"),
-    openingHourId: pick(oh, "openingHourId", "OpeningHourId", "opening_hour_id") ?? "",
-    calendarId: pick(oh, "calendarId", "CalendarId", "calendar_id") ?? "",
-    participantId: pick(oh, "participantId", "ParticipantId", "participant_id") ?? "",
-    days: oh.days ?? [],
-    startHour: oh.startHour ?? pick(oh, "startHour", "StartHour") ?? 0,
-    startMinute: oh.startMinute ?? pick(oh, "startMinute", "StartMinute") ?? 0,
-    endHour: oh.endHour ?? pick(oh, "endHour", "EndHour") ?? 0,
-    endMinute: oh.endMinute ?? pick(oh, "endMinute", "EndMinute") ?? 0,
-    off: !!(oh.off ?? pick(oh, "off", "Off")),
-    __typename: "OpeningHour"
-  }));
+  const mappedOpeningHours = openingHours.map(oh => {
+    // If it's already a unified object (has day/start/end), preserve it but ensure __typename
+    if (oh.day !== undefined && oh.start !== undefined && oh.end !== undefined) {
+      return {
+        ...oh,
+        __typename: "OpeningHour"
+      };
+    }
+
+    // Otherwise, map from raw PascalCase or camelCase
+    return {
+      id: pick(oh, "id", "Id") ?? 0,
+      createdOn: pick(oh, "createdOn", "CreatedOn", "created_on") ?? "0001-01-01T00:00:00.000Z",
+      modifiedOn: pick(oh, "modifiedOn", "ModifiedOn", "modified_on") ?? "0001-01-01T00:00:00.000Z",
+      member: pick(oh, "member", "Member"),
+      openingHourId: pick(oh, "openingHourId", "OpeningHourId", "opening_hour_id") ?? "",
+      calendarId: pick(oh, "calendarId", "CalendarId", "calendar_id") ?? "",
+      participantId: pick(oh, "participantId", "ParticipantId", "participant_id") ?? "",
+      days: oh.days ?? [],
+      startHour: oh.startHour ?? pick(oh, "startHour", "StartHour") ?? 0,
+      startMinute: oh.startMinute ?? pick(oh, "startMinute", "StartMinute") ?? 0,
+      endHour: oh.endHour ?? pick(oh, "endHour", "EndHour") ?? 0,
+      endMinute: oh.endMinute ?? pick(oh, "endMinute", "EndMinute") ?? 0,
+      off: !!(oh.off ?? pick(oh, "off", "Off")),
+      __typename: "OpeningHour"
+    };
+  });
 
   // Map theme
   const rawTheme = pick(payload, "theme", "Theme");
@@ -68,6 +79,8 @@ export function mapToDesiredCalendarResponse(payload: any, openingHours: any[] =
     __typename: "ReminderChannelStatus"
   })) : [];
 
+  const uuid = pick(payload, "uuid", "Uuid", "calendarId", "CalendarId");
+
   return {
     id: n(pick(payload, "id", "Id")),
     durationUnit: n(pick(payload, "durationUnit", "DurationUnit")),
@@ -80,7 +93,8 @@ export function mapToDesiredCalendarResponse(payload: any, openingHours: any[] =
     bufferTime: n(pick(payload, "bufferTime", "BufferTime")),
     bufferTimeUnit: n(pick(payload, "bufferTimeUnit", "BufferTimeUnit")),
     calendarLink: pick(payload, "calendarLink", "CalendarLink"),
-    uuid: pick(payload, "uuid", "Uuid", "calendarId", "CalendarId"),
+    uuid: uuid,
+    calendarId: uuid, // Explicit alias requested by user
     location: pick(payload, "location", "Location") ?? "",
     bookingPageTitle: pick(payload, "bookingPageTitle", "BookingPageTitle") ?? null,
     reminderChannelStatuses,

package/src/events/getAppointmentsByFilter.ts

@@ -0,0 +1,98 @@
+import { EventModel, LeadModel } from "@blazeo.com/calendar-client";
+import { getCalendarsByCompany } from "../calendar/getCalendarsByCompany.js";
+import moment from "moment";
+
+/**
+ * High-level method to fetch appointments with enriched mapping.
+ * Resolves names for organizers and calendars, and attempts to resolve missing leadIds.
+ */
+export async function getAppointmentsByFilter(
+  companyKey: string,
+  startDateFrom: string,
+  startDateTo: string,
+  opts: any = {}
+) {
+  // 1. Fetch raw events
+  // Cast to any because getByDateRangeWithFilters is missing from some .d.ts versions but present in .js
+  const response: any = await (EventModel as any).getByDateRangeWithFilters(
+    companyKey,
+    startDateFrom,
+    startDateTo,
+    opts
+  );
+
+  const events = response?.events || [];
+  const totalCount = response?.totalCount || 0;
+
+  if (events.length === 0) {
+    return { events: [], totalCount: 0 };
+  }
+
+  // 2. Fetch company data for name resolution (Calendars & Participants)
+  const enrichedCalendars = await getCalendarsByCompany(companyKey);
+  
+  const calendarMap = new Map<string, string>();
+  const participantMap = new Map<string, string>();
+
+  enrichedCalendars.forEach((cal: any) => {
+    calendarMap.set(cal.calendarId, cal.name);
+    if (Array.isArray(cal.members)) {
+      cal.members.forEach((m: any) => {
+        participantMap.set(m.id, m.name);
+      });
+    }
+  });
+
+  // 3. Map events to the desired response schema
+  const mappedEvents = await Promise.all(
+    events.map(async (event: any) => {
+      // Resolve leadId if missing
+      // Note: event properties might be uppercase depending on API version, mapEventFromApi usually handles this
+      // but let's be defensive.
+      const rawEvent = (event as any)._raw || event;
+      let resolvedLeadId = event.leadId ?? rawEvent.lead_id ?? opts.leadId ?? null;
+      
+      if (!resolvedLeadId && event.visitorEmail) {
+        try {
+          const lead: any = await LeadModel.getByEmail(event.visitorEmail, companyKey);
+          if (lead) {
+            resolvedLeadId = lead.leadId;
+          }
+        } catch (err) {
+          console.warn(`[getAppointmentsByFilter] Failed to resolve lead for ${event.visitorEmail}:`, err);
+        }
+      }
+
+      const calendarId = event.calendarId;
+      const participantId = event.participantId;
+
+      return {
+        id: event.eventId, // UUID as per feedback
+        appointmentId: event.eventId,
+        title: event.title || "Appointment",
+        organizer: participantMap.get(participantId) || "Member",
+        guest: event.visitorName || "Guest",
+        serviceType: calendarMap.get(calendarId) || "Calendar",
+        status: event.attendeeStatus ?? 1,
+        calendarId: calendarId, // UUID
+        memberId: participantId, // UUID
+        participantId: participantId, // UUID
+        leadId: resolvedLeadId,
+        notes: event.description || "",
+        startDate: event.startDate ? moment(event.startDate).toISOString() : null,
+        endDate: event.endDate ? moment(event.endDate).toISOString() : null,
+        timeZone: event.timeZone || "Pakistan Standard Time",
+        meetingLocationType: 1,
+        customMeetingLocation: null,
+        __typename: "Appointment",
+        // Keep raw fields for potential fallback or reference
+        _raw: event
+      };
+    })
+  );
+
+  return {
+    events: mappedEvents,
+    totalCount
+  };
+}

package/src/index.ts

@@ -9,9 +9,14 @@ export { ensureBlazeoHttpReady } from "./config/ensureBlazeoHttpReady.js";
 export type { EnsureBlazeoHttpOptions } from "./config/ensureBlazeoHttpReady.js";
 export { blazeoClientConfig } from "./config/blazeoClientDefaults.js";
 export { applyBlazeoClientConfig } from "./config/applyBlazeoDefaults.js";
-export { createCalendarRoot, CalendarRootModel, CalendarSlotModel, EventModel, ParticipantModel } from "./models/CalendarRootModel.js";
-export { fetchCalendarDetails, fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
-export { getCalendarsByCompany } from "./calendar/getCalendarsByCompany.js";
+export { 
+  createCalendarRoot, 
+  CalendarRootModel, 
+  CalendarSlotModel, 
+  EventModel as MSTEventModel, 
+  ParticipantModel as MSTParticipantModel 
+} from "./models/CalendarRootModel.js";
+export { fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
 export {
   buildUnifiedCalendarView,
   type UnifiedCalendarMember,
@@ -33,35 +38,39 @@ export { addParticipantToCalendar, removeParticipantFromCalendar, saveCalendarOp
 export { createAppointmentEventAsync, rescheduleAppointmentEventAsync, cancelAppointmentEventAsync } from "./events/appointmentEventFacade.js";
 export { mapAppointmentToEventSnapshot } from "./events/mapAppointmentToEventSnapshot.js";
 
-import { fetchCalendarDetails, fetchCalendarBundle } from "./calendar/fetchCalendarDetails.js";
-import { fetchCalendarWithOpeningHours } from "./calendar/fetchCalendarWithOpeningHours.js";
 import { getCalendarsByCompany } from "./calendar/getCalendarsByCompany.js";
+import { fetchCalendarDetails } from "./calendar/fetchCalendarDetails.js";
+import { getAppointmentsByFilter } from "./events/getAppointmentsByFilter.js";
+export { getCalendarsByCompany, fetchCalendarDetails, getAppointmentsByFilter };
 
 import { 
   CalendarModel as CoreCalendarModel, 
   EventModel as CoreEventModel, 
   ParticipantModel as CoreParticipantModel, 
   CalendarParticipantModel as CoreCalendarParticipantModel,
+  LeadModel as CoreLeadModel,
   configure, 
   getConfig 
 } from "@blazeo.com/calendar-client";
 
-// Attach new methods to CalendarModel for easier access
-(CoreCalendarModel as any).fetchCalendarDetails = fetchCalendarDetails;
-(CoreCalendarModel as any).fetchCalendarBundle = fetchCalendarBundle;
-(CoreCalendarModel as any).fetchCalendarWithOpeningHours = fetchCalendarWithOpeningHours;
-(CoreCalendarModel as any).getCalendarsByCompany = getCalendarsByCompany;
+// Enriched CalendarModel
+export const CalendarModel = {
+  ...CoreCalendarModel,
+  getCalendarsByCompany,
+  fetchCalendarDetails
+};
 
 export { 
-  CoreCalendarModel as CalendarModel, 
-  CoreEventModel as CoreEventModel, 
-  CoreParticipantModel as CoreParticipantModel, 
+  CoreEventModel as EventModel, 
+  CoreParticipantModel as ParticipantModel, 
   CoreCalendarParticipantModel as CalendarParticipantModel,
+  CoreLeadModel as LeadModel,
+  CoreEventModel,
+  CoreParticipantModel,
   configure, 
   getConfig 
 };
 
-
 export const packageName = "@blazeo.com/appointment-client";
 
 export class CalendarClient {

package/src/lead/fetchLeadDetails.ts

@@ -0,0 +1,106 @@
+import { LeadModel } from "@blazeo.com/calendar-client";
+import { getSnapshot, isStateTreeNode } from "mobx-state-tree";
+import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.js";
+
+export type BlazeoLeadConnection = {
+  baseUrl?: string;
+  consumer?: string;
+};
+
+/** Paging / sort options forwarded to `LeadModel.getByCompany` → `GET /lead/company/get`. */
+export type LeadsByCompanyListOpts = {
+  skip?: number;
+  take?: number;
+  sortBy?: string;
+  sortOrder?: "ASC" | "DESC" | "asc" | "desc" | string;
+  sort?: string;
+  sort_column?: string;
+  sort_dir?: "asc" | "desc" | string;
+  page?: number;
+  page_size?: number;
+  searchColumn?: string;
+  search_column?: string;
+  searchText?: string;
+  search_text?: string;
+  search?: string;
+};
+
+function leadToPlain(lead: unknown): Record<string, unknown> | null {
+  if (lead == null) return null;
+  if (isStateTreeNode(lead)) {
+    return getSnapshot(lead) as Record<string, unknown>;
+  }
+  if (typeof lead === "object") return lead as Record<string, unknown>;
+  return null;
+}
+
+function leadsToPlain(list: unknown[] | null): Record<string, unknown>[] {
+  if (!Array.isArray(list)) return [];
+  return list.map((x) => leadToPlain(x)).filter((x): x is Record<string, unknown> => x != null);
+}
+
+/**
+ * Lead by id: `LeadModel.getRaw` / `get` → `GET /lead/get?lead_id=…`.
+ * Returns the mapped MST snapshot when successful, plus the raw API envelope from `getRaw`.
+ */
+export async function fetchLeadDetails(
+  leadId: string,
+  connection: BlazeoLeadConnection = {}
+): Promise<
+  | { ok: true; lead: Record<string, unknown> | null; rawGet: unknown }
+  | { ok: false; reason: "missing_base_url"; detail: string }
+> {
+  const ready = ensureBlazeoHttpReady(connection);
+  if (!ready.ok) {
+    return { ok: false, reason: "missing_base_url", detail: ready.error };
+  }
+  const id = String(leadId ?? "").trim();
+  if (!id) {
+    return {
+      ok: true,
+      lead: null,
+      rawGet: { status: "failure", message: "leadId is empty" },
+    };
+  }
+  const rawGet = await LeadModel.getRaw(id);
+  const model = await LeadModel.get(id);
+  return { ok: true, lead: leadToPlain(model), rawGet };
+}
+
+/**
+ * Single lead by email + company: `GET /lead/getbyemail`.
+ */
+export async function fetchLeadByEmail(
+  email: string,
+  companyKey: string,
+  connection: BlazeoLeadConnection = {}
+): Promise<
+  | { ok: true; lead: Record<string, unknown> | null }
+  | { ok: false; reason: "missing_base_url"; detail: string }
+> {
+  const ready = ensureBlazeoHttpReady(connection);
+  if (!ready.ok) {
+    return { ok: false, reason: "missing_base_url", detail: ready.error };
+  }
+  const model = await LeadModel.getByEmail(String(email).trim(), String(companyKey).trim());
+  return { ok: true, lead: leadToPlain(model) };
+}
+
+/**
+ * Paged list: `LeadModel.getByCompany` → `GET /lead/company/get`.
+ */
+export async function fetchLeadsByCompany(
+  companyKey: string,
+  listOpts: LeadsByCompanyListOpts = {},
+  connection: BlazeoLeadConnection = {}
+): Promise<
+  | { ok: true; leads: Record<string, unknown>[] }
+  | { ok: false; reason: "missing_base_url"; detail: string }
+> {
+  const ready = ensureBlazeoHttpReady(connection);
+  if (!ready.ok) {
+    return { ok: false, reason: "missing_base_url", detail: ready.error };
+  }
+  const models = await LeadModel.getByCompany(String(companyKey).trim(), listOpts);
+  return { ok: true, leads: leadsToPlain(models ?? []) };
+}

package/dist/calendar/blazeoCalendarRelationMethods.d.ts

@@ -1,8 +0,0 @@
-/** `GET /Calendar/Participant/Add` — attach `participantId` to this calendar. */
-export declare function addParticipantToCalendar(calendar: any, participantId: string): any;
-/** `GET /Calendar/Participant/Remove` */
-export declare function removeParticipantFromCalendar(calendar: any, participantId: string): any;
-/** `POST /Calendar/Participant/Availability/OpeningHour/Save` — one day/slot. */
-export declare function saveCalendarOpeningHour(calendar: any, payload: any): any;
-/** `POST /Calendar/Participant/Availability/OpeningHours/Save` — batch body (API-specific shape). */
-export declare function saveCalendarOpeningHoursBatch(calendar: any, payload: any): any;

package/dist/calendar/blazeoCalendarRelationMethods.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"blazeoCalendarRelationMethods.d.ts","sourceRoot":"","sources":["../../src/calendar/blazeoCalendarRelationMethods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,cAAc,GAAG;IACxD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC/E,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAClF,eAAe,CACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC3C,gBAAgB,CACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,GAC3C,OAAO,CAAC,8BAA8B,CAAC,CAAC;CAC5C,CAAC;AAEF,iFAAiF;AACjF,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,0BAA0B,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,8BAA8B,CAAC,CAEzC;AAED,yCAAyC;AACzC,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,0BAA0B,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,8BAA8B,CAAC,CAEzC;AAED,iFAAiF;AACjF,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,0BAA0B,EACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,8BAA8B,CAAC,CAEzC;AAED,qGAAqG;AACrG,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,0BAA0B,EACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,GAC3C,OAAO,CAAC,8BAA8B,CAAC,CAEzC"}

package/dist/calendar/blazeoCalendarRelationMethods.js

@@ -1,16 +0,0 @@
-/** `GET /Calendar/Participant/Add` — attach `participantId` to this calendar. */
-export function addParticipantToCalendar(calendar, participantId) {
-    return calendar.addParticipant(participantId);
-}
-/** `GET /Calendar/Participant/Remove` */
-export function removeParticipantFromCalendar(calendar, participantId) {
-    return calendar.removeParticipant(participantId);
-}
-/** `POST /Calendar/Participant/Availability/OpeningHour/Save` — one day/slot. */
-export function saveCalendarOpeningHour(calendar, payload) {
-    return calendar.saveOpeningHour(payload);
-}
-/** `POST /Calendar/Participant/Availability/OpeningHours/Save` — batch body (API-specific shape). */
-export function saveCalendarOpeningHoursBatch(calendar, payload) {
-    return calendar.saveOpeningHours(payload);
-}

package/dist/calendar/blazeoCalendarRelationMethods.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"blazeoCalendarRelationMethods.js","sourceRoot":"","sources":["../../src/calendar/blazeoCalendarRelationMethods.ts"],"names":[],"mappings":"AAsCA,iFAAiF;AACjF,MAAM,UAAU,wBAAwB,CACtC,QAAoC,EACpC,aAAqB;IAErB,OAAO,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;AAChD,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,6BAA6B,CAC3C,QAAoC,EACpC,aAAqB;IAErB,OAAO,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;AACnD,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,uBAAuB,CACrC,QAAoC,EACpC,OAAgC;IAEhC,OAAO,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,6BAA6B,CAC3C,QAAoC,EACpC,OAA4C;IAE5C,OAAO,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC"}

package/dist/calendar/buildUnifiedCalendarView.d.ts

@@ -1,39 +0,0 @@
-export interface UnifiedCalendarMember {
-    id: number | string;
-    name: string;
-    email: string | null;
-    /** When API exposes status; otherwise derived from participant info flags. */
-    status: number | null;
-    /** Full row from Participants/GetInfo (plain object). */
-    participantInfo?: Record<string, unknown> | null;
-    __typename?: string;
-}
-export interface UnifiedParticipantWithHours extends UnifiedCalendarMember {
-    openingHours: UnifiedOpeningHourRow[];
-}
-export interface UnifiedOpeningHourRow {
-    id?: number | string;
-    createdOn?: string;
-    modifiedOn?: string;
-    member: number | string;
-    openingHourId?: string;
-    calendarId?: string;
-    participantId?: string;
-    days: string[];
-    startHour: number;
-    startMinute: number;
-    endHour: number;
-    endMinute: number;
-    off: boolean;
-    __typename?: string;
-}
-export type UnifiedCalendarView = Record<string, unknown> & {
-    members: UnifiedCalendarMember[];
-    openingHours: UnifiedOpeningHourRow[];
-    participants?: UnifiedParticipantWithHours[];
-};
-/**
- * Build a consumer-friendly `{ id, name, members, openingHours }` shape where
- * `openingHours[].member` references `members[].id`.
- */
-export declare function buildUnifiedCalendarView(calendarSnapshot: Record<string, any> | null, openingHoursRows: any[], participants: any[] | null | undefined, participantsInfo: any[] | null | undefined): UnifiedCalendarView | null;