Merge pull request 'Feature Internal Order Notes' (#12) from feat/dg-2-internal-order-notes into master

Reviewed-on: #12

.github/pull_request_template.md

@@ -5,7 +5,6 @@ Describe problem and user or business impact.
 ## Ticket / Assignment
 
 - Ticket:
-- Assignment:
 
 ## What changed
 
@@ -18,7 +17,6 @@ Describe problem and user or business impact.
 List exact commands and manual checks.
 
 ```bash
-bun run check
 bun run test
 bun run build:web
 ```

.gitignore

@@ -8,3 +8,4 @@ bun.lock
 *.sqlite-wal
 dist
 coverage
+pi-session*

AGENTS.md

@@ -1,5 +1,9 @@
 # Typescript Full Stack App Agent
 
+## Coding Conventions
+- Before planning any code plan, check the `CONTRIBUTING.md` file in the root directory of the project to understand and apply coding conventions for this project
+- Instead of reading and parsing the `CONTRIBUTING.md` every time, cache the findings of `CONTRIBUTING.md` and refer to this cache'd file whenever checking the conventions is required
+
 ## Output Rules
 
 ### Response Style
@@ -176,4 +180,3 @@ Skip `discover_context` for narrow tasks with explicit file targets.
 ### Boundaries
 - Recon is read-only unless user requested implementation.
 - Do not treat scout output as complete when evidence suggests missing files.
-

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

@@ -90,7 +90,7 @@ export function initializeDatabase(sqlite: Database) {
       customer_id TEXT NOT NULL REFERENCES users(id),
       shipping_address_id TEXT NOT NULL REFERENCES addresses(id),
       status TEXT NOT NULL,
-      notes TEXT NOT NULL DEFAULT '',
+      notes TEXT,
       created_at TEXT NOT NULL,
       updated_at TEXT NOT NULL
     );
@@ -121,7 +121,7 @@ export function initializeDatabase(sqlite: Database) {
     );
   `);
 
-  if (tableExists(sqlite, "orders") && !columnExists(sqlite, "orders", "notes")) {
+  if (!columnExists(sqlite, "orders", "notes")) {
-    sqlite.exec(`ALTER TABLE orders ADD COLUMN notes TEXT NOT NULL DEFAULT ''`);
+    sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT");
   }
 }

apps/api/src/db/schema/orders.ts

@@ -9,7 +9,7 @@ export const orders = sqliteTable("orders", {
   customerId: text("customer_id").notNull().references(() => users.id),
   shippingAddressId: text("shipping_address_id").notNull().references(() => addresses.id),
   status: text("status").notNull(),
-  notes: text("notes").notNull().default(""),
+  notes: text("notes"),
   createdAt: text("created_at").notNull(),
   updatedAt: text("updated_at").notNull()
 });

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

@@ -35,13 +35,13 @@ function toOrderItemDetail(row: {
 }
 
 export async function listOrderSummaries(context: DatabaseContext, query?: string) {
-  const search = query?.trim();
+  const search = query?.trim().toLowerCase();
 
   const filters = search
     ? or(
-        sql`instr(lower(${orders.orderNumber}), lower(${search})) > 0`,
+        sql`instr(lower(${orders.orderNumber}), ${search}) > 0`,
-        sql`instr(lower(${users.name}), lower(${search})) > 0`,
+        sql`instr(lower(${users.name}), ${search}) > 0`,
-        sql`instr(lower(${users.email}), lower(${search})) > 0`
+        sql`instr(lower(${users.email}), ${search}) > 0`
       )
     : undefined;
 
@@ -96,9 +96,9 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
     id: header.order.id,
     orderNumber: header.order.orderNumber,
     status: header.order.status as OrderDetail["status"],
-    notes: header.order.notes,
     createdAt: header.order.createdAt,
     updatedAt: header.order.updatedAt,
+    notes: header.order.notes,
     customer: {
       id: header.customer.id,
       name: header.customer.name,
@@ -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-notes";
 import { changeShippingAddress } from "./update-shipping-address";
 
 interface OrderRouteOptions {
@@ -30,14 +29,14 @@ interface QuantityBody {
   quantity: number;
 }
 
-interface NotesBody {
-  notes: string;
-}
-
 interface CancelBody {
   reason?: string;
 }
 
+interface NotesBody {
+  notes: string;
+}
+
 type AuthenticatedRequest = FastifyRequest & { currentUser: AuthUser };
 
 export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async (app, options) => {
@@ -106,13 +105,13 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
         type: "object",
         required: ["notes"],
         properties: {
-          notes: { type: "string" }
+          notes: { type: "string", maxLength: 1000 }
         }
       }
     }
   }, async (request, reply) => {
     const currentUser = (request as AuthenticatedRequest).currentUser;
-    const result = await changeOrderNotes(options.db, {
+    const result = await updateOrderNotes(options.db, {
       orderId: request.params.orderId,
       notes: request.body.notes,
       actor: currentUser.username

apps/api/src/orders/order-search-assignment-1.test.ts

@@ -7,7 +7,7 @@ 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) {

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

@@ -1,44 +0,0 @@
-import type { DatabaseContext } from "../db/database";
-import { appendAuditEvent, findOrderDetail, updateOrderNotes } from "./order-repository";
-
-export const NOTES_MAX_LENGTH = 1000;
-
-export async function changeOrderNotes(
-  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.length === 0) {
-    return { statusCode: 400, message: "Notes cannot be empty." } as const;
-  }
-
-  if (notes.length > NOTES_MAX_LENGTH) {
-    return { statusCode: 400, message: `Notes cannot exceed ${NOTES_MAX_LENGTH} characters.` } 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/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/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";
+import { OrderNotes } from "./order-notes";
 import { OrderSummaryPanel } from "./order-summary";
 import { ShippingAddressForm } from "./shipping-address-form";
 
@@ -25,7 +25,6 @@ export function OrderDetailPage({
   return (
     <div className="space-y-4">
       <OrderSummaryPanel order={order} />
-      <OrderNotesPanel notes={order.notes} onSave={onSaveNotes} />
       <div className="flex justify-end">
         <button className="rounded-md bg-red-600 px-4 py-2 text-sm font-medium text-white" onClick={() => void onCancel()} type="button">
           Cancel order
@@ -33,6 +32,7 @@ export function OrderDetailPage({
       </div>
       <OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
       <ShippingAddressForm order={order} onSave={onSaveAddress} />
+      <OrderNotes order={order} onSave={onSaveNotes} />
       <AuditTimeline events={auditEvents} />
     </div>
   );

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

@@ -1,60 +1,37 @@
 import { useState } from "react";
-
+import type { OrderDetail } from "@orderops/shared";
-export const NOTES_MAX_LENGTH = 1000;
 
 interface OrderNotesProps {
-  notes: string;
+  order: OrderDetail;
   onSave: (notes: string) => Promise<void>;
 }
 
-export function OrderNotesPanel({ notes, onSave }: OrderNotesProps) {
+export function OrderNotes({ order, onSave }: OrderNotesProps) {
-  const [draft, setDraft] = useState(notes);
+  const [notes, setNotes] = useState(order.notes ?? "");
-  const [isSaving, setIsSaving] = useState(false);
-  const trimmed = draft.trim();
-  const isDisabled = isSaving || trimmed.length === 0 || trimmed === notes;
-
-  async function handleSave() {
-    if (isDisabled) {
-      return;
-    }
-
-    setIsSaving(true);
-    try {
-      await onSave(trimmed);
-    } finally {
-      setIsSaving(false);
-    }
-  }
 
   return (
     <section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm">
-      <div className="mb-3 flex items-center justify-between">
+      <h3 className="mb-3 text-sm font-semibold text-slate-700">Internal notes</h3>
-        <h3 className="text-sm font-semibold text-slate-700">Internal notes</h3>
+      <form
-        <span className="text-xs text-slate-500">{draft.length}/{NOTES_MAX_LENGTH}</span>
+        className="space-y-3"
-      </div>
+        onSubmit={async (event) => {
-      {notes ? (
+          event.preventDefault();
-        <p className="mb-3 whitespace-pre-wrap text-sm text-slate-700">{notes}</p>
+          await onSave(notes);
-      ) : (
+        }}
-        <p className="mb-3 text-sm text-slate-400">No internal notes yet. Add context for teammates following up on this order.</p>
+      >
-      )}
+        <label className="block text-sm text-slate-700">
-      <textarea
+          <span className="mb-1 block">Notes</span>
-        className="w-full resize-y rounded-lg border border-slate-300 px-3 py-2 text-sm text-slate-900 focus:border-blue-500 focus:outline-none"
+          <textarea
-        maxLength={NOTES_MAX_LENGTH}
+            className="w-full resize-none rounded-lg border border-slate-300 px-3 py-2"
-        onChange={(event) => setDraft(event.target.value)}
+            rows={5}
-        placeholder="Add internal notes..."
+            value={notes}
-        rows={3}
+            onChange={(event) => setNotes(event.target.value)}
-        value={draft}
+          />
-      />
+        </label>
-      <div className="mt-3 flex justify-end">
+        <button className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white" type="submit">
-        <button
+          Save notes
-          className="rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white disabled:cursor-not-allowed disabled:opacity-50"
-          disabled={isDisabled}
-          onClick={() => void handleSave()}
-          type="button"
-        >
-          {isSaving ? "Saving..." : "Save notes"}
         </button>
-      </div>
+      </form>
     </section>
   );
 }

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

@@ -86,7 +86,7 @@ export function OrderPage() {
           auditEvents={auditEvents}
           onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
           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

@@ -17,9 +17,9 @@ export interface OrderDetail {
   id: string;
   orderNumber: string;
   status: OrderStatus;
-  notes: string;
   createdAt: string;
   updatedAt: string;
+  notes: string | null;
   customer: CustomerSummary;
   shippingAddress: Address;
   items: OrderItemDetail[];