Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0972d80fa | ||
|
|
94ebd0733a |
@@ -37,11 +37,13 @@ function toOrderItemDetail(row: {
|
|||||||
export async function listOrderSummaries(context: DatabaseContext, query?: string) {
|
export async function listOrderSummaries(context: DatabaseContext, query?: string) {
|
||||||
const search = query?.trim();
|
const search = query?.trim();
|
||||||
|
|
||||||
|
// Support staff type search terms in any case. instr() is case-sensitive, so compare lowercased
|
||||||
|
// values; LIKE is avoided because it would treat % and _ in the search text as wildcards.
|
||||||
const filters = search
|
const filters = search
|
||||||
? or(
|
? or(
|
||||||
sql`instr(LOWER(${orders.orderNumber}), LOWER(${search})) > 0`,
|
sql`instr(lower(${orders.orderNumber}), lower(${search})) > 0`,
|
||||||
sql`instr(LOWER(${users.name}), LOWER(${search})) > 0`,
|
sql`instr(lower(${users.name}), lower(${search})) > 0`,
|
||||||
sql`instr(LOWER(${users.email}), LOWER(${search})) > 0`
|
sql`instr(lower(${users.email}), lower(${search})) > 0`
|
||||||
)
|
)
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
|
|||||||
@@ -1,110 +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 = "";
|
|
||||||
|
|
||||||
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 1 search behavior", () => {
|
|
||||||
test("searches orders case-insensitively by customer name", async () => {
|
|
||||||
const response = await app.inject({
|
|
||||||
method: "GET",
|
|
||||||
url: "/api/orders?query=JOHN",
|
|
||||||
headers: { cookie: employeeCookie }
|
|
||||||
});
|
|
||||||
|
|
||||||
const orders = response.json();
|
|
||||||
const orderNumbers = orders.map((order: { orderNumber: string }) => order.orderNumber);
|
|
||||||
|
|
||||||
expect(response.statusCode).toBe(200);
|
|
||||||
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([]);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -44,6 +44,20 @@ describe("order routes", () => {
|
|||||||
expect(response.json()).toHaveLength(7);
|
expect(response.json()).toHaveLength(7);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("finds orders by customer name regardless of letter case", async () => {
|
||||||
|
const response = await app.inject({ method: "GET", url: "/api/orders?query=JOHN%20SMITH", headers: { cookie: employeeCookie } });
|
||||||
|
|
||||||
|
expect(response.statusCode).toBe(200);
|
||||||
|
expect(response.json().map((order: { orderNumber: string }) => order.orderNumber)).toEqual(["ORD-1001", "ORD-1003"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("finds orders by order number regardless of letter case", async () => {
|
||||||
|
const response = await app.inject({ method: "GET", url: "/api/orders?query=ord-1001", headers: { cookie: employeeCookie } });
|
||||||
|
|
||||||
|
expect(response.statusCode).toBe(200);
|
||||||
|
expect(response.json().map((order: { orderNumber: string }) => order.orderNumber)).toEqual(["ORD-1001"]);
|
||||||
|
});
|
||||||
|
|
||||||
test("returns order detail", async () => {
|
test("returns order detail", async () => {
|
||||||
const response = await app.inject({ method: "GET", url: "/api/orders/order_1", headers: { cookie: employeeCookie } });
|
const response = await app.inject({ method: "GET", url: "/api/orders/order_1", headers: { cookie: employeeCookie } });
|
||||||
const order = response.json();
|
const order = response.json();
|
||||||
|
|||||||
Reference in New Issue
Block a user