@blazeo.com/appointment-client 1.0.8 → 1.0.10

package/dist/calendar/calendarCreation.js

@@ -1,5 +1,5 @@
 import { getSnapshot } from "mobx-state-tree";
-import { addParticipantToCalendar, saveCalendarOpeningHour } from "./blazeoCalendarRelationMethods.js";
+import { addParticipantToCalendar, saveCalendarOpeningHoursBatch } from "./blazeoCalendarRelationMethods.js";
 import { createCalendarAsync, updateCalendarAsync, deleteCalendarAsync } from "./createCalendar.js";
 function isFailureStatus(res) {
     return res.status !== "success" && res.status !== "Success";
@@ -90,8 +90,10 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar, calendarNode
         }
         membersAdded += 1;
     }
-    let openingHoursSaved = 0;
-    for (const oh of calendar.openingHours ?? []) {
+    // 2. Save Opening Hours (Plan V2: Grouped by participant with explicit off-days per slot)
+    const openingHours = calendar.openingHours ?? [];
+    const hoursByParticipant = new Map();
+    for (const oh of openingHours) {
         const participantId = resolveParticipantIdForOpeningHour(oh);
         if (!participantId) {
             return {
@@ -99,8 +101,17 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar, calendarNode
                 error: `Opening hour id ${oh.id}: participantId is required.`,
             };
         }
-        for (const day of oh.days ?? []) {
-            const payload = {
+        if (!hoursByParticipant.has(participantId)) {
+            hoursByParticipant.set(participantId, []);
+        }
+        // Plan V2 Logic: For every opening hour object, generate EXACTLY 7 entries (days 0-6).
+        // If the day is in oh.days, it's ON. If not, it's OFF.
+        const activeDays = oh.days ?? [];
+        const openingHourId = oh.openingHourId?.trim() || newOpeningHourId();
+        for (let day = 0; day <= 6; day++) {
+            const isIncluded = activeDays.includes(day);
+            const isOff = isIncluded ? !!oh.off : true; // If not in days array, it's explicitly OFF
+            hoursByParticipant.get(participantId)?.push({
                 calendarId: calendarIdStr,
                 participantId,
                 day,
@@ -108,22 +119,28 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar, calendarNode
                 startMinute: oh.startMinute,
                 endHour: oh.endHour,
                 endMinute: oh.endMinute,
-                off: oh.off,
-                openingHourId: oh.openingHourId?.trim() || newOpeningHourId(),
+                off: isOff,
+                openingHourId: openingHourId,
+            });
+        }
+    }
+    let openingHoursSaved = 0;
+    for (const [participantId, payload] of hoursByParticipant.entries()) {
+        if (payload.length === 0)
+            continue;
+        // Use the batch save method (plural)
+        const res = await saveCalendarOpeningHoursBatch(calendarNode, payload);
+        if (isFailureStatus(res)) {
+            const msg = res.message ??
+                (typeof res.data === "string" ? res.data : undefined) ??
+                JSON.stringify(res);
+            return {
+                ok: false,
+                error: `saveOpeningHours batch failed for participant ${participantId}: ${msg}`,
+                apiResponse: res,
             };
-            const res = await saveCalendarOpeningHour(calendarNode, payload);
-            if (isFailureStatus(res)) {
-                const msg = res.message ??
-                    (typeof res.data === "string" ? res.data : undefined) ??
-                    JSON.stringify(res);
-                return {
-                    ok: false,
-                    error: `saveOpeningHour failed (opening hour ${oh.id}, day ${day}): ${msg}`,
-                    apiResponse: res,
-                };
-            }
-            openingHoursSaved += 1;
         }
+        openingHoursSaved += payload.length;
     }
     return {
         ...baseSuccess,

package/dist/calendar/getCalendarsByCompany.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+export declare function getCalendarsByCompany(companyKey: string, connection?: {
+    baseUrl?: string;
+    consumer?: string;
+}): Promise<any[]>;

package/dist/calendar/getCalendarsByCompany.js

@@ -0,0 +1,107 @@
+import { CalendarModel, CalendarParticipantModel } from "@blazeo.com/calendar-client";
+import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.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.
+ */
+export async function getCalendarsByCompany(companyKey, connection = {}) {
+    const ready = ensureBlazeoHttpReady(connection);
+    if (!ready.ok) {
+        throw new Error(ready.error);
+    }
+    // 1. Get all calendars for the company
+    const result = await CalendarModel.getByCompany(companyKey);
+    const calendars = Array.isArray(result) ? result : result?.calendars ?? [];
+    if (!calendars || calendars.length === 0) {
+        return [];
+    }
+    // 2. Fetch lightweight members for each calendar in parallel
+    const enrichedCalendars = await Promise.all(calendars.map(async (cal) => {
+        const calendarId = cal.calendarId ?? String(cal.id ?? "");
+        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 ?? [];
+            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)
+            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 memberData = {
+                    id: mid,
+                    name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? (existing?.name || "Member"),
+                    email: resolvedEmail,
+                    alias: i.alias ?? i.Alias ?? i.name ?? i.Name,
+                    userSsoEmail: resolvedEmail,
+                    uuId: mid,
+                    status: i.status ?? i.Status ?? existing?.status ?? 1
+                };
+                if (!existing) {
+                    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
+            };
+        }
+        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: []
+            };
+        }
+    }));
+    return enrichedCalendars.filter(c => c !== null);
+}

package/dist/index.d.ts

@@ -6,6 +6,7 @@ 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 { 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";
@@ -18,7 +19,8 @@ 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";
-export { CalendarModel, EventModel as CoreEventModel, ParticipantModel as CoreParticipantModel, CalendarParticipantModel, configure, getConfig } from "@blazeo.com/calendar-client";
+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 };
 export declare const packageName = "@blazeo.com/appointment-client";
 export declare class CalendarClient {
     name: string;

package/dist/index.js

@@ -6,6 +6,7 @@ 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 { buildUnifiedCalendarView, } from "./calendar/buildUnifiedCalendarView.js";
 export { fetchCalendarWithOpeningHours, unwrapCalendarGetData, pickOpeningHoursArrayFromCalendarPayload, normalizeParticipantOpeningHoursResponse } from "./calendar/fetchCalendarWithOpeningHours.js";
 export { getOpeningHours } from "./calendar/getOpeningHours.js";
@@ -19,7 +20,16 @@ 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";
-export { CalendarModel, EventModel as CoreEventModel, ParticipantModel as CoreParticipantModel, CalendarParticipantModel, configure, getConfig } from "@blazeo.com/calendar-client";
+import { fetchCalendarDetails, fetchCalendarBundle } from "./calendar/fetchCalendarDetails.js";
+import { fetchCalendarWithOpeningHours } from "./calendar/fetchCalendarWithOpeningHours.js";
+import { getCalendarsByCompany } from "./calendar/getCalendarsByCompany.js";
+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 };
 export const packageName = "@blazeo.com/appointment-client";
 export class CalendarClient {
     name = "CalendarClient";

package/package.json

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

package/sample/src/FetchCalendarTab.jsx

@@ -291,41 +291,18 @@ export function FetchCalendarTab() {
 
     setBusy(true);
     try {
-      const byCompany = await CalendarModel.getByCompany(key);
-      const list = byCompany?.calendars ?? byCompany;
-      if (list == null || !Array.isArray(list) || list.length === 0) {
-        setNote(
-          "getByCompany returned null or an empty list. (calendar-client ≥1.0.17 returns { calendars, totalCount }.)"
-        );
-        setOutput(toDisplayJson(byCompany));
+      // Use the new optimized method that includes members automatically
+      const enriched = await CalendarModel.getCalendarsByCompany(key, {
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+
+      if (!enriched || enriched.length === 0) {
+        setNote("getCalendarsByCompany returned an empty list.");
+        setOutput("[]");
       } else {
-        const enriched = await Promise.all(
-          list.map(async (c) => {
-            const id = c.calendarId ?? String(c.id ?? "");
-            if (!id) return { calendar: getSnapshot(c), openingHours: [], meta: { error: "no id" } };
-            try {
-              // fetchCalendarDetails now returns the flat unified view directly
-              const b = await fetchCalendarDetails(id, {
-                ...connectionOpts,
-                baseUrl: effective.baseUrl,
-                ...(effective.consumer ? { consumer: effective.consumer } : {}),
-              });
-              // b IS the unified calendarView: members/openingHours/participants at top level
-              return b ?? { calendar: getSnapshot(c), openingHours: [], meta: { error: "null response" } };
-            } catch (err) {
-              return {
-                calendar: getSnapshot(c),
-                openingHours: [],
-                meta: {
-                  error: err instanceof Error ? err.message : String(err),
-                },
-              };
-            }
-          })
-        );
-        const total = byCompany?.totalCount ?? list.length;
         setNote(
-          `Loaded ${list.length} calendar(s) (totalCount=${total}); opening hours (embed → participant API) + participants per calendar.`
+          `Loaded ${enriched.length} calendar(s) with members using optimized getCalendarsByCompany.`
         );
         setOutput(toDisplayJson(enriched));
       }

package/src/calendar/calendarCreation.ts

@@ -1,5 +1,5 @@
 import { getSnapshot } from "mobx-state-tree";
-import { addParticipantToCalendar, saveCalendarOpeningHour } from "./blazeoCalendarRelationMethods.js";
+import { addParticipantToCalendar, saveCalendarOpeningHour, saveCalendarOpeningHoursBatch } from "./blazeoCalendarRelationMethods.js";
 import { createCalendarAsync, updateCalendarAsync, deleteCalendarAsync } from "./createCalendar.js";
 
 function isFailureStatus(res: any) {
@@ -97,8 +97,11 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
     membersAdded += 1;
   }
 
-  let openingHoursSaved = 0;
-  for (const oh of calendar.openingHours ?? []) {
+  // 2. Save Opening Hours (Plan V2: Grouped by participant with explicit off-days per slot)
+  const openingHours = calendar.openingHours ?? [];
+  const hoursByParticipant = new Map<string, any[]>();
+
+  for (const oh of openingHours) {
     const participantId = resolveParticipantIdForOpeningHour(oh);
     if (!participantId) {
       return {
@@ -106,8 +109,21 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
         error: `Opening hour id ${oh.id}: participantId is required.`,
       };
     }
-    for (const day of oh.days ?? []) {
-      const payload = {
+
+    if (!hoursByParticipant.has(participantId)) {
+      hoursByParticipant.set(participantId, []);
+    }
+
+    // Plan V2 Logic: For every opening hour object, generate EXACTLY 7 entries (days 0-6).
+    // If the day is in oh.days, it's ON. If not, it's OFF.
+    const activeDays = oh.days ?? [];
+    const openingHourId = oh.openingHourId?.trim() || newOpeningHourId();
+
+    for (let day = 0; day <= 6; day++) {
+      const isIncluded = activeDays.includes(day);
+      const isOff = isIncluded ? !!oh.off : true; // If not in days array, it's explicitly OFF
+
+      hoursByParticipant.get(participantId)?.push({
         calendarId: calendarIdStr,
         participantId,
         day,
@@ -115,23 +131,31 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
         startMinute: oh.startMinute,
         endHour: oh.endHour,
         endMinute: oh.endMinute,
-        off: oh.off,
-        openingHourId: oh.openingHourId?.trim() || newOpeningHourId(),
+        off: isOff,
+        openingHourId: openingHourId,
+      });
+    }
+  }
+
+  let openingHoursSaved = 0;
+  for (const [participantId, payload] of hoursByParticipant.entries()) {
+    if (payload.length === 0) continue;
+
+    // Use the batch save method (plural)
+    const res = await saveCalendarOpeningHoursBatch(calendarNode, payload);
+    
+    if (isFailureStatus(res)) {
+      const msg =
+        res.message ??
+        (typeof res.data === "string" ? res.data : undefined) ??
+        JSON.stringify(res);
+      return {
+        ok: false,
+        error: `saveOpeningHours batch failed for participant ${participantId}: ${msg}`,
+        apiResponse: res,
       };
-      const res = await saveCalendarOpeningHour(calendarNode, payload);
-      if (isFailureStatus(res)) {
-        const msg =
-          res.message ??
-          (typeof res.data === "string" ? res.data : undefined) ??
-          JSON.stringify(res);
-        return {
-          ok: false,
-          error: `saveOpeningHour failed (opening hour ${oh.id}, day ${day}): ${msg}`,
-          apiResponse: res,
-        };
-      }
-      openingHoursSaved += 1;
     }
+    openingHoursSaved += payload.length;
   }
 
   return {

package/src/calendar/getCalendarsByCompany.ts

@@ -0,0 +1,125 @@
+import { CalendarModel, CalendarParticipantModel } from "@blazeo.com/calendar-client";
+import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.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.
+ */
+export async function getCalendarsByCompany(
+  companyKey: string,
+  connection: { baseUrl?: string; consumer?: string } = {}
+) {
+  const ready = ensureBlazeoHttpReady(connection);
+  if (!ready.ok) {
+    throw new Error(ready.error);
+  }
+
+  // 1. Get all calendars for the company
+  const result = await CalendarModel.getByCompany(companyKey);
+  const calendars = Array.isArray(result) ? result : (result as any)?.calendars ?? [];
+
+  if (!calendars || calendars.length === 0) {
+    return [];
+  }
+
+  // 2. Fetch lightweight members for each calendar in parallel
+  const enrichedCalendars = await Promise.all(
+    calendars.map(async (cal: any) => {
+      const calendarId = cal.calendarId ?? String(cal.id ?? "");
+      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 ?? [];
+        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)
+        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 memberData = {
+            id: mid,
+            name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? (existing?.name || "Member"),
+            email: resolvedEmail,
+            alias: i.alias ?? i.Alias ?? i.name ?? i.Name,
+            userSsoEmail: resolvedEmail,
+            uuId: mid,
+            status: i.status ?? i.Status ?? existing?.status ?? 1
+          };
+
+          if (!existing) {
+            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
+        };
+      } 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: []
+        };
+      }
+    })
+  );
+
+  return enrichedCalendars.filter(c => c !== null);
+}

package/src/index.ts

@@ -1,51 +1,72 @@
-import { getExampleSlots } from "./exampleData.js";
-
-export {
-  initializeAppointmentClient,
-  isAppointmentClientConfigured,
-} from "./config/initializeAppointmentClient.js";
-export { syncBlazeoConnection } from "./config/syncBlazeoConnection.js";
-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 {
-  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";
-export { getParticipantOpeningHours } from "./calendar/getParticipantOpeningHours.js";
-export { getAllParticipantOpeningHours } from "./calendar/getAllParticipantOpeningHours.js";
-export { getParticipants } from "./calendar/getParticipants.js";
-export { getExampleSlots, getExampleEvents, getExampleParticipants, getExampleCalendarRoot, getExampleCalendarRootSnapshot } from "./exampleData.js";
-
-// Re-export core models from calendar-client for convenience
-export { createCalendarAsync, updateCalendarAsync, deleteCalendarAsync, resolveBlazeoConnection } from "./calendar/createCalendar.js";
-export { CalendarCreation, createCalendarWithRelationsAsync, updateCalendarWithRelationsAsync, resolveParticipantIdForOpeningHour } from "./calendar/calendarCreation.js";
-export { addParticipantToCalendar, removeParticipantFromCalendar, saveCalendarOpeningHour, saveCalendarOpeningHoursBatch } from "./calendar/blazeoCalendarRelationMethods.js";
-export { createAppointmentEventAsync, rescheduleAppointmentEventAsync, cancelAppointmentEventAsync } from "./events/appointmentEventFacade.js";
-export { mapAppointmentToEventSnapshot } from "./events/mapAppointmentToEventSnapshot.js";
-
-export { 
-  CalendarModel, 
-  EventModel as CoreEventModel, 
-  ParticipantModel as CoreParticipantModel, 
-  CalendarParticipantModel,
-  configure, 
-  getConfig 
-} from "@blazeo.com/calendar-client";
-
-export const packageName = "@blazeo.com/appointment-client";
-
-export class CalendarClient {
-  name = "CalendarClient";
-  getExampleSlots() {
-    return getExampleSlots();
-  }
-}
+import { getExampleSlots } from "./exampleData.js";
+
+export {
+  initializeAppointmentClient,
+  isAppointmentClientConfigured,
+} from "./config/initializeAppointmentClient.js";
+export { syncBlazeoConnection } from "./config/syncBlazeoConnection.js";
+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 {
+  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";
+export { getParticipantOpeningHours } from "./calendar/getParticipantOpeningHours.js";
+export { getAllParticipantOpeningHours } from "./calendar/getAllParticipantOpeningHours.js";
+export { getParticipants } from "./calendar/getParticipants.js";
+export { getExampleSlots, getExampleEvents, getExampleParticipants, getExampleCalendarRoot, getExampleCalendarRootSnapshot } from "./exampleData.js";
+
+// Re-export core models from calendar-client for convenience
+export { createCalendarAsync, updateCalendarAsync, deleteCalendarAsync, resolveBlazeoConnection } from "./calendar/createCalendar.js";
+export { CalendarCreation, createCalendarWithRelationsAsync, updateCalendarWithRelationsAsync, resolveParticipantIdForOpeningHour } from "./calendar/calendarCreation.js";
+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 { 
+  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 as any).fetchCalendarDetails = fetchCalendarDetails;
+(CoreCalendarModel as any).fetchCalendarBundle = fetchCalendarBundle;
+(CoreCalendarModel as any).fetchCalendarWithOpeningHours = fetchCalendarWithOpeningHours;
+(CoreCalendarModel as any).getCalendarsByCompany = getCalendarsByCompany;
+
+export { 
+  CoreCalendarModel as CalendarModel, 
+  CoreEventModel as CoreEventModel, 
+  CoreParticipantModel as CoreParticipantModel, 
+  CoreCalendarParticipantModel as CalendarParticipantModel,
+  configure, 
+  getConfig 
+};
+
+
+export const packageName = "@blazeo.com/appointment-client";
+
+export class CalendarClient {
+  name = "CalendarClient";
+  getExampleSlots() {
+    return getExampleSlots();
+  }
+}