Compare commits

..
Author SHA1 Message Date
Lena Deriso f0c2c11f8e refactor pending or processing
Runner Test / test (push) Successful in 17s
Runner Test / test (pull_request) Successful in 16s
2026-10-07 16:43:52 -04:00
derrick 31b367e3a3 add:assignment 4 tests
Runner Test / test (push) Successful in 16s
2026-10-02 16:54:39 +09:00
derrick 877eb9e09a Merge pull request 'Fix Item Quantity Update Constraints' (#21) from fix/dg-3-item-quantity-update-constraints into master
Runner Test / test (push) Successful in 16s
Reviewed-on: #21
2026-10-02 07:52:27 +00:00
derrick 6d3570909a update:item quantity change conditional
Runner Test / test (push) Successful in 17s
Runner Test / test (pull_request) Successful in 17s
2026-10-02 16:49:25 +09:00
6 changed files with 158 additions and 19 deletions
@@ -0,0 +1,108 @@
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 4 order lifecycle rules", () => {
test("keeps quantity editing blocked 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("allows address editing for processing orders", async () => {
const response = await app.inject({
method: "POST",
url: "/api/orders/order_2/shipping-address",
headers: { cookie: employeeCookie },
payload: {
fullName: "Jane Doe",
line1: "50 New Street",
line2: null,
city: "Oakland",
state: "CA",
postalCode: "94607",
country: "US"
}
});
expect(response.statusCode).toBe(200);
expect(response.json().shippingAddress.city).toBe("Oakland");
});
test("allows cancellation for processing orders", async () => {
const response = await app.inject({
method: "POST",
url: "/api/orders/order_2/cancel",
headers: { cookie: employeeCookie },
payload: { reason: "Customer request" }
});
expect(response.statusCode).toBe(200);
expect(response.json().status).toBe("cancelled");
});
test("blocks address editing for shipped orders", async () => {
const response = await app.inject({
method: "POST",
url: "/api/orders/order_3/shipping-address",
headers: { cookie: employeeCookie },
payload: {
fullName: "John Smith",
line1: "77 Final Mile Road",
line2: null,
city: "Denver",
state: "CO",
postalCode: "80202",
country: "US"
}
});
expect(response.statusCode).toBe(400);
});
test("blocks cancellation for shipped orders", async () => {
const response = await app.inject({
method: "POST",
url: "/api/orders/order_3/cancel",
headers: { cookie: employeeCookie },
payload: { reason: "Late request" }
});
expect(response.statusCode).toBe(400);
});
});
+26
View File
@@ -0,0 +1,26 @@
import { describe, expect, test } from "bun:test";
import { canCancelOrder, canEditOrderItems, canEditShippingAddress } from "./order-status";
describe("order status rules", () => {
const cases = [
{ status: "pending", editItems: true, editShipping: true, cancel: true },
{ status: "processing", editItems: false, editShipping: true, cancel: true },
{ status: "shipped", editItems: false, editShipping: false, cancel: false },
{ status: "cancelled", editItems: false, editShipping: false, cancel: false },
{ status: "refunded", editItems: false, editShipping: false, cancel: false }
] as const;
for (const { status, editItems, editShipping, cancel } of cases) {
test(`item editing is ${editItems ? "allowed" : "denied"} for ${status} orders`, () => {
expect(canEditOrderItems(status)).toBe(editItems);
});
test(`shipping address editing is ${editShipping ? "allowed" : "denied"} for ${status} orders`, () => {
expect(canEditShippingAddress(status)).toBe(editShipping);
});
test(`cancellation is ${cancel ? "allowed" : "denied"} for ${status} orders`, () => {
expect(canCancelOrder(status)).toBe(cancel);
});
}
});
+9 -3
View File
@@ -1,11 +1,17 @@
import type { OrderStatus } from "@orderops/shared/order-status";
export { canEditOrderItems } from "@orderops/shared/order-status";
function isPendingOrProcessing(status: OrderStatus) {
return status === "pending" || status === "processing";
}
export function canEditOrderItems(status: OrderStatus) {
return status === "pending";
}
export function canEditShippingAddress(status: OrderStatus) {
return status === "pending" || status === "processing";
return isPendingOrProcessing(status);
}
export function canCancelOrder(status: OrderStatus) {
return status === "pending" || status === "processing";
return isPendingOrProcessing(status);
}
+1 -11
View File
@@ -1,6 +1,5 @@
import { useState } from "react";
import type { OrderDetail } from "@orderops/shared";
import { canEditOrderItems } from "@orderops/shared/order-status";
interface OrderItemsPanelProps {
order: OrderDetail;
@@ -40,14 +39,9 @@ function QuantityForm({
}
export function OrderItemsPanel({ order, onUpdateQuantity }: OrderItemsPanelProps) {
const canEditQuantity = canEditOrderItems(order.status);
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">Items</h3>
{!canEditQuantity ? (
<p className="mb-3 text-sm text-slate-600">Item quantities can only be changed while an order is pending.</p>
) : null}
<div className="space-y-3">
{order.items.map((item) => (
<div key={item.id} className="rounded-lg border border-slate-200 p-3">
@@ -57,11 +51,7 @@ 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>
{canEditQuantity ? (
<QuantityForm itemId={item.id} quantity={item.quantity} onSave={onUpdateQuantity} />
) : (
<div className="text-sm text-slate-700">Quantity: {item.quantity}</div>
)}
<QuantityForm itemId={item.id} quantity={item.quantity} onSave={onUpdateQuantity} />
</div>
</div>
))}
+14 -1
View File
@@ -72,6 +72,19 @@ export function OrderPage() {
}
}
async function handleUpdateQuantity(itemId: string, quantity: number) {
if (!order) {
return;
}
if (order.status !== "pending") {
setToast({ message: "Order items cannot be changed for this order status.", variant: "error" });
return;
}
await runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.");
}
return (
<div className="space-y-4">
<Link className="inline-flex text-sm font-medium text-blue-600 hover:text-blue-700" to="/orders">
@@ -84,7 +97,7 @@ export function OrderPage() {
<OrderDetailPage
order={order}
auditEvents={auditEvents}
onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
onUpdateQuantity={handleUpdateQuantity}
onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")}
onSaveNotes={(notes) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")}
-4
View File
@@ -1,7 +1,3 @@
export const orderStatuses = ["pending", "processing", "shipped", "cancelled", "refunded"] as const;
export type OrderStatus = (typeof orderStatuses)[number];
export function canEditOrderItems(status: OrderStatus) {
return status === "pending";
}