@blazeo.com/appointment-client 1.0.11 → 1.0.14

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

@@ -1,5 +1,5 @@
 import { getSnapshot } from "mobx-state-tree";
-import { addParticipantToCalendar, saveCalendarOpeningHour, saveCalendarOpeningHoursBatch } from "./blazeoCalendarRelationMethods.js";
+import { addParticipantToCalendar, removeParticipantFromCalendar, saveCalendarOpeningHour, saveCalendarOpeningHoursBatch } from "./blazeoCalendarRelationMethods.js";
 import { createCalendarAsync, updateCalendarAsync, deleteCalendarAsync } from "./createCalendar.js";
 
 function isFailureStatus(res: any) {
@@ -8,7 +8,24 @@ function isFailureStatus(res: any) {
 
 function normalizeParticipantGuid(id: any) {
   if (id == null || !String(id).trim()) return undefined;
-  return String(id).trim().replace(/^\{|\}$/g, "");
+  return String(id).trim().replace(/^\{|\}$/g, "").toLowerCase();
+}
+
+/** Coerce MST / envelope shapes into a plain ID list for comparison. */
+function unwrapParticipantIds(raw: any): string[] {
+  if (raw == null) return [];
+  let list: any[] = [];
+  if (Array.isArray(raw)) {
+    list = raw;
+  } else {
+    const d = raw.data ?? raw.Data ?? raw.items ?? raw.Items ?? raw;
+    list = Array.isArray(d) ? d : (d?.items ?? d?.Items ?? []);
+  }
+  
+  return list.map(p => {
+    const id = p.participantId ?? p.ParticipantId ?? p.participant_id ?? p.id ?? p.Id;
+    return normalizeParticipantGuid(id);
+  }).filter(Boolean) as string[];
 }
 
 function newOpeningHourId() {
@@ -73,8 +90,34 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
     };
   }
 
+  // 1. Participant Reconciliation (Diff-based)
+  // Fetch current participants to see who needs to be removed
+  let currentParticipantIds: string[] = [];
+  try {
+    const currentRaw = await calendarNode.getParticipants();
+    currentParticipantIds = unwrapParticipantIds(currentRaw);
+  } catch (err) {
+    console.warn("[calendarCreation] Failed to fetch current participants for reconciliation. Proceeding with additive mode.", err);
+  }
+
+  const desiredMembers = calendar.members ?? [];
+  const desiredIds = new Set(desiredMembers.map((m: any) => normalizeParticipantGuid(m.id)).filter(Boolean));
+
+  // A. Remove missing members
+  for (const existingId of currentParticipantIds) {
+    if (!desiredIds.has(existingId)) {
+      try {
+        await removeParticipantFromCalendar(calendarNode, existingId);
+      } catch (err) {
+        console.warn(`[calendarCreation] Failed to remove participant ${existingId}:`, err);
+      }
+    }
+  }
+
+  // B. Add new members
+  const existingIdSet = new Set(currentParticipantIds);
   let membersAdded = 0;
-  for (const m of calendar.members ?? []) {
+  for (const m of desiredMembers) {
     const pid = normalizeParticipantGuid(m.id);
     if (!pid) {
       return {
@@ -82,19 +125,23 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
         error: `Member id ${m.id}: thirdPartyMemberId is required to add a participant.`,
       };
     }
-    const res = await addParticipantToCalendar(calendarNode, pid);
-    if (isFailureStatus(res)) {
-      const msg =
-        res.message ??
-        (typeof res.data === "string" ? res.data : undefined) ??
-        JSON.stringify(res);
-      return {
-        ok: false,
-        error: `addParticipant failed for member ${m.id}: ${msg}`,
-        apiResponse: res,
-      };
+
+    // Only add if not already there
+    if (!existingIdSet.has(pid)) {
+      const res = await addParticipantToCalendar(calendarNode, pid);
+      if (isFailureStatus(res)) {
+        const msg =
+          res.message ??
+          (typeof res.data === "string" ? res.data : undefined) ??
+          JSON.stringify(res);
+        return {
+          ok: false,
+          error: `addParticipant failed for member ${m.id}: ${msg}`,
+          apiResponse: res,
+        };
+      }
+      membersAdded += 1;
     }
-    membersAdded += 1;
   }
 
   // 2. Save Opening Hours (Plan V2: Grouped by participant with explicit off-days per slot)

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);
 }