From 36f5415483fd128e14bf715ba99f992feb44853e Mon Sep 17 00:00:00 2001 From: que01 Date: Mon, 21 Sep 2026 15:12:17 +0800 Subject: [PATCH] =?UTF-8?q?test:=20=E6=94=B6=E5=8F=A3=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=8A=B6=E6=80=81=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/src/booking.service.ts | 14 ++++---------- apps/api/src/workflows.ts | 20 ++++++++++++++++++++ apps/api/test/http.integration.test.js | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 apps/api/src/workflows.ts diff --git a/apps/api/src/booking.service.ts b/apps/api/src/booking.service.ts index 301de17..810b61d 100644 --- a/apps/api/src/booking.service.ts +++ b/apps/api/src/booking.service.ts @@ -1,6 +1,7 @@ import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common"; import { BookingStatus, Prisma } from "@prisma/client"; import { PrismaService } from "./prisma.service.js"; +import { BASIC_BOOKING_WORKFLOW, canTransitionBasicBooking } from "./workflows.js"; export interface CreateBookingInput { requestType: "package" | "private_chef" | "inquiry"; @@ -99,8 +100,8 @@ export class BookingService { items: { create: items }, stateTransitions: { create: { - workflowKey: "booking.basic", - workflowVersion: "1.0.0", + workflowKey: BASIC_BOOKING_WORKFLOW.key, + workflowVersion: BASIC_BOOKING_WORKFLOW.version, toState: "received", actorRole: "customer", }, @@ -179,14 +180,7 @@ export class BookingService { ) { const booking = await this.prisma.booking.findFirst({ where: { id, brandId } }); if (!booking) throw new NotFoundException("订单不存在"); - const allowed: Record = { - received: ["contacting", "cancelled"], - contacting: ["confirmed", "cancelled"], - confirmed: ["completed", "cancelled"], - completed: [], - cancelled: [], - }; - if (status !== booking.status && !allowed[booking.status]?.includes(status)) + if (!canTransitionBasicBooking(booking.currentState, status)) throw new BadRequestException("不允许的订单状态流转"); return this.prisma.$transaction(async (tx) => { const updated = await tx.booking.update({ diff --git a/apps/api/src/workflows.ts b/apps/api/src/workflows.ts new file mode 100644 index 0000000..5735bde --- /dev/null +++ b/apps/api/src/workflows.ts @@ -0,0 +1,20 @@ +export const BASIC_BOOKING_WORKFLOW = { + key: "booking.basic", + version: "1.0.0", + transitions: { + received: ["contacting", "cancelled"], + contacting: ["confirmed", "cancelled"], + confirmed: ["completed", "cancelled"], + completed: [], + cancelled: [], + }, +} as const; + +export type BasicBookingState = keyof typeof BASIC_BOOKING_WORKFLOW.transitions; + +export function canTransitionBasicBooking(from: string, to: string): boolean { + return ( + from === to || + BASIC_BOOKING_WORKFLOW.transitions[from as BasicBookingState]?.includes(to as never) === true + ); +} diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 0a15ee3..86ca542 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -517,6 +517,14 @@ test("customer can create and cancel a package booking", async () => { assert.equal(createdBody.estimatedAmount, service.priceAmount * 2); const booking = await prisma.booking.findUnique({ where: { bookingNo: createdBody.bookingNo } }); assert.ok(booking); + assert.equal(booking.workflowKey, "booking.basic"); + assert.equal(booking.currentState, "received"); + assert.equal(booking.offeringId, service.offeringId); + const initialTransitions = await prisma.bookingStateTransition.findMany({ + where: { bookingId: booking.id }, + }); + assert.equal(initialTransitions.length, 1); + assert.equal(initialTransitions[0].toState, "received"); createdBookingIds.push(booking.id); const cancelled = await request(`/customer/bookings/${booking.id}/cancel`, { @@ -525,6 +533,14 @@ test("customer can create and cancel a package booking", async () => { }); assert.equal(cancelled.statusCode, 201); assert.equal(JSON.parse(cancelled.body).status, "cancelled"); + const transitions = await prisma.bookingStateTransition.findMany({ + where: { bookingId: booking.id }, + orderBy: { createdAt: "asc" }, + }); + assert.deepEqual( + transitions.map((item) => item.toState), + ["received", "cancelled"], + ); }); test("admin can advance booking status but cannot skip the state machine", async () => { @@ -561,6 +577,8 @@ test("admin can advance booking status but cannot skip the state machine", async }); assert.equal(contacting.statusCode, 201); assert.equal(JSON.parse(contacting.body).status, "contacting"); + const contactingState = await prisma.booking.findUnique({ where: { id: booking.id } }); + assert.equal(contactingState?.currentState, "contacting"); const skipped = await request(`/admin/bookings/${booking.id}/status`, { method: "POST",