@blazeo.com/appointment-client 1.0.11 → 1.0.13

package/dist/calendar/fetchCalendarDetails.js

@@ -224,9 +224,12 @@ export async function fetchCalendarDetails(calendarId, options = {}) {
         allParticipantOpeningHours.length > 0;
     if (!calendarView)
         return null;
+    // Use the mapper to normalize the final output, ensuring all fields like duration, 
+    // bookingPageTitle, calendarId, etc. are correctly picked and named.
+    const finalView = mapToDesiredCalendarResponse(payload, calendarView.openingHours, calendarView.members);
     // Attach metadata as non-enumerable properties so they don't show up in JSON.stringify
     // but are still accessible for debugging if needed.
-    Object.defineProperties(calendarView, {
+    Object.defineProperties(finalView, {
         _cal: { value: cal, enumerable: false },
         _participants: { value: participantList, enumerable: false },
         _openingHours: { value: openingHours, enumerable: false },
@@ -241,7 +244,7 @@ export async function fetchCalendarDetails(calendarId, options = {}) {
             enumerable: false
         },
     });
-    return calendarView;
+    return finalView;
 }
 /**
  * Single return value only: unified calendar **`calendarView`** —

package/dist/calendar/getCalendarsByCompany.d.ts

@@ -1,7 +1,7 @@
 /**
  * Fetches all calendars for a company and populates each with its members (participants).
- * Fetches both Participant List and Participant Info to ensure names and emails are included,
- * while still skipping heavy data like opening hours.
+ * Uses a highly optimized single-request approach per calendar to ensure speed in list views.
+ * Results are normalized via mapToDesiredCalendarResponse.
  */
 export declare function getCalendarsByCompany(companyKey: string, connection?: {
     baseUrl?: string;

package/dist/calendar/getCalendarsByCompany.js

@@ -1,9 +1,10 @@
 import { CalendarModel, CalendarParticipantModel } from "@blazeo.com/calendar-client";
 import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.js";
+import { mapToDesiredCalendarResponse } from "./mapToDesiredResponse.js";
 /**
  * Fetches all calendars for a company and populates each with its members (participants).
- * Fetches both Participant List and Participant Info to ensure names and emails are included,
- * while still skipping heavy data like opening hours.
+ * Uses a highly optimized single-request approach per calendar to ensure speed in list views.
+ * Results are normalized via mapToDesiredCalendarResponse.
  */
 export async function getCalendarsByCompany(companyKey, connection = {}) {
     const ready = ensureBlazeoHttpReady(connection);
@@ -22,86 +23,40 @@ export async function getCalendarsByCompany(companyKey, connection = {}) {
         if (!calendarId)
             return null;
         try {
-            // We need both List and Info to get the names/emails
-            const [partsRaw, infoRaw] = await Promise.all([
-                CalendarParticipantModel.getByCalendar(calendarId),
-                CalendarParticipantModel.getInfoByCalendar(calendarId)
-            ]);
-            const parts = Array.isArray(partsRaw) ? partsRaw : partsRaw?.participants ?? [];
+            // Optimization: Use only getInfoByCalendar to get names/emails in a single request.
+            // This is much faster for a list view than fetching both list and info records.
+            const infoRaw = await CalendarParticipantModel.getInfoByCalendar(calendarId);
             const info = Array.isArray(infoRaw) ? infoRaw : infoRaw?.info ?? [];
             // Merge logic to ensure names are matched to IDs
             const membersMap = new Map();
             // Use participantId GUID as the primary key
             const getAnyId = (obj) => obj.participantId ?? obj.ParticipantId ?? obj.participant_id ?? obj.id ?? obj.Id;
-            // 1. Initialize with basic participant data
-            parts.forEach((p) => {
-                const mid = getAnyId(p);
-                if (mid) {
-                    membersMap.set(String(mid).toLowerCase(), {
-                        id: mid,
-                        name: p.name ?? p.Name ?? "Member",
-                        email: p.email ?? p.Email,
-                        status: p.status ?? p.Status ?? 1,
-                        uuId: mid
-                    });
-                }
-            });
-            // 2. Enrich with detailed info (Name, Email, Alias)
+            // 1. Process info list (Name, Email, Alias)
             info.forEach((i) => {
                 const mid = getAnyId(i);
                 if (!mid)
                     return;
                 const key = String(mid).toLowerCase();
-                const existing = membersMap.get(key);
-                const resolvedEmail = i.email ?? i.Email ?? i.userSsoEmail ?? i.UserSsoEmail ?? existing?.email;
+                const resolvedEmail = i.email ?? i.Email ?? i.userSsoEmail ?? i.UserSsoEmail;
                 const memberData = {
                     id: mid,
-                    name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? (existing?.name || "Member"),
+                    name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? "Member",
                     email: resolvedEmail,
-                    alias: i.alias ?? i.Alias ?? i.name ?? i.Name,
-                    userSsoEmail: resolvedEmail,
-                    uuId: mid,
-                    status: i.status ?? i.Status ?? existing?.status ?? 1
+                    status: i.status ?? i.Status ?? 1,
                 };
-                if (!existing) {
+                if (!membersMap.has(key)) {
                     membersMap.set(key, memberData);
                 }
-                else {
-                    Object.assign(existing, memberData);
-                }
             });
             const members = Array.from(membersMap.values());
-            // Map to the EXACT schema requested by the user
-            return {
-                id: cal.id ?? cal.Id,
-                calendarLink: cal.calendarLink ?? cal.CalendarLink ?? "",
-                uuid: calendarId,
-                createdOn: cal.createdOn ?? cal.CreatedOn,
-                name: cal.name ?? cal.Name,
-                timeZoneId: cal.timeZoneId ?? cal.TimeZoneId,
-                description: cal.description ?? cal.Description ?? "",
-                assignmentType: cal.assignmentMethod ?? cal.AssignmentMethod ?? cal.assignmentType,
-                status: cal.status ?? cal.Status ?? 1,
-                location: cal.location ?? cal.Location ?? "",
-                members
-            };
+            // Use the unified mapper to ensure all properties (duration, calendarId, etc.) are included
+            return mapToDesiredCalendarResponse(cal, [], members);
         }
         catch (err) {
             console.error(`[getCalendarsByCompany] Error fetching members for ${calendarId}:`, err);
-            return {
-                id: cal.id ?? cal.Id,
-                calendarLink: cal.calendarLink ?? cal.CalendarLink ?? "",
-                uuid: calendarId,
-                createdOn: cal.createdOn ?? cal.CreatedOn,
-                name: cal.name ?? cal.Name,
-                timeZoneId: cal.timeZoneId ?? cal.TimeZoneId,
-                description: cal.description ?? cal.Description ?? "",
-                assignmentType: cal.assignmentMethod ?? cal.AssignmentMethod ?? cal.assignmentType,
-                status: cal.status ?? cal.Status ?? 1,
-                location: cal.location ?? cal.Location ?? "",
-                members: []
-            };
+            // Fallback to minimal mapping if enrichment fails
+            return mapToDesiredCalendarResponse(cal, [], []);
         }
     }));
-    return enrichedCalendars.filter(c => c !== null);
+    return enrichedCalendars.filter(Boolean);
 }

package/dist/calendar/mapToDesiredResponse.d.ts

@@ -15,6 +15,7 @@ export declare function mapToDesiredCalendarResponse(payload: any, openingHours?
     bufferTimeUnit: number | null;
     calendarLink: any;
     uuid: any;
+    calendarId: any;
     location: any;
     bookingPageTitle: any;
     reminderChannelStatuses: {
@@ -49,22 +50,7 @@ export declare function mapToDesiredCalendarResponse(payload: any, openingHours?
         logoUrl: any;
         __typename: string;
     } | null;
-    openingHours: {
-        id: any;
-        createdOn: any;
-        modifiedOn: any;
-        member: any;
-        openingHourId: any;
-        calendarId: any;
-        participantId: any;
-        days: any;
-        startHour: any;
-        startMinute: any;
-        endHour: any;
-        endMinute: any;
-        off: boolean;
-        __typename: string;
-    }[];
+    openingHours: any[];
     appointmentUserDefinedFields: any;
     __typename: string;
 } | null;

package/dist/calendar/mapToDesiredResponse.js

@@ -22,22 +22,32 @@ export function mapToDesiredCalendarResponse(payload, openingHours = [], members
         __typename: "Member"
     }));
     // 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");
     const theme = rawTheme ? {
@@ -63,6 +73,7 @@ export function mapToDesiredCalendarResponse(payload, openingHours = [], members
         })),
         __typename: "ReminderChannelStatus"
     })) : [];
+    const uuid = pick(payload, "uuid", "Uuid", "calendarId", "CalendarId");
     return {
         id: n(pick(payload, "id", "Id")),
         durationUnit: n(pick(payload, "durationUnit", "DurationUnit")),
@@ -75,7 +86,8 @@ export function mapToDesiredCalendarResponse(payload, openingHours = [], members
         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/dist/index.d.ts

@@ -5,8 +5,7 @@ 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 { fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
 export { buildUnifiedCalendarView, type UnifiedCalendarMember, type UnifiedCalendarView, type UnifiedOpeningHourRow, type UnifiedParticipantWithHours, } from "./calendar/buildUnifiedCalendarView.js";
 export { fetchCalendarWithOpeningHours, unwrapCalendarGetData, pickOpeningHoursArrayFromCalendarPayload, normalizeParticipantOpeningHoursResponse } from "./calendar/fetchCalendarWithOpeningHours.js";
 export { getOpeningHours } from "./calendar/getOpeningHours.js";
@@ -19,8 +18,48 @@ export { CalendarCreation, createCalendarWithRelationsAsync, updateCalendarWithR
 export { addParticipantToCalendar, removeParticipantFromCalendar, saveCalendarOpeningHour, saveCalendarOpeningHoursBatch } from "./calendar/blazeoCalendarRelationMethods.js";
 export { createAppointmentEventAsync, rescheduleAppointmentEventAsync, cancelAppointmentEventAsync } from "./events/appointmentEventFacade.js";
 export { mapAppointmentToEventSnapshot } from "./events/mapAppointmentToEventSnapshot.js";
-import { CalendarModel as CoreCalendarModel, EventModel as CoreEventModel, ParticipantModel as CoreParticipantModel, CalendarParticipantModel as CoreCalendarParticipantModel, configure, getConfig } from "@blazeo.com/calendar-client";
-export { CoreCalendarModel as CalendarModel, CoreEventModel as CoreEventModel, CoreParticipantModel as CoreParticipantModel, CoreCalendarParticipantModel as CalendarParticipantModel, configure, getConfig };
+import { getCalendarsByCompany } from "./calendar/getCalendarsByCompany.js";
+import { fetchCalendarDetails } from "./calendar/fetchCalendarDetails.js";
+export { getCalendarsByCompany, fetchCalendarDetails };
+import { EventModel as CoreEventModel, ParticipantModel as CoreParticipantModel, CalendarParticipantModel as CoreCalendarParticipantModel, configure, getConfig } from "@blazeo.com/calendar-client";
+export declare const CalendarModel: {
+    getCalendarsByCompany: typeof getCalendarsByCompany;
+    fetchCalendarDetails: typeof fetchCalendarDetails;
+    get(calendarId: string): Promise<unknown>;
+    getRaw(calendarId: string): Promise<{
+        status: string;
+        data?: unknown;
+        message?: string;
+    }>;
+    getByCompany(companyKey: string, opts?: {
+        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;
+    }): Promise<{
+        calendars: unknown[];
+        totalCount: number;
+    } | null>;
+    getTimeZones(): Promise<unknown>;
+    getTimeZone(timezoneId: string): Promise<unknown>;
+    getParticipants(calendarId: string): Promise<unknown>;
+    getAllParticipantOpeningHours(calendarId: string): Promise<unknown[] | null>;
+    getCalendarParticipant(calendarId: string): Promise<unknown>;
+    getParticipantsInfo(calendarId: string): Promise<unknown>;
+    getMonth(calendarId: string, year: number, month: number): Promise<unknown>;
+    getEvents(calendarId: string): Promise<unknown>;
+    createWithParticipants(name: string, companyKey: string, participantIds: string[], description: string, calendarId?: string): Promise<unknown>;
+    editWithParticipants(calendarId: string, name: string, participantIds: string[], description: string): Promise<unknown>;
+    create(snapshot: object, options?: {
+        env?: object;
+    }): unknown;
+};
+export { CoreEventModel as CoreEventModel, CoreParticipantModel as CoreParticipantModel, CoreCalendarParticipantModel as CalendarParticipantModel, configure, getConfig };
 export declare const packageName = "@blazeo.com/appointment-client";
 export declare class CalendarClient {
     name: string;

package/dist/index.js

@@ -5,8 +5,7 @@ export { ensureBlazeoHttpReady } 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 { fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
 export { buildUnifiedCalendarView, } from "./calendar/buildUnifiedCalendarView.js";
 export { fetchCalendarWithOpeningHours, unwrapCalendarGetData, pickOpeningHoursArrayFromCalendarPayload, normalizeParticipantOpeningHoursResponse } from "./calendar/fetchCalendarWithOpeningHours.js";
 export { getOpeningHours } from "./calendar/getOpeningHours.js";
@@ -20,16 +19,17 @@ export { CalendarCreation, createCalendarWithRelationsAsync, updateCalendarWithR
 export { addParticipantToCalendar, removeParticipantFromCalendar, saveCalendarOpeningHour, saveCalendarOpeningHoursBatch } from "./calendar/blazeoCalendarRelationMethods.js";
 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";
+export { getCalendarsByCompany, fetchCalendarDetails };
 import { CalendarModel as CoreCalendarModel, EventModel as CoreEventModel, ParticipantModel as CoreParticipantModel, CalendarParticipantModel as CoreCalendarParticipantModel, configure, getConfig } from "@blazeo.com/calendar-client";
-// Attach new methods to CalendarModel for easier access
-CoreCalendarModel.fetchCalendarDetails = fetchCalendarDetails;
-CoreCalendarModel.fetchCalendarBundle = fetchCalendarBundle;
-CoreCalendarModel.fetchCalendarWithOpeningHours = fetchCalendarWithOpeningHours;
-CoreCalendarModel.getCalendarsByCompany = getCalendarsByCompany;
-export { CoreCalendarModel as CalendarModel, CoreEventModel as CoreEventModel, CoreParticipantModel as CoreParticipantModel, CoreCalendarParticipantModel as CalendarParticipantModel, configure, getConfig };
+// Enriched CalendarModel
+export const CalendarModel = {
+    ...CoreCalendarModel,
+    getCalendarsByCompany,
+    fetchCalendarDetails
+};
+export { CoreEventModel as CoreEventModel, CoreParticipantModel as CoreParticipantModel, CoreCalendarParticipantModel as CalendarParticipantModel, configure, getConfig };
 export const packageName = "@blazeo.com/appointment-client";
 export class CalendarClient {
     name = "CalendarClient";

package/dist/lead/fetchLeadDetails.d.ts

@@ -0,0 +1,56 @@
+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;
+};
+/**
+ * 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 declare function fetchLeadDetails(leadId: string, connection?: BlazeoLeadConnection): Promise<{
+    ok: true;
+    lead: Record<string, unknown> | null;
+    rawGet: unknown;
+} | {
+    ok: false;
+    reason: "missing_base_url";
+    detail: string;
+}>;
+/**
+ * Single lead by email + company: `GET /lead/getbyemail`.
+ */
+export declare function fetchLeadByEmail(email: string, companyKey: string, connection?: BlazeoLeadConnection): Promise<{
+    ok: true;
+    lead: Record<string, unknown> | null;
+} | {
+    ok: false;
+    reason: "missing_base_url";
+    detail: string;
+}>;
+/**
+ * Paged list: `LeadModel.getByCompany` → `GET /lead/company/get`.
+ */
+export declare function fetchLeadsByCompany(companyKey: string, listOpts?: LeadsByCompanyListOpts, connection?: BlazeoLeadConnection): Promise<{
+    ok: true;
+    leads: Record<string, unknown>[];
+} | {
+    ok: false;
+    reason: "missing_base_url";
+    detail: string;
+}>;

package/dist/lead/fetchLeadDetails.js

@@ -0,0 +1,61 @@
+import { LeadModel } from "@blazeo.com/calendar-client";
+import { getSnapshot, isStateTreeNode } from "mobx-state-tree";
+import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.js";
+function leadToPlain(lead) {
+    if (lead == null)
+        return null;
+    if (isStateTreeNode(lead)) {
+        return getSnapshot(lead);
+    }
+    if (typeof lead === "object")
+        return lead;
+    return null;
+}
+function leadsToPlain(list) {
+    if (!Array.isArray(list))
+        return [];
+    return list.map((x) => leadToPlain(x)).filter((x) => 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, connection = {}) {
+    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, companyKey, connection = {}) {
+    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, listOpts = {}, connection = {}) {
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blazeo.com/appointment-client",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "publishConfig": {
     "access": "public"
   },

package/sample/src/FetchCalendarTab.jsx

@@ -1,9 +1,9 @@
 import { useMemo, useState } from "react";
 import {
+  CalendarCreation,
   CalendarModel,
   deleteCalendarAsync,
   ensureBlazeoHttpReady,
-  fetchCalendarDetails,
   updateCalendarAsync,
 } from "appointment-client";
 import { getSnapshot, isStateTreeNode } from "mobx-state-tree";
@@ -229,40 +229,24 @@ export function FetchCalendarTab() {
 
     setBusy(true);
     try {
-      const details = await fetchCalendarDetails(id, {
+      const result = await CalendarModel.fetchCalendarDetails(id, {
         ...connectionOpts,
         baseUrl: effective.baseUrl,
         ...(effective.consumer ? { consumer: effective.consumer } : {}),
       });
 
-      const meta = details?._meta ?? details?.meta;
-      if (meta && !meta.ok && meta.reason === "missing_base_url") {
-        setError(mapBlazeoDemoError(meta.detail ?? ""));
-        return;
-      }
-
-      if (!details) {
-        ensureBlazeoHttpReady({
-          baseUrl: effective.baseUrl,
-          ...(effective.consumer ? { consumer: effective.consumer } : {}),
-        });
-        const raw = await CalendarModel.getRaw(id);
-        setNote("CalendarModel.get returned null. Showing CalendarModel.getRaw only.");
-        setOutput(toDisplayJson(raw));
-        return;
-      }
-
-      const snap = details._cal ? getSnapshot(details._cal) : null;
-      if (snap) {
-        setLastFetchUpdatePayload(JSON.stringify(calendarSnapshotToUpdatePayload(snap), null, 2));
-      }
-
-      // If it's the new flat response, just use it directly for output.
-      setOutput(toDisplayJson(details));
-      
-      // We can still try to extract meta for the UI if needed
-      if (meta) {
-        setNote(`Source: ${meta.calendarViewUsedAllParticipantOpeningHours ? "AllParticipantOpeningHours" : "Embedded/ParticipantApi"}`);
+      if (result) {
+        setOutput(toDisplayJson(result));
+        setNote(`CalendarModel.fetchCalendarDetails → Enriched Unified View (ID: ${id})`);
+        setUpdateJson(toDisplayJson(result));
+        
+        const snap = result._cal ? getSnapshot(result._cal) : null;
+        if (snap) {
+          setLastFetchUpdatePayload(JSON.stringify(calendarSnapshotToUpdatePayload(snap), null, 2));
+        }
+      } else {
+        setNote(`Calendar not found or error fetching details for ID: ${id}`);
+        setOutput("{}");
       }
     } catch (err) {
       setError(explainFetchFailure(err, effective.baseUrl));
@@ -360,17 +344,19 @@ export function FetchCalendarTab() {
     }
     setBusy(true);
     try {
-      const result = await updateCalendarAsync(payload, {
+      const result = await CalendarCreation.updateWithRelationsAsync(payload, {
         ...connectionOpts,
         baseUrl: effective.baseUrl,
         ...(effective.consumer ? { consumer: effective.consumer } : {}),
       });
       if (result.ok) {
-        setMutateNote("updateCalendarAsync → POST /Calendar/Event/Update");
+        setMutateNote("updateWithRelationsAsync → POST /Calendar/Event/Update + Batch Opening Hours");
         setMutateOutput(
           JSON.stringify(
             {
-              snapshot: getSnapshot(result.calendar),
+              snapshot: result.calendar ? getSnapshot(result.calendar) : null,
+              membersAdded: result.membersAdded,
+              openingHoursSaved: result.openingHoursSaved,
               apiResponse: result.apiResponse ?? null,
             },
             null,

package/sample/src/LeadTab.jsx

@@ -0,0 +1,335 @@
+import { useState } from "react";
+import {
+  ensureBlazeoHttpReady,
+  fetchLeadByEmail,
+  fetchLeadDetails,
+  fetchLeadsByCompany,
+} from "appointment-client";
+import {
+  configureBlazeoFromEffective,
+  useBlazeoConnection,
+} from "./BlazeoConnectionSettings.jsx";
+import { mapBlazeoDemoError } from "./blazeoDemoError.js";
+
+/** Browser `fetch` often surfaces blocked requests as TypeError "Failed to fetch" (e.g. CORS). */
+function explainFetchFailure(err, configuredBaseUrl) {
+  const msg = err instanceof Error ? err.message : String(err);
+  const isNetwork =
+    msg === "Failed to fetch" ||
+    msg === "Load failed" ||
+    (err instanceof TypeError && (/fetch/i.test(msg) || /network/i.test(msg)));
+  if (!isNetwork) return mapBlazeoDemoError(msg);
+
+  const isRemote =
+    configuredBaseUrl &&
+    /^https?:\/\//i.test(configuredBaseUrl) &&
+    !/localhost|127\.0\.0\.1/i.test(configuredBaseUrl);
+
+  const proxyHint =
+    "Dev workaround (Vite proxy): create sample/.env.development with\n" +
+    "  VITE_DEV_PROXY_TARGET=https://YOUR_API_ORIGIN\n" +
+    "restart npm run dev, then set Base URL to:\n" +
+    "  http://localhost:5173/blazeo-api\n" +
+    "Consumer header stays the same.";
+
+  if (isRemote) {
+    return `${msg}\n\nLikely CORS / blocked browser cross-origin request.\nFix API CORS for http://localhost:5173, OR:\n${proxyHint}`;
+  }
+  return `${msg}\n\n${proxyHint}`;
+}
+
+function toDisplayJson(value) {
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+}
+
+export function LeadTab() {
+  const { effective, connectionOpts } = useBlazeoConnection();
+  const [leadId, setLeadId] = useState("");
+  const [email, setEmail] = useState("");
+  const [companyKey, setCompanyKey] = useState("");
+  const [listCompanyKey, setListCompanyKey] = useState("");
+  const [skip, setSkip] = useState("");
+  const [take, setTake] = useState("");
+  const [busy, setBusy] = useState(false);
+  const [error, setError] = useState("");
+  const [note, setNote] = useState("");
+  const [output, setOutput] = useState("");
+
+  function ensureBaseConfigured() {
+    if (!effective.baseUrl) {
+      setError("Set Base URL in the connection card above or in `blazeoClientDefaults.ts`.");
+      return false;
+    }
+    return true;
+  }
+
+  async function handleFetchById(e) {
+    e.preventDefault();
+    setError("");
+    setNote("");
+    setOutput("");
+    const id = leadId.trim();
+    if (!id) {
+      setError("Enter a lead id.");
+      return;
+    }
+    if (!ensureBaseConfigured()) return;
+    configureBlazeoFromEffective(effective);
+    ensureBlazeoHttpReady({
+      baseUrl: effective.baseUrl,
+      ...(effective.consumer ? { consumer: effective.consumer } : {}),
+    });
+
+    setBusy(true);
+    try {
+      const res = await fetchLeadDetails(id, {
+        ...connectionOpts,
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+      if (!res.ok) {
+        setError(mapBlazeoDemoError(res.detail ?? ""));
+        return;
+      }
+      setNote("LeadModel.get + getRaw → GET /lead/get (lead mapped snapshot + raw envelope).");
+      setOutput(toDisplayJson({ lead: res.lead, rawGet: res.rawGet }));
+    } catch (err) {
+      setError(explainFetchFailure(err, effective.baseUrl));
+    } finally {
+      setBusy(false);
+    }
+  }
+
+  async function handleFetchByEmail(e) {
+    e.preventDefault();
+    setError("");
+    setNote("");
+    setOutput("");
+    const em = email.trim();
+    const ck = companyKey.trim();
+    if (!em || !ck) {
+      setError("Enter email and company key.");
+      return;
+    }
+    if (!ensureBaseConfigured()) return;
+    configureBlazeoFromEffective(effective);
+    ensureBlazeoHttpReady({
+      baseUrl: effective.baseUrl,
+      ...(effective.consumer ? { consumer: effective.consumer } : {}),
+    });
+
+    setBusy(true);
+    try {
+      const res = await fetchLeadByEmail(em, ck, {
+        ...connectionOpts,
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+      if (!res.ok) {
+        setError(mapBlazeoDemoError(res.detail ?? ""));
+        return;
+      }
+      setNote("LeadModel.getByEmail → GET /lead/getbyemail.");
+      setOutput(toDisplayJson({ lead: res.lead }));
+    } catch (err) {
+      setError(explainFetchFailure(err, effective.baseUrl));
+    } finally {
+      setBusy(false);
+    }
+  }
+
+  async function handleFetchByCompany(e) {
+    e.preventDefault();
+    setError("");
+    setNote("");
+    setOutput("");
+    const ck = listCompanyKey.trim();
+    if (!ck) {
+      setError("Enter company key for the list.");
+      return;
+    }
+    if (!ensureBaseConfigured()) return;
+    configureBlazeoFromEffective(effective);
+    ensureBlazeoHttpReady({
+      baseUrl: effective.baseUrl,
+      ...(effective.consumer ? { consumer: effective.consumer } : {}),
+    });
+
+    const listOpts = {};
+    const s = skip.trim();
+    const t = take.trim();
+    if (s !== "") {
+      const n = Number(s);
+      if (!Number.isFinite(n)) {
+        setError("Skip must be a number.");
+        return;
+      }
+      listOpts.skip = n;
+    }
+    if (t !== "") {
+      const n = Number(t);
+      if (!Number.isFinite(n)) {
+        setError("Take must be a number.");
+        return;
+      }
+      listOpts.take = n;
+    }
+
+    setBusy(true);
+    try {
+      const res = await fetchLeadsByCompany(ck, listOpts, {
+        ...connectionOpts,
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+      if (!res.ok) {
+        setError(mapBlazeoDemoError(res.detail ?? ""));
+        return;
+      }
+      setNote(
+        `LeadModel.getByCompany → GET /lead/company/get (${res.leads.length} row(s), MST snapshots as plain objects).`
+      );
+      setOutput(toDisplayJson({ leads: res.leads }));
+    } catch (err) {
+      setError(explainFetchFailure(err, effective.baseUrl));
+    } finally {
+      setBusy(false);
+    }
+  }
+
+  return (
+    <>
+      <div className="card">
+        <h2>Lead by id</h2>
+        <p className="muted small">
+          Uses <code>fetchLeadDetails(leadId)</code> from <code>appointment-client</code>, which wraps{" "}
+          <code>LeadModel.getRaw</code> + <code>LeadModel.get</code> (<code>GET /lead/get</code>). Output shows both the
+          mapped lead snapshot and the raw API envelope.
+        </p>
+        <form onSubmit={handleFetchById} className="form">
+          <label className="form__label">
+            <span>Lead id</span>
+            <input
+              type="text"
+              className="form__input"
+              placeholder="lead_id"
+              value={leadId}
+              onChange={(e) => setLeadId(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <button type="submit" className="btn btn--primary" disabled={busy}>
+            {busy ? "Loading…" : "Fetch lead"}
+          </button>
+        </form>
+      </div>
+
+      <div className="card">
+        <h2>Lead by email + company</h2>
+        <p className="muted small">
+          <code>fetchLeadByEmail</code> → <code>LeadModel.getByEmail</code> (<code>GET /lead/getbyemail</code>).
+        </p>
+        <form onSubmit={handleFetchByEmail} className="form">
+          <label className="form__label">
+            <span>Email</span>
+            <input
+              type="email"
+              className="form__input"
+              placeholder="user@example.com"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <label className="form__label">
+            <span>Company key</span>
+            <input
+              type="text"
+              className="form__input"
+              placeholder="company_key"
+              value={companyKey}
+              onChange={(e) => setCompanyKey(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <button type="submit" className="btn btn--secondary" disabled={busy}>
+            {busy ? "Loading…" : "Fetch lead"}
+          </button>
+        </form>
+      </div>
+
+      <div className="card">
+        <h2>Leads by company</h2>
+        <p className="muted small">
+          <code>fetchLeadsByCompany</code> → <code>LeadModel.getByCompany</code> (<code>GET /lead/company/get</code>).
+          Optional <code>skip</code> / <code>take</code> map to query params (see calendar-client).
+        </p>
+        <form onSubmit={handleFetchByCompany} className="form">
+          <label className="form__label">
+            <span>Company key</span>
+            <input
+              type="text"
+              className="form__input"
+              placeholder="company_key"
+              value={listCompanyKey}
+              onChange={(e) => setListCompanyKey(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <label className="form__label">
+            <span>Skip (optional)</span>
+            <input
+              type="text"
+              className="form__input"
+              inputMode="numeric"
+              placeholder="e.g. 0"
+              value={skip}
+              onChange={(e) => setSkip(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <label className="form__label">
+            <span>Take (optional)</span>
+            <input
+              type="text"
+              className="form__input"
+              inputMode="numeric"
+              placeholder="e.g. 50"
+              value={take}
+              onChange={(e) => setTake(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <button type="submit" className="btn btn--secondary" disabled={busy}>
+            {busy ? "Loading…" : "Fetch leads"}
+          </button>
+        </form>
+      </div>
+
+      {note ? (
+        <div className="card">
+          <h2>Note</h2>
+          <p className="muted small">{note}</p>
+        </div>
+      ) : null}
+
+      {error ? (
+        <div className="card card--error" role="alert">
+          <h2>Error</h2>
+          <pre className="pre-block">{error}</pre>
+        </div>
+      ) : null}
+
+      {output ? (
+        <div className="card">
+          <h2>JSON</h2>
+          <pre className="pre-block">{output}</pre>
+        </div>
+      ) : null}
+    </>
+  );
+}

package/src/calendar/fetchCalendarDetails.ts

@@ -276,9 +276,17 @@ export async function fetchCalendarDetails(
 
   if (!calendarView) return null as any;
 
+  // Use the mapper to normalize the final output, ensuring all fields like duration, 
+  // bookingPageTitle, calendarId, etc. are correctly picked and named.
+  const finalView = mapToDesiredCalendarResponse(
+    payload,
+    calendarView.openingHours,
+    calendarView.members
+  ) as any;
+
   // Attach metadata as non-enumerable properties so they don't show up in JSON.stringify
   // but are still accessible for debugging if needed.
-  Object.defineProperties(calendarView, {
+  Object.defineProperties(finalView, {
     _cal: { value: cal, enumerable: false },
     _participants: { value: participantList, enumerable: false },
     _openingHours: { value: openingHours, enumerable: false },
@@ -294,7 +302,7 @@ export async function fetchCalendarDetails(
     },
   });
 
-  return calendarView as any;
+  return finalView as any;
 }
 
 /**

package/src/calendar/getCalendarsByCompany.ts

@@ -1,10 +1,11 @@
 import { CalendarModel, CalendarParticipantModel } from "@blazeo.com/calendar-client";
 import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.js";
+import { mapToDesiredCalendarResponse } from "./mapToDesiredResponse.js";
 
 /**
  * Fetches all calendars for a company and populates each with its members (participants).
- * Fetches both Participant List and Participant Info to ensure names and emails are included,
- * while still skipping heavy data like opening hours.
+ * Uses a highly optimized single-request approach per calendar to ensure speed in list views.
+ * Results are normalized via mapToDesiredCalendarResponse.
  */
 export async function getCalendarsByCompany(
   companyKey: string,
@@ -30,96 +31,48 @@ export async function getCalendarsByCompany(
       if (!calendarId) return null;
 
       try {
-        // We need both List and Info to get the names/emails
-        const [partsRaw, infoRaw] = await Promise.all([
-          CalendarParticipantModel.getByCalendar(calendarId),
-          CalendarParticipantModel.getInfoByCalendar(calendarId)
-        ]);
-
-        const parts = Array.isArray(partsRaw) ? partsRaw : (partsRaw as any)?.participants ?? [];
+        // Optimization: Use only getInfoByCalendar to get names/emails in a single request.
+        // This is much faster for a list view than fetching both list and info records.
+        const infoRaw = await CalendarParticipantModel.getInfoByCalendar(calendarId);
         const info = Array.isArray(infoRaw) ? infoRaw : (infoRaw as any)?.info ?? [];
 
         // Merge logic to ensure names are matched to IDs
         const membersMap = new Map<string, any>();
-        
+
         // Use participantId GUID as the primary key
         const getAnyId = (obj: any) =>
           obj.participantId ?? obj.ParticipantId ?? obj.participant_id ?? obj.id ?? obj.Id;
 
-        // 1. Initialize with basic participant data
-        parts.forEach((p: any) => {
-          const mid = getAnyId(p);
-          if (mid) {
-            membersMap.set(String(mid).toLowerCase(), {
-              id: mid,
-              name: p.name ?? p.Name ?? "Member",
-              email: p.email ?? p.Email,
-              status: p.status ?? p.Status ?? 1,
-              uuId: mid
-            });
-          }
-        });
-
-        // 2. Enrich with detailed info (Name, Email, Alias)
+        // 1. Process info list (Name, Email, Alias)
         info.forEach((i: any) => {
           const mid = getAnyId(i);
           if (!mid) return;
           const key = String(mid).toLowerCase();
-          const existing = membersMap.get(key);
-          
-          const resolvedEmail = i.email ?? i.Email ?? i.userSsoEmail ?? i.UserSsoEmail ?? existing?.email;
 
+          const resolvedEmail = i.email ?? i.Email ?? i.userSsoEmail ?? i.UserSsoEmail;
           const memberData = {
             id: mid,
-            name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? (existing?.name || "Member"),
+            name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? "Member",
             email: resolvedEmail,
-            alias: i.alias ?? i.Alias ?? i.name ?? i.Name,
-            userSsoEmail: resolvedEmail,
-            uuId: mid,
-            status: i.status ?? i.Status ?? existing?.status ?? 1
+            status: i.status ?? i.Status ?? 1,
           };
 
-          if (!existing) {
+          if (!membersMap.has(key)) {
             membersMap.set(key, memberData);
-          } else {
-            Object.assign(existing, memberData);
           }
         });
 
         const members = Array.from(membersMap.values());
 
-        // Map to the EXACT schema requested by the user
-        return {
-          id: cal.id ?? cal.Id,
-          calendarLink: cal.calendarLink ?? cal.CalendarLink ?? "",
-          uuid: calendarId,
-          createdOn: cal.createdOn ?? cal.CreatedOn,
-          name: cal.name ?? cal.Name,
-          timeZoneId: cal.timeZoneId ?? cal.TimeZoneId,
-          description: cal.description ?? cal.Description ?? "",
-          assignmentType: cal.assignmentMethod ?? cal.AssignmentMethod ?? cal.assignmentType,
-          status: cal.status ?? cal.Status ?? 1,
-          location: cal.location ?? cal.Location ?? "",
-          members
-        };
+        // Use the unified mapper to ensure all properties (duration, calendarId, etc.) are included
+        return mapToDesiredCalendarResponse(cal, [], members);
       } catch (err) {
         console.error(`[getCalendarsByCompany] Error fetching members for ${calendarId}:`, err);
-        return {
-          id: cal.id ?? cal.Id,
-          calendarLink: cal.calendarLink ?? cal.CalendarLink ?? "",
-          uuid: calendarId,
-          createdOn: cal.createdOn ?? cal.CreatedOn,
-          name: cal.name ?? cal.Name,
-          timeZoneId: cal.timeZoneId ?? cal.TimeZoneId,
-          description: cal.description ?? cal.Description ?? "",
-          assignmentType: cal.assignmentMethod ?? cal.AssignmentMethod ?? cal.assignmentType,
-          status: cal.status ?? cal.Status ?? 1,
-          location: cal.location ?? cal.Location ?? "",
-          members: []
-        };
+        // Fallback to minimal mapping if enrichment fails
+        return mapToDesiredCalendarResponse(cal, [], []);
       }
     })
   );
 
-  return enrichedCalendars.filter(c => c !== null);
+  return enrichedCalendars.filter(Boolean);
 }

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/index.ts

@@ -10,8 +10,7 @@ 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 { fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
 export {
   buildUnifiedCalendarView,
   type UnifiedCalendarMember,
@@ -33,9 +32,9 @@ 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";
+export { getCalendarsByCompany, fetchCalendarDetails };
 
 import { 
   CalendarModel as CoreCalendarModel, 
@@ -46,14 +45,14 @@ import {
   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, 
   CoreCalendarParticipantModel as CalendarParticipantModel,
@@ -61,7 +60,6 @@ export {
   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 ?? []) };
+}