Compare commits

..
Author SHA1 Message Date
Abdulaziz Salim Said AL-GharbiandClaude Opus 5.5 bfe60631a5 add:internal order notes for employees
Runner Test / test (push) Successful in 16s
Runner Test / test (pull_request) Successful in 17s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-09-24 20:24:10 +04:00
14 changed files with 108 additions and 193 deletions
+1
View File
@@ -28,6 +28,7 @@ bun run dev:web
Common checks: Common checks:
```bash ```bash
bun run check
bun run test bun run test
bun run build:web bun run build:web
``` ```
+2 -1
View File
@@ -121,7 +121,8 @@ 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")) { if (!columnExists(sqlite, "orders", "notes")) {
sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT"); sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT;");
} }
} }
@@ -1,98 +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";
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) ?? "";
}
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);
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." })
]);
});
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_1/items/item_1/quantity",
headers: { cookie: employeeCookie },
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({
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);
});
});
+6 -6
View File
@@ -98,14 +98,14 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
status: header.order.status as OrderDetail["status"], status: header.order.status as OrderDetail["status"],
createdAt: header.order.createdAt, createdAt: header.order.createdAt,
updatedAt: header.order.updatedAt, updatedAt: header.order.updatedAt,
notes: header.order.notes,
customer: { customer: {
id: header.customer.id, id: header.customer.id,
name: header.customer.name, name: header.customer.name,
email: header.customer.email email: header.customer.email
}, },
shippingAddress: toAddress(header.address), shippingAddress: toAddress(header.address),
items: itemRows.map(toOrderItemDetail) items: itemRows.map(toOrderItemDetail),
notes: header.order.notes
} satisfies OrderDetail; } satisfies OrderDetail;
} }
@@ -124,10 +124,6 @@ export async function updateOrderItemQuantity(context: DatabaseContext, itemId:
await context.db.update(orderItems).set({ quantity }).where(eq(orderItems.id, 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) { export async function updateOrderTimestamp(context: DatabaseContext, orderId: string, updatedAt: string) {
await context.db.update(orders).set({ updatedAt }).where(eq(orders.id, orderId)); await context.db.update(orders).set({ updatedAt }).where(eq(orders.id, orderId));
} }
@@ -136,6 +132,10 @@ export async function updateOrderStatus(context: DatabaseContext, orderId: strin
await context.db.update(orders).set({ status, updatedAt }).where(eq(orders.id, orderId)); 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) { 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)); const [row] = await context.db.select({ shippingAddressId: orders.shippingAddressId }).from(orders).where(eq(orders.id, orderId));
+27 -26
View File
@@ -6,7 +6,8 @@ import { cancelOrder } from "./cancel-order";
import { getOrder } from "./get-order"; import { getOrder } from "./get-order";
import { listAuditEvents } from "./list-audit-events"; import { listAuditEvents } from "./list-audit-events";
import { listOrders } from "./list-orders"; import { listOrders } from "./list-orders";
import { changeOrderItemQuantity, updateOrderNotes } from "./update-order-item"; import { changeOrderItemQuantity } from "./update-order-item";
import { changeOrderNotes } from "./update-order-notes";
import { changeShippingAddress } from "./update-shipping-address"; import { changeShippingAddress } from "./update-shipping-address";
interface OrderRouteOptions { interface OrderRouteOptions {
@@ -99,31 +100,6 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
return result.order; 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", { app.post<{ Params: IdParams; Body: Address }>("/orders/:orderId/shipping-address", {
schema: { schema: {
body: { body: {
@@ -163,6 +139,31 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
return result.order; 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", { app.post<{ Params: IdParams; Body: CancelBody }>("/orders/:orderId/cancel", {
schema: { schema: {
body: { body: {
+1 -1
View File
@@ -1,7 +1,7 @@
import type { OrderStatus } from "@orderops/shared/order-status"; import type { OrderStatus } from "@orderops/shared/order-status";
export function canEditOrderItems(status: OrderStatus) { export function canEditOrderItems(status: OrderStatus) {
return status === "pending"; return status === "pending" || status === "processing";
} }
export function canEditShippingAddress(status: OrderStatus) { export function canEditShippingAddress(status: OrderStatus) {
+1 -42
View File
@@ -1,6 +1,6 @@
import type { DatabaseContext } from "../db/database"; import type { DatabaseContext } from "../db/database";
import { canEditOrderItems } from "./order-status"; import { canEditOrderItems } from "./order-status";
import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderNotes as saveOrderNotes, updateOrderTimestamp } from "./order-repository"; import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderTimestamp } from "./order-repository";
export async function changeOrderItemQuantity( export async function changeOrderItemQuantity(
context: DatabaseContext, context: DatabaseContext,
@@ -47,44 +47,3 @@ export async function changeOrderItemQuantity(
order: await findOrderDetail(context, input.orderId) order: await findOrderDetail(context, input.orderId)
} as const; } 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;
}
+43
View File
@@ -0,0 +1,43 @@
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;
}
File diff suppressed because one or more lines are too long
+7 -7
View File
@@ -21,13 +21,6 @@ export function updateOrderItemQuantity(orderId: string, itemId: string, quantit
}); });
} }
export function updateOrderNotes(orderId: string, notes: string) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
method: "POST",
body: JSON.stringify({ notes })
});
}
export function updateShippingAddress(orderId: string, address: Address) { export function updateShippingAddress(orderId: string, address: Address) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/shipping-address`, { return apiRequest<OrderDetail>(`/api/orders/${orderId}/shipping-address`, {
method: "POST", method: "POST",
@@ -35,6 +28,13 @@ export function updateShippingAddress(orderId: string, address: Address) {
}); });
} }
export function updateOrderNotes(orderId: string, notes: string) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
method: "POST",
body: JSON.stringify({ notes })
});
}
export function cancelOrder(orderId: string, reason?: string) { export function cancelOrder(orderId: string, reason?: string) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/cancel`, { return apiRequest<OrderDetail>(`/api/orders/${orderId}/cancel`, {
method: "POST", method: "POST",
+2 -2
View File
@@ -1,7 +1,7 @@
import type { Address, AuditEvent, OrderDetail } from "@orderops/shared"; import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
import { AuditTimeline } from "./audit-timeline"; import { AuditTimeline } from "./audit-timeline";
import { OrderItemsPanel } from "./order-items-panel"; import { OrderItemsPanel } from "./order-items-panel";
import { OrderNotes } from "./order-notes"; import { OrderNotesPanel } from "./order-notes-panel";
import { OrderSummaryPanel } from "./order-summary"; import { OrderSummaryPanel } from "./order-summary";
import { ShippingAddressForm } from "./shipping-address-form"; import { ShippingAddressForm } from "./shipping-address-form";
@@ -32,8 +32,8 @@ export function OrderDetailPage({
</div> </div>
<OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} /> <OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
<ShippingAddressForm order={order} onSave={onSaveAddress} /> <ShippingAddressForm order={order} onSave={onSaveAddress} />
<OrderNotes order={order} onSave={onSaveNotes} />
<AuditTimeline events={auditEvents} /> <AuditTimeline events={auditEvents} />
<OrderNotesPanel order={order} onSave={onSaveNotes} />
</div> </div>
); );
} }
@@ -1,12 +1,12 @@
import { useState } from "react"; import { useState } from "react";
import type { OrderDetail } from "@orderops/shared"; import { maxOrderNotesLength, type OrderDetail } from "@orderops/shared";
interface OrderNotesProps { interface OrderNotesPanelProps {
order: OrderDetail; order: OrderDetail;
onSave: (notes: string) => Promise<void>; onSave: (notes: string) => Promise<void>;
} }
export function OrderNotes({ order, onSave }: OrderNotesProps) { export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
const [notes, setNotes] = useState(order.notes ?? ""); const [notes, setNotes] = useState(order.notes ?? "");
return ( return (
@@ -20,15 +20,20 @@ export function OrderNotes({ order, onSave }: OrderNotesProps) {
}} }}
> >
<label className="block text-sm text-slate-700"> <label className="block text-sm text-slate-700">
<span className="mb-1 block">Notes</span> <span className="mb-1 block">Notes for the OrderOps team</span>
<textarea <textarea
className="w-full resize-none rounded-lg border border-slate-300 px-3 py-2" className="w-full rounded-lg border border-slate-300 px-3 py-2"
rows={5} maxLength={maxOrderNotesLength}
rows={4}
value={notes} value={notes}
onChange={(event) => setNotes(event.target.value)} onChange={(event) => setNotes(event.target.value)}
/> />
</label> </label>
<button className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white" type="submit"> <button
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 Save notes
</button> </button>
</form> </form>
+1 -1
View File
@@ -86,7 +86,7 @@ export function OrderPage() {
auditEvents={auditEvents} auditEvents={auditEvents}
onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")} onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")} onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")}
onSaveNotes={(notes) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")} onSaveNotes={(notes: string) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")} onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")}
/> />
) : null} ) : null}
+4 -1
View File
@@ -3,6 +3,9 @@ import type { CustomerSummary } from "./customer";
import type { Money } from "./money"; import type { Money } from "./money";
import type { OrderStatus } from "./order-status"; 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 { export interface OrderItemDetail {
id: string; id: string;
productId: string; productId: string;
@@ -19,8 +22,8 @@ export interface OrderDetail {
status: OrderStatus; status: OrderStatus;
createdAt: string; createdAt: string;
updatedAt: string; updatedAt: string;
notes: string | null;
customer: CustomerSummary; customer: CustomerSummary;
shippingAddress: Address; shippingAddress: Address;
items: OrderItemDetail[]; items: OrderItemDetail[];
notes: string | null;
} }