update:item quantity change conditional

Reviewed-on: #12

CONTRIBUTING.md

@@ -28,7 +28,6 @@ bun run dev:web
 Common checks:
 
 ```bash
-bun run check
 bun run test
 bun run build:web
 ```

apps/api/src/db/init-db.ts

@@ -121,8 +121,7 @@ export function initializeDatabase(sqlite: Database) {
     );
   `);
 
-  // Databases created before internal order notes existed keep their orders table, so add the column in place.
   if (!columnExists(sqlite, "orders", "notes")) {
-    sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT;");
+    sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT");
   }
 }

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

@@ -0,0 +1,91 @@
+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 3 quantity validation", () => {
+  test("allows quantity changes for pending orders", async () => {
+    const response = await app.inject({
+      method: "POST",
+      url: "/api/orders/order_1/items/item_1/quantity",
+      headers: { cookie: employeeCookie },
+      payload: { quantity: 5 }
+    });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.json().items.find((item: { id: string }) => item.id === "item_1")?.quantity).toBe(5);
+  });
+
+  test("rejects quantity changes 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("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 }
+    });
+
+    expect(response.statusCode).toBe(400);
+  });
+
+  test("rejects quantity outside the allowed range", async () => {
+    const response = await app.inject({
+      method: "POST",
+      url: "/api/orders/order_1/items/item_1/quantity",
+      headers: { cookie: employeeCookie },
+      payload: { quantity: 0 }
+    });
+
+    expect(response.statusCode).toBe(400);
+  });
+
+  test("rejects quantity above effective inventory", async () => {
+    const response = await app.inject({
+      method: "POST",
+      url: "/api/orders/order_1/items/item_1/quantity",
+      headers: { cookie: employeeCookie },
+      payload: { quantity: 9 }
+    });
+
+    expect(response.statusCode).toBe(400);
+  });
+});

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

@@ -98,14 +98,14 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
     status: header.order.status as OrderDetail["status"],
     createdAt: header.order.createdAt,
     updatedAt: header.order.updatedAt,
+    notes: header.order.notes,
     customer: {
       id: header.customer.id,
       name: header.customer.name,
       email: header.customer.email
     },
     shippingAddress: toAddress(header.address),
-    items: itemRows.map(toOrderItemDetail),
+    items: itemRows.map(toOrderItemDetail)
-    notes: header.order.notes
   } satisfies OrderDetail;
 }
 
@@ -124,6 +124,10 @@ export async function updateOrderItemQuantity(context: DatabaseContext, itemId:
   await context.db.update(orderItems).set({ quantity }).where(eq(orderItems.id, itemId));
 }
 
+export async function updateOrderNotes(context: DatabaseContext, orderId: string, notes: string) {
+  await context.db.update(orders).set({ notes }).where(eq(orders.id, orderId));
+}
+
 export async function updateOrderTimestamp(context: DatabaseContext, orderId: string, updatedAt: string) {
   await context.db.update(orders).set({ updatedAt }).where(eq(orders.id, orderId));
 }
@@ -132,10 +136,6 @@ export async function updateOrderStatus(context: DatabaseContext, orderId: strin
   await context.db.update(orders).set({ status, updatedAt }).where(eq(orders.id, orderId));
 }
 
-export async function updateOrderNotes(context: DatabaseContext, orderId: string, notes: string, updatedAt: string) {
-  await context.db.update(orders).set({ notes, updatedAt }).where(eq(orders.id, orderId));
-}
-
 export async function updateOrderAddress(context: DatabaseContext, orderId: string, address: Address) {
   const [row] = await context.db.select({ shippingAddressId: orders.shippingAddressId }).from(orders).where(eq(orders.id, orderId));
 

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

@@ -6,8 +6,7 @@ import { cancelOrder } from "./cancel-order";
 import { getOrder } from "./get-order";
 import { listAuditEvents } from "./list-audit-events";
 import { listOrders } from "./list-orders";
-import { changeOrderItemQuantity } from "./update-order-item";
+import { changeOrderItemQuantity, updateOrderNotes } from "./update-order-item";
-import { changeOrderNotes } from "./update-order-notes";
 import { changeShippingAddress } from "./update-shipping-address";
 
 interface OrderRouteOptions {
@@ -100,6 +99,31 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
     return result.order;
   });
 
+  app.post<{ Params: IdParams; Body: NotesBody }>("/orders/:orderId/notes", {
+    schema: {
+      body: {
+        type: "object",
+        required: ["notes"],
+        properties: {
+          notes: { type: "string", maxLength: 1000 }
+        }
+      }
+    }
+  }, async (request, reply) => {
+    const currentUser = (request as AuthenticatedRequest).currentUser;
+    const result = await updateOrderNotes(options.db, {
+      orderId: request.params.orderId,
+      notes: request.body.notes,
+      actor: currentUser.username
+    });
+
+    if (result.statusCode !== 200) {
+      return reply.code(result.statusCode).send({ message: result.message });
+    }
+
+    return result.order;
+  });
+
   app.post<{ Params: IdParams; Body: Address }>("/orders/:orderId/shipping-address", {
     schema: {
       body: {
@@ -139,31 +163,6 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
     return result.order;
   });
 
-  app.post<{ Params: IdParams; Body: NotesBody }>("/orders/:orderId/notes", {
-    schema: {
-      body: {
-        type: "object",
-        required: ["notes"],
-        properties: {
-          notes: { type: "string" }
-        }
-      }
-    }
-  }, async (request, reply) => {
-    const currentUser = (request as AuthenticatedRequest).currentUser;
-    const result = await changeOrderNotes(options.db, {
-      orderId: request.params.orderId,
-      notes: request.body.notes,
-      actor: currentUser.username
-    });
-
-    if (result.statusCode !== 200) {
-      return reply.code(result.statusCode).send({ message: result.message });
-    }
-
-    return result.order;
-  });
-
   app.post<{ Params: IdParams; Body: CancelBody }>("/orders/:orderId/cancel", {
     schema: {
       body: {

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

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

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

@@ -1,6 +1,6 @@
 import type { DatabaseContext } from "../db/database";
 import { canEditOrderItems } from "./order-status";
-import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderTimestamp } from "./order-repository";
+import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderNotes as saveOrderNotes, updateOrderTimestamp } from "./order-repository";
 
 export async function changeOrderItemQuantity(
   context: DatabaseContext,
@@ -47,3 +47,44 @@ export async function changeOrderItemQuantity(
     order: await findOrderDetail(context, input.orderId)
   } as const;
 }
+
+export async function updateOrderNotes(
+  context: DatabaseContext,
+  input: {
+    orderId: string;
+    notes: string;
+    actor: string;
+  }
+) {
+  const order = await findOrderDetail(context, input.orderId);
+
+  if (!order) {
+    return { statusCode: 404, message: "Order not found." } as const;
+  }
+
+  const notes = input.notes.trim();
+
+  if (!notes) {
+    return { statusCode: 400, message: "Notes cannot be empty." } as const;
+  }
+
+  if (notes.length > 1000) {
+    return { statusCode: 400, message: "Notes must be 1000 characters or fewer." } as const;
+  }
+
+  const updatedAt = new Date().toISOString();
+  await saveOrderNotes(context, input.orderId, notes);
+  await updateOrderTimestamp(context, input.orderId, updatedAt);
+  await appendAuditEvent(context, {
+    orderId: input.orderId,
+    actor: input.actor,
+    type: "order.notes_updated",
+    message: "Updated internal order notes.",
+    createdAt: updatedAt
+  });
+
+  return {
+    statusCode: 200,
+    order: await findOrderDetail(context, input.orderId)
+  } as const;
+}

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

@@ -1,43 +0,0 @@
-import { maxOrderNotesLength } from "@orderops/shared";
-import type { DatabaseContext } from "../db/database";
-import { appendAuditEvent, findOrderDetail, updateOrderNotes } from "./order-repository";
-
-export async function changeOrderNotes(
-  context: DatabaseContext,
-  input: {
-    orderId: string;
-    notes: string;
-    actor: string;
-  }
-) {
-  const notes = input.notes.trim();
-
-  if (!notes) {
-    return { statusCode: 400, message: "Notes cannot be empty." } as const;
-  }
-
-  if (notes.length > maxOrderNotesLength) {
-    return { statusCode: 400, message: `Notes cannot be longer than ${maxOrderNotesLength} characters.` } as const;
-  }
-
-  const order = await findOrderDetail(context, input.orderId);
-
-  if (!order) {
-    return { statusCode: 404, message: "Order not found." } as const;
-  }
-
-  const updatedAt = new Date().toISOString();
-  await updateOrderNotes(context, input.orderId, notes, updatedAt);
-  await appendAuditEvent(context, {
-    orderId: input.orderId,
-    actor: input.actor,
-    type: "order.notes_updated",
-    message: "Updated internal notes.",
-    createdAt: updatedAt
-  });
-
-  return {
-    statusCode: 200,
-    order: await findOrderDetail(context, input.orderId)
-  } as const;
-}

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

@@ -21,13 +21,6 @@ export function updateOrderItemQuantity(orderId: string, itemId: string, quantit
   });
 }
 
-export function updateShippingAddress(orderId: string, address: Address) {
-  return apiRequest<OrderDetail>(`/api/orders/${orderId}/shipping-address`, {
-    method: "POST",
-    body: JSON.stringify(address)
-  });
-}
-
 export function updateOrderNotes(orderId: string, notes: string) {
   return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
     method: "POST",
@@ -35,6 +28,13 @@ export function updateOrderNotes(orderId: string, notes: string) {
   });
 }
 
+export function updateShippingAddress(orderId: string, address: Address) {
+  return apiRequest<OrderDetail>(`/api/orders/${orderId}/shipping-address`, {
+    method: "POST",
+    body: JSON.stringify(address)
+  });
+}
+
 export function cancelOrder(orderId: string, reason?: string) {
   return apiRequest<OrderDetail>(`/api/orders/${orderId}/cancel`, {
     method: "POST",

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

@@ -1,7 +1,7 @@
 import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
 import { AuditTimeline } from "./audit-timeline";
 import { OrderItemsPanel } from "./order-items-panel";
-import { OrderNotesPanel } from "./order-notes-panel";
+import { OrderNotes } from "./order-notes";
 import { OrderSummaryPanel } from "./order-summary";
 import { ShippingAddressForm } from "./shipping-address-form";
 
@@ -32,8 +32,8 @@ export function OrderDetailPage({
       </div>
       <OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
       <ShippingAddressForm order={order} onSave={onSaveAddress} />
+      <OrderNotes order={order} onSave={onSaveNotes} />
       <AuditTimeline events={auditEvents} />
-      <OrderNotesPanel order={order} onSave={onSaveNotes} />
     </div>
   );
 }

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

@@ -1,12 +1,12 @@
 import { useState } from "react";
-import { maxOrderNotesLength, type OrderDetail } from "@orderops/shared";
+import type { OrderDetail } from "@orderops/shared";
 
-interface OrderNotesPanelProps {
+interface OrderNotesProps {
   order: OrderDetail;
   onSave: (notes: string) => Promise<void>;
 }
 
-export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
+export function OrderNotes({ order, onSave }: OrderNotesProps) {
   const [notes, setNotes] = useState(order.notes ?? "");
 
   return (
@@ -20,20 +20,15 @@ export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
         }}
       >
         <label className="block text-sm text-slate-700">
-          <span className="mb-1 block">Notes for the OrderOps team</span>
+          <span className="mb-1 block">Notes</span>
           <textarea
-            className="w-full rounded-lg border border-slate-300 px-3 py-2"
+            className="w-full resize-none rounded-lg border border-slate-300 px-3 py-2"
-            maxLength={maxOrderNotesLength}
+            rows={5}
-            rows={4}
             value={notes}
             onChange={(event) => setNotes(event.target.value)}
           />
         </label>
-        <button
+        <button className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white" type="submit">
-          className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white disabled:opacity-50"
-          disabled={!notes.trim()}
-          type="submit"
-        >
           Save notes
         </button>
       </form>

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

@@ -72,6 +72,19 @@ export function OrderPage() {
     }
   }
 
+  async function handleUpdateQuantity(itemId: string, quantity: number) {
+    if (!order) {
+      return;
+    }
+
+    if (order.status !== "pending") {
+      setToast({ message: "Order items cannot be changed for this order status.", 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">
@@ -84,9 +97,9 @@ export function OrderPage() {
         <OrderDetailPage
           order={order}
           auditEvents={auditEvents}
-          onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
+          onUpdateQuantity={handleUpdateQuantity}
           onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")}
-          onSaveNotes={(notes: string) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
+          onSaveNotes={(notes) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
           onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")}
         />
       ) : null}

packages/shared/src/order-detail.ts

@@ -3,9 +3,6 @@ import type { CustomerSummary } from "./customer";
 import type { Money } from "./money";
 import type { OrderStatus } from "./order-status";
 
-// Internal order notes are capped so they stay a short follow-up context, not a document.
-export const maxOrderNotesLength = 1000;
-
 export interface OrderItemDetail {
   id: string;
   productId: string;
@@ -22,8 +19,8 @@ export interface OrderDetail {
   status: OrderStatus;
   createdAt: string;
   updatedAt: string;
+  notes: string | null;
   customer: CustomerSummary;
   shippingAddress: Address;
   items: OrderItemDetail[];
-  notes: string | null;
 }