Merge pull request #16 from peek-travel/fix/timeslot-active-resource-filter

fix: filter timeslot assigned resources to ACTIVE only

Author: oskarbruening

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@peektravel/app-utilities",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "GraphQL JS mapping utilities extracted from the Peek Pro Autopilot connector.",
   "license": "MIT",
   "repository": {

package.json

@@ -59,22 +59,26 @@ export function fromTimeslotNode(
   };
 }
 
+/** Only allocations with this status are considered assigned. */
+const ACTIVE_ALLOCATION_STATUS = "ACTIVE";
+
 function mapAssignedResources(
   allocations: TimeslotResourceAllocationNode[] | null | undefined,
 ): AssignedResource[] {
   if (!Array.isArray(allocations) || allocations.length === 0) {
     return [];
   }
 
-  return allocations.map((allocation) => {
-    const pool = allocation.resourcePool;
-    return {
-      name: pool?.name || "",
-      capacity: pool?.capacity ?? 0,
-      category: pool?.category || "",
-      quantity: allocation.quantity ?? 0,
-      status: allocation.status || "",
-      accountUserId: pool?.accountUser?.id ?? null,
-    };
-  });
+  return allocations
+    .filter((allocation) => allocation.status === ACTIVE_ALLOCATION_STATUS)
+    .map((allocation) => {
+      const pool = allocation.resourcePool;
+      return {
+        name: pool?.name || "",
+        capacity: pool?.capacity ?? 0,
+        category: pool?.category || "",
+        quantity: allocation.quantity ?? 0,
+        accountUserId: pool?.accountUser?.id ?? null,
+      };
+    });
 }

src/internal/timeslots/timeslot-converter.ts

@@ -42,8 +42,6 @@ export interface AssignedResource {
   category: string;
   /** Allocated quantity. */
   quantity: number;
-  /** Allocation status (e.g. `"ACTIVE"`). */
-  status: string;
   /** Backing account user id, or null. */
   accountUserId: string | null;
 }

src/models/timeslot.ts

@@ -53,7 +53,6 @@ describe("fromTimeslotNode", () => {
           capacity: 5,
           category: "guide",
           quantity: 1,
-          status: "ACTIVE",
           accountUserId: "u1",
         },
       ],
@@ -90,7 +89,7 @@ describe("fromTimeslotNode", () => {
       minuteLength: null,
       status: null,
       date: null,
-      inheritedResourceAllocations: [{ quantity: null, status: null, resourcePool: null }],
+      inheritedResourceAllocations: [{ quantity: null, status: "ACTIVE", resourcePool: null }],
     } as unknown as TimeslotNode;
 
     expect(fromTimeslotNode(node, "act-1")).toEqual({
@@ -107,7 +106,7 @@ describe("fromTimeslotNode", () => {
       date: "",
       startTime: null,
       assignedResources: [
-        { name: "", capacity: 0, category: "", quantity: 0, status: "", accountUserId: null },
+        { name: "", capacity: 0, category: "", quantity: 0, accountUserId: null },
       ],
     });
   });
@@ -116,6 +115,23 @@ describe("fromTimeslotNode", () => {
     const node = { ...fullNode, inheritedResourceAllocations: null } as unknown as TimeslotNode;
     expect(fromTimeslotNode(node, "act-1").assignedResources).toEqual([]);
   });
+
+  it("filters out allocations whose status is not ACTIVE", () => {
+    const node = {
+      ...fullNode,
+      inheritedResourceAllocations: [
+        ...(fullNode.inheritedResourceAllocations ?? []),
+        {
+          quantity: 1,
+          status: "REMOVAL",
+          resourcePool: { name: "Bob", category: "guide", capacity: 5, accountUser: { id: "u2" } },
+        },
+      ],
+    } as unknown as TimeslotNode;
+    const { assignedResources } = fromTimeslotNode(node, "act-1");
+    expect(assignedResources).toHaveLength(1);
+    expect(assignedResources[0].name).toBe("Ada");
+  });
 });
 
 describe("fromTimeslotNodes", () => {