Working ticket final update

apps/api/src/orders/cancel-order.ts

@@ -1,5 +1,5 @@
-import { canCancelOrder, orderCancellationBlockedMessage } from "@orderops/shared/order-status";
 import type { DatabaseContext } from "../db/database";
+import { canCancelOrder } from "./order-status";
 import { appendAuditEvent, findOrderDetail, updateOrderStatus } from "./order-repository";
 
 export async function cancelOrder(
@@ -17,7 +17,7 @@ export async function cancelOrder(
   }
 
   if (!canCancelOrder(order.status)) {
-    return { statusCode: 400, message: orderCancellationBlockedMessage } as const;
+    return { statusCode: 400, message: "Order cannot be cancelled for this order status." } as const;
   }
 
   const updatedAt = new Date().toISOString();

apps/api/src/orders/order-quantity-assignment-3.test.ts

@@ -2,12 +2,13 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import type { AppWithContext } from "../app";
 import { buildApp } from "../app";
 import { createUser } from "../users/user-repository";
+import { findOrderDetail, listOrderAuditEvents, updateOrderStatus } from "./order-repository";
 
 let app: AppWithContext;
 let employeeCookie = "";
 
 function firstHeader(value: string | string[] | undefined) {
-  return Array.isArray(value) ? value[0] : value ?? "";
+  return (Array.isArray(value) ? value[0] : value) ?? "";
 }
 
 async function login(username: string) {
@@ -43,29 +44,35 @@ describe("assignment 3 quantity validation", () => {
 
     expect(response.statusCode).toBe(200);
     expect(response.json().items.find((item: { id: string }) => item.id === "item_1")?.quantity).toBe(5);
+    const order = await findOrderDetail(app.dbContext, "order_1");
+    expect(order?.items.find((item) => item.id === "item_1")?.quantity).toBe(5);
+    const events = await listOrderAuditEvents(app.dbContext, "order_1");
+    expect(events.filter((event) => event.type === "order.item.quantity_changed")).toEqual([
+      expect.objectContaining({ actor: "dev-employee", message: "Updated item item_1 quantity to 5." })
+    ]);
   });
 
-  test("rejects quantity changes for processing orders", async () => {
+  for (const status of ["processing", "shipped", "cancelled", "refunded"] as const) {
+    test(`rejects quantity changes for ${status} orders without side effects`, async () => {
+      await updateOrderStatus(app.dbContext, "order_1", status, "2025-01-16T10:00:00.000Z");
+      const beforeOrder = await findOrderDetail(app.dbContext, "order_1");
+      const beforeEvents = await listOrderAuditEvents(app.dbContext, "order_1");
+
+      for (const payload of [{ quantity: 5 }, { quantity: 5, status: "pending" }]) {
         const response = await app.inject({
           method: "POST",
-      url: "/api/orders/order_2/items/item_3/quantity",
+          url: "/api/orders/order_1/items/item_1/quantity",
           headers: { cookie: employeeCookie },
-      payload: { quantity: 2 }
-    });
-
-    expect(response.statusCode).toBe(400);
-  });
-
-  test("rejects quantity changes for shipped orders", async () => {
-    const response = await app.inject({
-      method: "POST",
-      url: "/api/orders/order_3/items/item_4/quantity",
-      headers: { cookie: employeeCookie },
-      payload: { quantity: 1 }
+          payload
         });
 
         expect(response.statusCode).toBe(400);
+        expect(response.json<{ message: string }>()).toEqual({ message: "Order items cannot be changed for this order status." });
+        expect(await findOrderDetail(app.dbContext, "order_1")).toEqual(beforeOrder);
+        expect(await listOrderAuditEvents(app.dbContext, "order_1")).toEqual(beforeEvents);
+      }
     });
+  }
 
   test("rejects quantity outside the allowed range", async () => {
     const response = await app.inject({

apps/api/src/orders/order-repository.ts

@@ -117,14 +117,7 @@ export async function findOrderItemRecord(context: DatabaseContext, orderId: str
     .leftJoin(inventory, eq(orderItems.productId, inventory.productId))
     .where(and(eq(orderItems.id, itemId), eq(orderItems.orderId, orderId)));
 
-  if (!row) {
-    return null;
-  }
-
-  return {
-    ...row,
-    order: { ...row.order, status: row.order.status as OrderDetail["status"] }
-  };
+  return row ?? null;
 }
 
 export async function updateOrderItemQuantity(context: DatabaseContext, itemId: string, quantity: number) {

apps/api/src/orders/order-status-rules-assignment-4.test.ts

@@ -1,108 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import type { AppWithContext } from "../app";
-import { buildApp } from "../app";
-import { createUser } from "../users/user-repository";
-
-let app: AppWithContext;
-let employeeCookie = "";
-
-function firstHeader(value: string | string[] | undefined) {
-  return Array.isArray(value) ? value[0] : value ?? "";
-}
-
-async function login(username: string) {
-  const response = await app.inject({ method: "POST", url: "/api/login", payload: { username } });
-  return firstHeader(response.headers["set-cookie"]);
-}
-
-beforeEach(async () => {
-  app = await buildApp(":memory:");
-
-  await createUser(app.dbContext, {
-    username: "dev-employee",
-    name: "Dev Employee",
-    email: "dev.employee@example.com",
-    role: "employee"
-  });
-
-  employeeCookie = await login("dev-employee");
-});
-
-afterEach(async () => {
-  await app.close();
-});
-
-describe("assignment 4 order lifecycle rules", () => {
-  test("keeps quantity editing blocked for processing orders", async () => {
-    const response = await app.inject({
-      method: "POST",
-      url: "/api/orders/order_2/items/item_3/quantity",
-      headers: { cookie: employeeCookie },
-      payload: { quantity: 2 }
-    });
-
-    expect(response.statusCode).toBe(400);
-  });
-
-  test("allows address editing for processing orders", async () => {
-    const response = await app.inject({
-      method: "POST",
-      url: "/api/orders/order_2/shipping-address",
-      headers: { cookie: employeeCookie },
-      payload: {
-        fullName: "Jane Doe",
-        line1: "50 New Street",
-        line2: null,
-        city: "Oakland",
-        state: "CA",
-        postalCode: "94607",
-        country: "US"
-      }
-    });
-
-    expect(response.statusCode).toBe(200);
-    expect(response.json().shippingAddress.city).toBe("Oakland");
-  });
-
-  test("allows cancellation for processing orders", async () => {
-    const response = await app.inject({
-      method: "POST",
-      url: "/api/orders/order_2/cancel",
-      headers: { cookie: employeeCookie },
-      payload: { reason: "Customer request" }
-    });
-
-    expect(response.statusCode).toBe(200);
-    expect(response.json().status).toBe("cancelled");
-  });
-
-  test("blocks address editing for shipped orders", async () => {
-    const response = await app.inject({
-      method: "POST",
-      url: "/api/orders/order_3/shipping-address",
-      headers: { cookie: employeeCookie },
-      payload: {
-        fullName: "John Smith",
-        line1: "77 Final Mile Road",
-        line2: null,
-        city: "Denver",
-        state: "CO",
-        postalCode: "80202",
-        country: "US"
-      }
-    });
-
-    expect(response.statusCode).toBe(400);
-  });
-
-  test("blocks cancellation for shipped orders", async () => {
-    const response = await app.inject({
-      method: "POST",
-      url: "/api/orders/order_3/cancel",
-      headers: { cookie: employeeCookie },
-      payload: { reason: "Late request" }
-    });
-
-    expect(response.statusCode).toBe(400);
-  });
-});

apps/api/src/orders/order-status.ts

@@ -0,0 +1,13 @@
+import type { OrderStatus } from "@orderops/shared/order-status";
+
+export function canEditOrderItems(status: OrderStatus) {
+  return status === "pending";
+}
+
+export function canEditShippingAddress(status: OrderStatus) {
+  return status === "pending" || status === "processing";
+}
+
+export function canCancelOrder(status: OrderStatus) {
+  return status === "pending" || status === "processing";
+}

apps/api/src/orders/update-order-item.ts

@@ -1,5 +1,5 @@
-import { canEditOrderItems, orderItemsLockedMessage } from "@orderops/shared/order-status";
 import type { DatabaseContext } from "../db/database";
+import { canEditOrderItems } from "./order-status";
 import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderNotes as saveOrderNotes, updateOrderTimestamp } from "./order-repository";
 
 export async function changeOrderItemQuantity(
@@ -17,8 +17,8 @@ export async function changeOrderItemQuantity(
     return { statusCode: 404, message: "Order item not found." } as const;
   }
 
-  if (!canEditOrderItems(row.order.status)) {
-    return { statusCode: 400, message: orderItemsLockedMessage } as const;
+  if (!canEditOrderItems(row.order.status as never)) {
+    return { statusCode: 400, message: "Order items cannot be changed for this order status." } as const;
   }
 
   if (input.quantity < 1 || input.quantity > 10) {

apps/api/src/orders/update-shipping-address.ts

@@ -1,6 +1,6 @@
 import type { Address } from "@orderops/shared/address";
-import { canEditShippingAddress, shippingAddressLockedMessage } from "@orderops/shared/order-status";
 import type { DatabaseContext } from "../db/database";
+import { canEditShippingAddress } from "./order-status";
 import { appendAuditEvent, findOrderDetail, updateOrderAddress, updateOrderTimestamp } from "./order-repository";
 
 export async function changeShippingAddress(
@@ -18,7 +18,7 @@ export async function changeShippingAddress(
   }
 
   if (!canEditShippingAddress(order.status)) {
-    return { statusCode: 400, message: shippingAddressLockedMessage } as const;
+    return { statusCode: 400, message: "Shipping address cannot be changed for this order status." } as const;
   }
 
   const updatedAt = new Date().toISOString();

apps/web/src/orders/order-page.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { canEditOrderItems, orderItemsLockedMessage, type Address, type AuditEvent, type OrderDetail } from "@orderops/shared";
+import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
 import { Link, useParams } from "react-router-dom";
 import { Toast } from "../ui/toast";
 import { cancelOrder, getOrder, listAuditEvents, updateOrderItemQuantity, updateOrderNotes, updateShippingAddress } from "./order-api";
@@ -72,19 +72,6 @@ export function OrderPage() {
     }
   }
 
-  async function handleUpdateQuantity(itemId: string, quantity: number) {
-    if (!order) {
-      return;
-    }
-
-    if (!canEditOrderItems(order.status)) {
-      setToast({ message: orderItemsLockedMessage, variant: "error" });
-      return;
-    }
-
-    await runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.");
-  }
-
   return (
     <div className="space-y-4">
       <Link className="inline-flex text-sm font-medium text-blue-600 hover:text-blue-700" to="/orders">
@@ -97,7 +84,7 @@ export function OrderPage() {
         <OrderDetailPage
           order={order}
           auditEvents={auditEvents}
-          onUpdateQuantity={handleUpdateQuantity}
+          onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
           onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")}
           onSaveNotes={(notes) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
           onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")}

packages/shared/src/order-status.ts

@@ -1,23 +1,3 @@
 export const orderStatuses = ["pending", "processing", "shipped", "cancelled", "refunded"] as const;
 
 export type OrderStatus = (typeof orderStatuses)[number];
-
-const orderItemsEditableStatuses: readonly OrderStatus[] = ["pending"];
-const shippingAddressEditableStatuses: readonly OrderStatus[] = ["pending", "processing"];
-const orderCancellableStatuses: readonly OrderStatus[] = ["pending", "processing"];
-
-export const orderItemsLockedMessage = "Order items cannot be changed for this order status.";
-export const shippingAddressLockedMessage = "Shipping address cannot be changed for this order status.";
-export const orderCancellationBlockedMessage = "Order cannot be cancelled for this order status.";
-
-export function canEditOrderItems(status: OrderStatus) {
-  return orderItemsEditableStatuses.includes(status);
-}
-
-export function canEditShippingAddress(status: OrderStatus) {
-  return shippingAddressEditableStatuses.includes(status);
-}
-
-export function canCancelOrder(status: OrderStatus) {
-  return orderCancellableStatuses.includes(status);
-}