Compare commits

..
Author SHA1 Message Date
Abdulaziz Salim Said AL-GharbiandClaude Opus 5.5 12c4bc62c1 refactor:centralize order status rules in shared package
Runner Test / test (push) Successful in 17s
Runner Test / test (pull_request) Successful in 18s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-08 16:25:50 +04:00
8 changed files with 38 additions and 54 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
import { canCancelOrder, orderCancellationBlockedMessage } from "@orderops/shared/order-status";
import type { DatabaseContext } from "../db/database";
import { canCancelOrder } from "./order-status";
import { appendAuditEvent, findOrderDetail, updateOrderStatus } from "./order-repository";
export async function cancelOrder(
@@ -17,7 +17,7 @@ export async function cancelOrder(
}
if (!canCancelOrder(order.status)) {
return { statusCode: 400, message: "Order cannot be cancelled for this order status." } as const;
return { statusCode: 400, message: orderCancellationBlockedMessage } as const;
}
const updatedAt = new Date().toISOString();
+8 -1
View File
@@ -117,7 +117,14 @@ export async function findOrderItemRecord(context: DatabaseContext, orderId: str
.leftJoin(inventory, eq(orderItems.productId, inventory.productId))
.where(and(eq(orderItems.id, itemId), eq(orderItems.orderId, orderId)));
return row ?? null;
if (!row) {
return null;
}
return {
...row,
order: { ...row.order, status: row.order.status as OrderDetail["status"] }
};
}
export async function updateOrderItemQuantity(context: DatabaseContext, itemId: string, quantity: number) {
-26
View File
@@ -1,26 +0,0 @@
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);
});
}
});
-17
View File
@@ -1,17 +0,0 @@
import type { OrderStatus } 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 isPendingOrProcessing(status);
}
export function canCancelOrder(status: OrderStatus) {
return isPendingOrProcessing(status);
}
+3 -3
View File
@@ -1,5 +1,5 @@
import { canEditOrderItems, orderItemsLockedMessage } from "@orderops/shared/order-status";
import type { DatabaseContext } from "../db/database";
import { canEditOrderItems } from "./order-status";
import { appendAuditEvent, findOrderDetail, findOrderItemRecord, updateOrderItemQuantity, updateOrderNotes as saveOrderNotes, updateOrderTimestamp } from "./order-repository";
export async function changeOrderItemQuantity(
@@ -17,8 +17,8 @@ export async function changeOrderItemQuantity(
return { statusCode: 404, message: "Order item not found." } as const;
}
if (!canEditOrderItems(row.order.status as never)) {
return { statusCode: 400, message: "Order items cannot be changed for this order status." } as const;
if (!canEditOrderItems(row.order.status)) {
return { statusCode: 400, message: orderItemsLockedMessage } as const;
}
if (input.quantity < 1 || input.quantity > 10) {
@@ -1,6 +1,6 @@
import type { Address } from "@orderops/shared/address";
import { canEditShippingAddress, shippingAddressLockedMessage } from "@orderops/shared/order-status";
import type { DatabaseContext } from "../db/database";
import { canEditShippingAddress } from "./order-status";
import { appendAuditEvent, findOrderDetail, updateOrderAddress, updateOrderTimestamp } from "./order-repository";
export async function changeShippingAddress(
@@ -18,7 +18,7 @@ export async function changeShippingAddress(
}
if (!canEditShippingAddress(order.status)) {
return { statusCode: 400, message: "Shipping address cannot be changed for this order status." } as const;
return { statusCode: 400, message: shippingAddressLockedMessage } as const;
}
const updatedAt = new Date().toISOString();
+3 -3
View File
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
import { canEditOrderItems, orderItemsLockedMessage, type Address, type AuditEvent, type OrderDetail } from "@orderops/shared";
import { Link, useParams } from "react-router-dom";
import { Toast } from "../ui/toast";
import { cancelOrder, getOrder, listAuditEvents, updateOrderItemQuantity, updateOrderNotes, updateShippingAddress } from "./order-api";
@@ -77,8 +77,8 @@ export function OrderPage() {
return;
}
if (order.status !== "pending") {
setToast({ message: "Order items cannot be changed for this order status.", variant: "error" });
if (!canEditOrderItems(order.status)) {
setToast({ message: orderItemsLockedMessage, variant: "error" });
return;
}
+20
View File
@@ -1,3 +1,23 @@
export const orderStatuses = ["pending", "processing", "shipped", "cancelled", "refunded"] as const;
export type OrderStatus = (typeof orderStatuses)[number];
const orderItemsEditableStatuses: readonly OrderStatus[] = ["pending"];
const shippingAddressEditableStatuses: readonly OrderStatus[] = ["pending", "processing"];
const orderCancellableStatuses: readonly OrderStatus[] = ["pending", "processing"];
export const orderItemsLockedMessage = "Order items cannot be changed for this order status.";
export const shippingAddressLockedMessage = "Shipping address cannot be changed for this order status.";
export const orderCancellationBlockedMessage = "Order cannot be cancelled for this order status.";
export function canEditOrderItems(status: OrderStatus) {
return orderItemsEditableStatuses.includes(status);
}
export function canEditShippingAddress(status: OrderStatus) {
return shippingAddressEditableStatuses.includes(status);
}
export function canCancelOrder(status: OrderStatus) {
return orderCancellableStatuses.includes(status);
}