refactor:centralize order status rules in shared package
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
31b367e3a3
commit
12c4bc62c1
@@ -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();
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
import type { OrderStatus } from "@orderops/shared/order-status";
|
||||
|
||||
export function canEditOrderItems(status: OrderStatus) {
|
||||
return status === "pending";
|
||||
}
|
||||
|
||||
export function canEditShippingAddress(status: OrderStatus) {
|
||||
return status === "pending" || status === "processing";
|
||||
}
|
||||
|
||||
export function canCancelOrder(status: OrderStatus) {
|
||||
return status === "pending" || status === "processing";
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user