Compare commits

..
Author SHA1 Message Date
shawn 7dac01acb7 fix: restrict order quantity edits to pending orders
Runner Test / test (push) Successful in 36s
Runner Test / test (pull_request) Successful in 15s
2026-09-29 14:07:12 +10:00
derrick 82ed809f32 update:remove unused check
Runner Test / test (push) Failing after 15s
2026-09-27 22:05:51 +09:00
derrick 0e1e64b6ca add:assignment 3 tests
Runner Test / test (push) Failing after 14s
2026-09-27 22:04:59 +09:00
derrick 8235ceb61f Merge pull request 'Feature Internal Order Notes' (#12) from feat/dg-2-internal-order-notes into master
Runner Test / test (push) Failing after 14s
Reviewed-on: #12
2026-09-25 03:47:36 +00:00
derrick 698a49ae82 add:order notes ui component
Runner Test / test (push) Successful in 17s
Runner Test / test (pull_request) Successful in 16s
2026-09-24 22:35:55 +09:00
derrick 97438aaa56 add:order notes crud 2026-09-24 21:07:19 +09:00
derrick 2e2694354d add:notes column to orders 2026-09-24 18:09:20 +09:00
derrick 79b485db56 add:assignment 2 tests
Runner Test / test (push) Failing after 17s
2026-09-20 00:14:31 +09:00
derrick 4c0783091a update:PR template
Runner Test / test (push) Successful in 15s
2026-09-18 14:27:53 +09:00
derrick 12a262e640 Merge pull request 'Fix case-insensitive search query on order page' (#7) from fix/dg1-order-search-behavior into master
Runner Test / test (push) Successful in 16s
Reviewed-on: #7
2026-09-18 05:23:22 +00:00
derrick 32931e697f update:apply lowercase to query+column
Runner Test / test (push) Successful in 17s
Runner Test / test (pull_request) Successful in 16s
2026-09-17 18:02:25 +09:00
derrick 0cfe045afa update:progress agents file for assignment 2026-09-17 17:48:01 +09:00
19 changed files with 201 additions and 132 deletions
-2
View File
@@ -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
```
+1
View File
@@ -8,3 +8,4 @@ bun.lock
*.sqlite-wal
dist
coverage
pi-session*
+4 -1
View File
@@ -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.
-1
View File
@@ -28,7 +28,6 @@ bun run dev:web
Common checks:
```bash
bun run check
bun run test
bun run build:web
```
+3 -3
View File
@@ -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")) {
sqlite.exec(`ALTER TABLE orders ADD COLUMN notes TEXT NOT NULL DEFAULT ''`);
if (!columnExists(sqlite, "orders", "notes")) {
sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT");
}
}
+1 -1
View File
@@ -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()
});
@@ -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);
});
});
+9 -9
View File
@@ -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(${users.name}), lower(${search})) > 0`,
sql`instr(lower(${users.email}), lower(${search})) > 0`
sql`instr(lower(${orders.orderNumber}), ${search}) > 0`,
sql`instr(lower(${users.name}), ${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));
+7 -8
View File
@@ -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 { changeOrderNotes } from "./update-notes";
import { changeOrderItemQuantity, updateOrderNotes } from "./update-order-item";
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
@@ -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) {
+1 -1
View File
@@ -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) {
-44
View File
@@ -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;
}
+42 -1
View File
@@ -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;
}
+7 -7
View File
@@ -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",
+2 -2
View File
@@ -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>
);
+5 -1
View File
@@ -51,7 +51,11 @@ export function OrderItemsPanel({ order, onUpdateQuantity }: OrderItemsPanelProp
<div className="text-sm text-slate-600">{item.sku}</div>
<div className="text-sm text-slate-500">Available: {item.availableQuantity}</div>
</div>
<QuantityForm itemId={item.id} quantity={item.quantity} onSave={onUpdateQuantity} />
{order.status === "pending" ? (
<QuantityForm itemId={item.id} quantity={item.quantity} onSave={onUpdateQuantity} />
) : (
<div className="text-sm text-slate-600">Quantity: {item.quantity}</div>
)}
</div>
</div>
))}
+25 -48
View File
@@ -1,60 +1,37 @@
import { useState } from "react";
export const NOTES_MAX_LENGTH = 1000;
import type { OrderDetail } from "@orderops/shared";
interface OrderNotesProps {
notes: string;
order: OrderDetail;
onSave: (notes: string) => Promise<void>;
}
export function OrderNotesPanel({ notes, onSave }: OrderNotesProps) {
const [draft, setDraft] = useState(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);
}
}
export function OrderNotes({ order, onSave }: OrderNotesProps) {
const [notes, setNotes] = useState(order.notes ?? "");
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="text-sm font-semibold text-slate-700">Internal notes</h3>
<span className="text-xs text-slate-500">{draft.length}/{NOTES_MAX_LENGTH}</span>
</div>
{notes ? (
<p className="mb-3 whitespace-pre-wrap text-sm text-slate-700">{notes}</p>
) : (
<p className="mb-3 text-sm text-slate-400">No internal notes yet. Add context for teammates following up on this order.</p>
)}
<textarea
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"
maxLength={NOTES_MAX_LENGTH}
onChange={(event) => setDraft(event.target.value)}
placeholder="Add internal notes..."
rows={3}
value={draft}
/>
<div className="mt-3 flex justify-end">
<button
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"}
<h3 className="mb-3 text-sm font-semibold text-slate-700">Internal notes</h3>
<form
className="space-y-3"
onSubmit={async (event) => {
event.preventDefault();
await onSave(notes);
}}
>
<label className="block text-sm text-slate-700">
<span className="mb-1 block">Notes</span>
<textarea
className="w-full resize-none rounded-lg border border-slate-300 px-3 py-2"
rows={5}
value={notes}
onChange={(event) => setNotes(event.target.value)}
/>
</label>
<button className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white" type="submit">
Save notes
</button>
</div>
</form>
</section>
);
}
}
+1 -1
View File
@@ -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}
+1 -1
View File
@@ -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[];