Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f4f7f9620f |
@@ -5,6 +5,7 @@ Describe problem and user or business impact.
|
||||
## Ticket / Assignment
|
||||
|
||||
- Ticket:
|
||||
- Assignment:
|
||||
|
||||
## What changed
|
||||
|
||||
@@ -17,6 +18,7 @@ Describe problem and user or business impact.
|
||||
List exact commands and manual checks.
|
||||
|
||||
```bash
|
||||
bun run check
|
||||
bun run test
|
||||
bun run build:web
|
||||
```
|
||||
|
||||
@@ -8,4 +8,3 @@ bun.lock
|
||||
*.sqlite-wal
|
||||
dist
|
||||
coverage
|
||||
pi-session*
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
# 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
|
||||
@@ -180,3 +176,4 @@ 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.
|
||||
|
||||
|
||||
@@ -90,7 +90,6 @@ 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 '',
|
||||
created_at TEXT NOT NULL,
|
||||
updated_at TEXT NOT NULL
|
||||
);
|
||||
@@ -120,9 +119,4 @@ export function initializeDatabase(sqlite: Database) {
|
||||
created_at TEXT NOT NULL
|
||||
);
|
||||
`);
|
||||
|
||||
// Existing local databases predate internal notes, so add the column in place.
|
||||
if (!columnExists(sqlite, "orders", "notes")) {
|
||||
sqlite.exec(`ALTER TABLE orders ADD COLUMN notes TEXT NOT NULL DEFAULT ''`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ 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(""),
|
||||
createdAt: text("created_at").notNull(),
|
||||
updatedAt: text("updated_at").notNull()
|
||||
});
|
||||
|
||||
@@ -1,106 +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 = "";
|
||||
let customerCookie = "";
|
||||
|
||||
function firstHeader(value: string | string[] | undefined): string {
|
||||
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");
|
||||
customerCookie = await login("john-smith");
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await app.close();
|
||||
});
|
||||
|
||||
describe("assignment 2 internal order notes", () => {
|
||||
test("allows employee users to attach notes to an order", async () => {
|
||||
const response = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/orders/order_1/notes",
|
||||
headers: { cookie: employeeCookie },
|
||||
payload: { notes: "Follow up with warehouse before shipping." }
|
||||
});
|
||||
|
||||
const order = response.json();
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(order.orderNumber).toBe("ORD-1001");
|
||||
expect(order.notes).toBe("Follow up with warehouse before shipping.");
|
||||
expect(order.items).toHaveLength(2);
|
||||
});
|
||||
|
||||
test("returns persisted notes when the order is viewed later", async () => {
|
||||
const updateResponse = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/orders/order_1/notes",
|
||||
headers: { cookie: employeeCookie },
|
||||
payload: { notes: "Customer requested gift receipt." }
|
||||
});
|
||||
|
||||
expect(updateResponse.statusCode).toBe(200);
|
||||
|
||||
const detailResponse = await app.inject({
|
||||
method: "GET",
|
||||
url: "/api/orders/order_1",
|
||||
headers: { cookie: employeeCookie }
|
||||
});
|
||||
|
||||
expect(detailResponse.statusCode).toBe(200);
|
||||
expect(detailResponse.json().notes).toBe("Customer requested gift receipt.");
|
||||
});
|
||||
|
||||
test("rejects customer users when attaching notes", async () => {
|
||||
const response = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/orders/order_1/notes",
|
||||
headers: { cookie: customerCookie },
|
||||
payload: { notes: "Customer should not be able to add this." }
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(403);
|
||||
});
|
||||
|
||||
test("rejects empty notes", async () => {
|
||||
const response = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/orders/order_1/notes",
|
||||
headers: { cookie: employeeCookie },
|
||||
payload: { notes: " " }
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(400);
|
||||
});
|
||||
|
||||
test("rejects notes beyond the accepted length limit", async () => {
|
||||
const response = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/orders/order_1/notes",
|
||||
headers: { cookie: employeeCookie },
|
||||
payload: { notes: "x".repeat(1001) }
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(400);
|
||||
});
|
||||
});
|
||||
@@ -35,13 +35,13 @@ function toOrderItemDetail(row: {
|
||||
}
|
||||
|
||||
export async function listOrderSummaries(context: DatabaseContext, query?: string) {
|
||||
const search = query?.trim().toLowerCase();
|
||||
const search = query?.trim();
|
||||
|
||||
const filters = search
|
||||
? or(
|
||||
sql`instr(lower(${orders.orderNumber}), ${search}) > 0`,
|
||||
sql`instr(lower(${users.name}), ${search}) > 0`,
|
||||
sql`instr(lower(${users.email}), ${search}) > 0`
|
||||
sql`instr(LOWER(${orders.orderNumber}), LOWER(${search})) > 0`,
|
||||
sql`instr(LOWER(${users.name}), LOWER(${search})) > 0`,
|
||||
sql`instr(LOWER(${users.email}), LOWER(${search})) > 0`
|
||||
)
|
||||
: undefined;
|
||||
|
||||
@@ -104,8 +104,7 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
|
||||
email: header.customer.email
|
||||
},
|
||||
shippingAddress: toAddress(header.address),
|
||||
items: itemRows.map(toOrderItemDetail),
|
||||
notes: header.order.notes
|
||||
items: itemRows.map(toOrderItemDetail)
|
||||
} satisfies OrderDetail;
|
||||
}
|
||||
|
||||
@@ -175,10 +174,6 @@ export async function appendAuditEvent(
|
||||
});
|
||||
}
|
||||
|
||||
export async function updateOrderNotes(context: DatabaseContext, orderId: string, notes: string) {
|
||||
await context.db.update(orders).set({ notes }).where(eq(orders.id, orderId));
|
||||
}
|
||||
|
||||
async function findCustomerSummaryByOrderId(context: DatabaseContext, orderId: string) {
|
||||
const [row] = await context.db
|
||||
.select({ customer: users })
|
||||
|
||||
@@ -7,7 +7,6 @@ import { getOrder } from "./get-order";
|
||||
import { listAuditEvents } from "./list-audit-events";
|
||||
import { listOrders } from "./list-orders";
|
||||
import { changeOrderItemQuantity } from "./update-order-item";
|
||||
import { saveOrderNotes } from "./update-order-notes";
|
||||
import { changeShippingAddress } from "./update-shipping-address";
|
||||
|
||||
interface OrderRouteOptions {
|
||||
@@ -34,10 +33,6 @@ interface CancelBody {
|
||||
reason?: string;
|
||||
}
|
||||
|
||||
interface NotesBody {
|
||||
notes: string;
|
||||
}
|
||||
|
||||
type AuthenticatedRequest = FastifyRequest & { currentUser: AuthUser };
|
||||
|
||||
export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async (app, options) => {
|
||||
@@ -162,28 +157,4 @@ 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: {
|
||||
// Empty and length rules are measured on the trimmed notes in saveOrderNotes.
|
||||
notes: { type: "string" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}, async (request, reply) => {
|
||||
const result = await saveOrderNotes(options.db, {
|
||||
orderId: request.params.orderId,
|
||||
notes: request.body.notes
|
||||
});
|
||||
|
||||
if (result.statusCode !== 200) {
|
||||
return reply.code(result.statusCode).send({ message: result.message });
|
||||
}
|
||||
|
||||
return result.order;
|
||||
});
|
||||
};
|
||||
|
||||
@@ -47,4 +47,64 @@ describe("assignment 1 search behavior", () => {
|
||||
expect(orderNumbers).toContain("ORD-1001");
|
||||
expect(orderNumbers).toContain("ORD-1003");
|
||||
});
|
||||
|
||||
test("searches orders by mixed-case customer name without matching email", async () => {
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: "/api/orders?query=JoHn%20SmItH",
|
||||
headers: { cookie: employeeCookie }
|
||||
});
|
||||
|
||||
const orders = response.json();
|
||||
const orderNumbers = orders.map((order: { orderNumber: string }) => order.orderNumber);
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(orderNumbers).toHaveLength(2);
|
||||
expect(orderNumbers).toContain("ORD-1001");
|
||||
expect(orderNumbers).toContain("ORD-1003");
|
||||
});
|
||||
|
||||
test("searches orders by uppercase customer email", async () => {
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: "/api/orders?query=JOHN.SMITH%40EXAMPLE.COM",
|
||||
headers: { cookie: employeeCookie }
|
||||
});
|
||||
|
||||
const orders = response.json();
|
||||
const orderNumbers = orders.map((order: { orderNumber: string }) => order.orderNumber);
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(orderNumbers).toHaveLength(2);
|
||||
expect(orderNumbers).toContain("ORD-1001");
|
||||
expect(orderNumbers).toContain("ORD-1003");
|
||||
});
|
||||
|
||||
test("searches orders by lowercase order number", async () => {
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: "/api/orders?query=ord-1001",
|
||||
headers: { cookie: employeeCookie }
|
||||
});
|
||||
|
||||
const orders = response.json();
|
||||
const orderNumbers = orders.map((order: { orderNumber: string }) => order.orderNumber);
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(orderNumbers).toHaveLength(1);
|
||||
expect(orderNumbers).toContain("ORD-1001");
|
||||
});
|
||||
|
||||
test("returns no orders when the search term does not match", async () => {
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: "/api/orders?query=no-matching-order",
|
||||
headers: { cookie: employeeCookie }
|
||||
});
|
||||
|
||||
const orders = response.json();
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(orders).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
import { orderNotesMaxLength } from "@orderops/shared";
|
||||
import type { DatabaseContext } from "../db/database";
|
||||
import { findOrderDetail, updateOrderNotes, updateOrderTimestamp } from "./order-repository";
|
||||
|
||||
// Notes are allowed for every order status: follow-up work often happens
|
||||
// after an order has shipped, been cancelled, or been refunded.
|
||||
export async function saveOrderNotes(
|
||||
context: DatabaseContext,
|
||||
input: {
|
||||
orderId: string;
|
||||
notes: 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 > orderNotesMaxLength) {
|
||||
return { statusCode: 400, message: `Notes must be ${orderNotesMaxLength} characters or fewer.` } as const;
|
||||
}
|
||||
|
||||
const updatedAt = new Date().toISOString();
|
||||
await updateOrderNotes(context, input.orderId, notes);
|
||||
await updateOrderTimestamp(context, input.orderId, updatedAt);
|
||||
|
||||
return {
|
||||
statusCode: 200,
|
||||
order: await findOrderDetail(context, input.orderId)
|
||||
} as const;
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -34,10 +34,3 @@ export function cancelOrder(orderId: string, reason?: string) {
|
||||
body: JSON.stringify({ reason })
|
||||
});
|
||||
}
|
||||
|
||||
export function saveOrderNotes(orderId: string, notes: string) {
|
||||
return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ notes })
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
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 { OrderSummaryPanel } from "./order-summary";
|
||||
import { ShippingAddressForm } from "./shipping-address-form";
|
||||
|
||||
@@ -10,7 +9,6 @@ interface OrderDetailPageProps {
|
||||
auditEvents: AuditEvent[];
|
||||
onUpdateQuantity: (itemId: string, quantity: number) => Promise<void>;
|
||||
onSaveAddress: (address: Address) => Promise<void>;
|
||||
onSaveNotes: (notes: string) => Promise<void>;
|
||||
onCancel: () => Promise<void>;
|
||||
}
|
||||
|
||||
@@ -19,7 +17,6 @@ export function OrderDetailPage({
|
||||
auditEvents,
|
||||
onUpdateQuantity,
|
||||
onSaveAddress,
|
||||
onSaveNotes,
|
||||
onCancel
|
||||
}: OrderDetailPageProps) {
|
||||
return (
|
||||
@@ -32,7 +29,6 @@ export function OrderDetailPage({
|
||||
</div>
|
||||
<OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
|
||||
<ShippingAddressForm order={order} onSave={onSaveAddress} />
|
||||
<OrderNotesPanel notes={order.notes} onSaveNotes={onSaveNotes} />
|
||||
<AuditTimeline events={auditEvents} />
|
||||