@blazeo.com/appointment-client 1.0.9 → 1.0.11

package/dist/calendar/buildUnifiedCalendarView.js

@@ -63,18 +63,33 @@ function dayOrderIndex(d) {
     const i = DAY_NAMES.indexOf(u);
     return i >= 0 ? i : 999;
 }
-/** Merge rows that share participant + time span + off into one row with combined `days`. */
+/** Merge rows that share participant + time span into one row with combined active `days`. */
 function mergeOpeningHoursBySlot(rows) {
     const map = new Map();
     for (const r of rows) {
-        const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute, r.off].join("|");
+        // Key excludes 'off' because we want to merge ON and OFF records for the same time slot
+        const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute].join("|");
         const existing = map.get(key);
+        // We only want to add the day to the 'days' array if it is NOT marked as OFF.
+        // If the whole record was marked as OFF, we still process it to establish the slot,
+        // but its days won't be listed as 'active'.
+        const activeDaysFromThisRow = r.off ? [] : r.days;
         if (!existing) {
-            map.set(key, { ...r, days: [...r.days] });
+            map.set(key, { ...r, days: [...activeDaysFromThisRow], off: false });
         }
         else {
-            const set = new Set([...existing.days, ...r.days]);
+            const set = new Set([...existing.days, ...activeDaysFromThisRow]);
             existing.days = Array.from(set).sort((a, b) => dayOrderIndex(a) - dayOrderIndex(b));
+            // If we encounter any record that is NOT off, the whole merged slot is NOT off.
+            if (!r.off)
+                existing.off = false;
+        }
+    }
+    // Final Pass: If a slot has NO active days, it should be marked as off: true 
+    // (though in Plan V2, these usually just disappear from the UI's 'days' list)
+    for (const group of map.values()) {
+        if (group.days.length === 0) {
+            group.off = true;
         }
     }
     rows.length = 0;

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,35 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar, calendarNode
                 startMinute: oh.startMinute,
                 endHour: oh.endHour,
                 endMinute: oh.endMinute,
-                off: oh.off,
-                openingHourId: oh.openingHourId?.trim() || newOpeningHourId(),
+                off: isOff,
+                // Plan V2 Optimization: Generate a unique ID for EVERY day record.
+                // This prevents the backend from deduplicating/overwriting when multiple 
+                // records for the same participant + slot are sent in one batch.
+                openingHourId: newOpeningHourId(),
+            });
+        }
+    }
+    let openingHoursSaved = 0;
+    for (const [participantId, payload] of hoursByParticipant.entries()) {
+        if (payload.length === 0)
+            continue;
+        // Plan V2 Optimization: Clear existing records for this participant first.
+        // This ensures that when we save the new batch (with unique per-day IDs), 
+        // we don't leak orphaned records or create duplicates during updates.
+        await calendarNode.removeParticipantOpeningHours(participantId);
+        // 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/package.json

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

package/src/calendar/buildUnifiedCalendarView.ts

@@ -91,19 +91,37 @@ function dayOrderIndex(d: string): number {
   return i >= 0 ? i : 999;
 }
 
-/** Merge rows that share participant + time span + off into one row with combined `days`. */
+/** Merge rows that share participant + time span into one row with combined active `days`. */
 function mergeOpeningHoursBySlot(rows: UnifiedOpeningHourRow[]) {
   const map = new Map<string, UnifiedOpeningHourRow>();
   for (const r of rows) {
-    const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute, r.off].join("|");
+    // Key excludes 'off' because we want to merge ON and OFF records for the same time slot
+    const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute].join("|");
     const existing = map.get(key);
+    
+    // We only want to add the day to the 'days' array if it is NOT marked as OFF.
+    // If the whole record was marked as OFF, we still process it to establish the slot,
+    // but its days won't be listed as 'active'.
+    const activeDaysFromThisRow = r.off ? [] : r.days;
+
     if (!existing) {
-      map.set(key, { ...r, days: [...r.days] });
+      map.set(key, { ...r, days: [...activeDaysFromThisRow], off: false });
     } else {
-      const set = new Set([...existing.days, ...r.days]);
+      const set = new Set([...existing.days, ...activeDaysFromThisRow]);
       existing.days = Array.from(set).sort((a, b) => dayOrderIndex(a) - dayOrderIndex(b));
+      // If we encounter any record that is NOT off, the whole merged slot is NOT off.
+      if (!r.off) existing.off = false;
+    }
+  }
+  
+  // Final Pass: If a slot has NO active days, it should be marked as off: true 
+  // (though in Plan V2, these usually just disappear from the UI's 'days' list)
+  for (const group of map.values()) {
+    if (group.days.length === 0) {
+      group.off = true;
     }
   }
+
   rows.length = 0;
   rows.push(...map.values());
 }

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,39 @@ 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,
+        // Plan V2 Optimization: Generate a unique ID for EVERY day record.
+        // This prevents the backend from deduplicating/overwriting when multiple 
+        // records for the same participant + slot are sent in one batch.
+        openingHourId: newOpeningHourId(),
+      });
+    }
+  }
+
+  let openingHoursSaved = 0;
+  for (const [participantId, payload] of hoursByParticipant.entries()) {
+    if (payload.length === 0) continue;
+
+    // Plan V2 Optimization: Clear existing records for this participant first.
+    // This ensures that when we save the new batch (with unique per-day IDs), 
+    // we don't leak orphaned records or create duplicates during updates.
+    await (calendarNode as any).removeParticipantOpeningHours(participantId);
+
+    // 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 {