Compare commits

..
Author SHA1 Message Date
aziz_28002andClaude Sonnet 5 a5bbc24ecf fix: make order search case-insensitive
Runner Test / test (push) Successful in 16s
Runner Test / test (pull_request) Successful in 14s
instr() in SQLite compares bytes, so searching for a customer name
in uppercase (e.g. "JOHN") silently missed lowercase-stored matches
like "John". Lowercase both sides of the order number, name, and
email comparisons so search matches regardless of the case staff
paste in.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-16 20:41:45 +04:00
15 changed files with 10 additions and 261 deletions
+2
View File
@@ -5,6 +5,7 @@ Describe problem and user or business impact.
## Ticket / Assignment ## Ticket / Assignment
- Ticket: - Ticket:
- Assignment:
## What changed ## What changed
@@ -17,6 +18,7 @@ Describe problem and user or business impact.
List exact commands and manual checks. List exact commands and manual checks.
```bash ```bash
bun run check
bun run test bun run test
bun run build:web bun run build:web
``` ```
-1
View File
@@ -8,4 +8,3 @@ bun.lock
*.sqlite-wal *.sqlite-wal
dist dist
coverage coverage
pi-session*
+1 -4
View File
@@ -1,9 +1,5 @@
# Typescript Full Stack App Agent # 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 ## Output Rules
### Response Style ### Response Style
@@ -180,3 +176,4 @@ Skip `discover_context` for narrow tasks with explicit file targets.
### Boundaries ### Boundaries
- Recon is read-only unless user requested implementation. - Recon is read-only unless user requested implementation.
- Do not treat scout output as complete when evidence suggests missing files. - Do not treat scout output as complete when evidence suggests missing files.
-6
View File
@@ -90,7 +90,6 @@ export function initializeDatabase(sqlite: Database) {
customer_id TEXT NOT NULL REFERENCES users(id), customer_id TEXT NOT NULL REFERENCES users(id),
shipping_address_id TEXT NOT NULL REFERENCES addresses(id), shipping_address_id TEXT NOT NULL REFERENCES addresses(id),
status TEXT NOT NULL, status TEXT NOT NULL,
notes TEXT,
created_at TEXT NOT NULL, created_at TEXT NOT NULL,
updated_at TEXT NOT NULL updated_at TEXT NOT NULL
); );
@@ -120,9 +119,4 @@ export function initializeDatabase(sqlite: Database) {
created_at TEXT NOT NULL created_at TEXT NOT NULL
); );
`); `);
// 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;");
}
} }
-1
View File
@@ -9,7 +9,6 @@ export const orders = sqliteTable("orders", {
customerId: text("customer_id").notNull().references(() => users.id), customerId: text("customer_id").notNull().references(() => users.id),
shippingAddressId: text("shipping_address_id").notNull().references(() => addresses.id), shippingAddressId: text("shipping_address_id").notNull().references(() => addresses.id),
status: text("status").notNull(), status: text("status").notNull(),
notes: text("notes"),
createdAt: text("created_at").notNull(), createdAt: text("created_at").notNull(),
updatedAt: text("updated_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);
});
});
+5 -10
View File
@@ -35,13 +35,13 @@ function toOrderItemDetail(row: {
} }
export async function listOrderSummaries(context: DatabaseContext, query?: string) { export async function listOrderSummaries(context: DatabaseContext, query?: string) {
const search = query?.trim().toLowerCase(); const search = query?.trim();
const filters = search const filters = search
? or( ? or(
sql`instr(lower(${orders.orderNumber}), ${search}) > 0`, sql`instr(lower(${orders.orderNumber}), lower(${search})) > 0`,
sql`instr(lower(${users.name}), ${search}) > 0`, sql`instr(lower(${users.name}), lower(${search})) > 0`,
sql`instr(lower(${users.email}), ${search}) > 0` sql`instr(lower(${users.email}), lower(${search})) > 0`
) )
: undefined; : undefined;
@@ -104,8 +104,7 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
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;
} }
@@ -132,10 +131,6 @@ 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));
-30
View File
@@ -7,7 +7,6 @@ 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 } 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 {
@@ -34,10 +33,6 @@ interface CancelBody {
reason?: string; reason?: string;
} }
interface NotesBody {
notes: string;
}
type AuthenticatedRequest = FastifyRequest & { currentUser: AuthUser }; type AuthenticatedRequest = FastifyRequest & { currentUser: AuthUser };
export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async (app, options) => { export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async (app, options) => {
@@ -139,31 +134,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" }
}
}
}
}, 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: {
-43
View File
@@ -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;
}
File diff suppressed because one or more lines are too long
-7
View File
@@ -28,13 +28,6 @@ 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",
@@ -1,7 +1,6 @@
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 { 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";
@@ -10,7 +9,6 @@ interface OrderDetailPageProps {
auditEvents: AuditEvent[]; auditEvents: AuditEvent[];
onUpdateQuantity: (itemId: string, quantity: number) => Promise<void>; onUpdateQuantity: (itemId: string, quantity: number) => Promise<void>;
onSaveAddress: (address: Address) => Promise<void>; onSaveAddress: (address: Address) => Promise<void>;
onSaveNotes: (notes: string) => Promise<void>;
onCancel: () => Promise<void>; onCancel: () => Promise<void>;
} }
@@ -19,7 +17,6 @@ export function OrderDetailPage({
auditEvents, auditEvents,
onUpdateQuantity, onUpdateQuantity,
onSaveAddress, onSaveAddress,
onSaveNotes,
onCancel onCancel
}: OrderDetailPageProps) { }: OrderDetailPageProps) {
return ( return (
@@ -33,7 +30,6 @@ export function OrderDetailPage({
<OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} /> <OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
<ShippingAddressForm order={order} onSave={onSaveAddress} /> <ShippingAddressForm order={order} onSave={onSaveAddress} />
<AuditTimeline events={auditEvents} /> <AuditTimeline events={auditEvents} />
<OrderNotesPanel order={order} onSave={onSaveNotes} />
</div> </div>
); );
} }
-42
View File
@@ -1,42 +0,0 @@
import { useState } from "react";
import { maxOrderNotesLength, type OrderDetail } from "@orderops/shared";
interface OrderNotesPanelProps {
order: OrderDetail;
onSave: (notes: string) => Promise<void>;
}
export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
const [notes, setNotes] = useState(order.notes ?? "");
return (
<section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm">
<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 for the OrderOps team</span>
<textarea
className="w-full rounded-lg border border-slate-300 px-3 py-2"
maxLength={maxOrderNotesLength}
rows={4}
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 disabled:opacity-50"
disabled={!notes.trim()}
type="submit"
>
Save notes
</button>
</form>
</section>
);
}
+1 -2
View File
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import type { Address, AuditEvent, OrderDetail } from "@orderops/shared"; import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
import { Link, useParams } from "react-router-dom"; import { Link, useParams } from "react-router-dom";
import { Toast } from "../ui/toast"; import { Toast } from "../ui/toast";
import { cancelOrder, getOrder, listAuditEvents, updateOrderItemQuantity, updateOrderNotes, updateShippingAddress } from "./order-api"; import { cancelOrder, getOrder, listAuditEvents, updateOrderItemQuantity, updateShippingAddress } from "./order-api";
import { OrderDetailPage } from "./order-detail-page"; import { OrderDetailPage } from "./order-detail-page";
interface ToastState { interface ToastState {
@@ -86,7 +86,6 @@ 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: 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
View File
@@ -3,9 +3,6 @@ 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;
@@ -25,5 +22,4 @@ export interface OrderDetail {
customer: CustomerSummary; customer: CustomerSummary;
shippingAddress: Address; shippingAddress: Address;
items: OrderItemDetail[]; items: OrderItemDetail[];
notes: string | null;
} }