Merge pull request #25 from peek-travel/feat/timeslot-resource-allocations-fallback

feat: fall back to regular resourceAllocations for timeslots

Author: oskarbruening

src/internal/peek/timeslots/timeslot-converter.ts

@@ -55,13 +55,28 @@ export function fromTimeslotNode(
     durationMin: node.minuteLength ?? 0,
     date: node.date || "",
     startTime: node.start ?? null,
-    assignedResources: mapAssignedResources(node.inheritedResourceAllocations),
+    assignedResources: mapAssignedResources(selectResourceAllocations(node)),
   };
 }
 
 /** Only allocations with this status are considered assigned. */
 const ACTIVE_ALLOCATION_STATUS = "ACTIVE";
 
+/**
+ * Timeslots may carry both inherited (schedule-level) and directly-assigned
+ * resource allocations. Prefer inherited; fall back to the regular allocations
+ * only when the inherited field is absent or empty.
+ */
+function selectResourceAllocations(
+  node: TimeslotNode,
+): TimeslotResourceAllocationNode[] | null | undefined {
+  const inherited = node.inheritedResourceAllocations;
+  if (Array.isArray(inherited) && inherited.length > 0) {
+    return inherited;
+  }
+  return node.resourceAllocations;
+}
+
 function mapAssignedResources(
   allocations: TimeslotResourceAllocationNode[] | null | undefined,
 ): AssignedResource[] {

src/internal/peek/timeslots/timeslot-queries.ts

@@ -21,9 +21,24 @@ export const TIMESLOTS_QUERY = `
           status
           date
           inheritedResourceAllocations {
+            id
+            status
+            quantity
+            resourcePool {
+              id
+              name
+              category
+              capacity
+              accountUser {
+                id
+              }
+            }
+          }
+          resourceAllocations {
             quantity
             status
             resourcePool {
+              id
               name
               category
               capacity
@@ -61,9 +76,24 @@ export const TIMESLOT_BY_ID_QUERY = `
           status
           date
           inheritedResourceAllocations {
+            id
+            status
+            quantity
+            resourcePool {
+              id
+              name
+              category
+              capacity
+              accountUser {
+                id
+              }
+            }
+          }
+          resourceAllocations {
             quantity
             status
             resourcePool {
+              id
               name
               category
               capacity
@@ -99,11 +129,17 @@ export const UPDATE_TIMESLOT_MUTATION = `
   }
 `;
 
-/** A single inherited resource allocation on a timeslot node. */
+/**
+ * A single resource allocation on a timeslot node. Shared by both the
+ * `inheritedResourceAllocations` and `resourceAllocations` selections; the
+ * allocation-level `id` is only present on the inherited variant.
+ */
 export interface TimeslotResourceAllocationNode {
+  id?: string | null;
   quantity: number | null;
   status: string | null;
   resourcePool: {
+    id: string;
     name: string;
     category: string;
     capacity: number | null;
@@ -125,6 +161,7 @@ export interface TimeslotNode {
   date: string | null;
   start?: string | null;
   inheritedResourceAllocations: TimeslotResourceAllocationNode[] | null;
+  resourceAllocations: TimeslotResourceAllocationNode[] | null;
 }
 
 /** `data` payload of {@link TIMESLOTS_QUERY}. */

test/peek/timeslots/timeslot-converter.test.ts

@@ -23,13 +23,15 @@ const fullNode: TimeslotNode = {
       quantity: 1,
       status: "ACTIVE",
       resourcePool: {
+        id: "rp-1",
         name: "Ada",
         category: "guide",
         capacity: 5,
         accountUser: { id: "u1" },
       },
     },
   ],
+  resourceAllocations: null,
 };
 
 describe("fromTimeslotNode", () => {
@@ -116,6 +118,74 @@ describe("fromTimeslotNode", () => {
     expect(fromTimeslotNode(node, "act-1").assignedResources).toEqual([]);
   });
 
+  it("falls back to resourceAllocations when inherited is null", () => {
+    const node = {
+      ...fullNode,
+      inheritedResourceAllocations: null,
+      resourceAllocations: [
+        {
+          quantity: 2,
+          status: "ACTIVE",
+          resourcePool: {
+            id: "rp-2",
+            name: "Bob",
+            category: "guide",
+            capacity: 3,
+            accountUser: { id: "u2" },
+          },
+        },
+      ],
+    } as unknown as TimeslotNode;
+    const { assignedResources } = fromTimeslotNode(node, "act-1");
+    expect(assignedResources).toEqual([
+      { name: "Bob", capacity: 3, category: "guide", quantity: 2, accountUserId: "u2" },
+    ]);
+  });
+
+  it("falls back to resourceAllocations when inherited is an empty array", () => {
+    const node = {
+      ...fullNode,
+      inheritedResourceAllocations: [],
+      resourceAllocations: [
+        {
+          quantity: 1,
+          status: "ACTIVE",
+          resourcePool: {
+            id: "rp-2",
+            name: "Bob",
+            category: "guide",
+            capacity: 3,
+            accountUser: { id: "u2" },
+          },
+        },
+      ],
+    } as unknown as TimeslotNode;
+    expect(fromTimeslotNode(node, "act-1").assignedResources).toHaveLength(1);
+    expect(fromTimeslotNode(node, "act-1").assignedResources[0].name).toBe("Bob");
+  });
+
+  it("prefers inherited over regular resourceAllocations when both are present", () => {
+    const node = {
+      ...fullNode,
+      resourceAllocations: [
+        {
+          quantity: 9,
+          status: "ACTIVE",
+          resourcePool: {
+            id: "rp-2",
+            name: "Bob",
+            category: "guide",
+            capacity: 3,
+            accountUser: { id: "u2" },
+          },
+        },
+      ],
+    } as unknown as TimeslotNode;
+    const { assignedResources } = fromTimeslotNode(node, "act-1");
+    expect(assignedResources).toHaveLength(1);
+    expect(assignedResources[0].name).toBe("Ada");
+  });
+
   it("filters out allocations whose status is not ACTIVE", () => {
     const node = {
       ...fullNode,