From 25bf980d3c90f97349413230f2abe0ed47ecd893 Mon Sep 17 00:00:00 2001 From: que01 Date: Mon, 21 Sep 2026 20:18:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E5=92=A8=E8=AF=A2?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration.sql | 11 +++++++++++ apps/api/prisma/schema.prisma | 3 +++ apps/api/src/admin-workspace.controller.ts | 5 ++++- apps/api/src/main.ts | 1 + apps/api/test/http.integration.test.js | 5 +++++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 apps/api/prisma/migrations/20260921200000_add_submission_offering_snapshot/migration.sql diff --git a/apps/api/prisma/migrations/20260921200000_add_submission_offering_snapshot/migration.sql b/apps/api/prisma/migrations/20260921200000_add_submission_offering_snapshot/migration.sql new file mode 100644 index 0000000..11d06d7 --- /dev/null +++ b/apps/api/prisma/migrations/20260921200000_add_submission_offering_snapshot/migration.sql @@ -0,0 +1,11 @@ +ALTER TABLE "InquirySubmission" ADD COLUMN "offeringId" TEXT; +ALTER TABLE "InquirySubmission" + ADD CONSTRAINT "InquirySubmission_offeringId_fkey" + FOREIGN KEY ("offeringId") REFERENCES "Offering"("id") + ON DELETE SET NULL ON UPDATE CASCADE; +CREATE INDEX "InquirySubmission_offeringId_idx" ON "InquirySubmission"("offeringId"); + +UPDATE "InquirySubmission" s +SET "offeringId" = f."offeringId" +FROM "InquiryForm" f +WHERE s."inquiryFormId" = f."id" AND f."offeringId" IS NOT NULL; diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma index dee3d18..e8d9190 100644 --- a/apps/api/prisma/schema.prisma +++ b/apps/api/prisma/schema.prisma @@ -127,6 +127,7 @@ model Offering { createdAt DateTime @default(now()) updatedAt DateTime @updatedAt inquiryForms InquiryForm[] + inquirySubmissions InquirySubmission[] bookings Booking[] bookingItems BookingItem[] @@unique([brandId, name]) @@ -156,8 +157,10 @@ model InquirySubmission { id String @id @default(uuid()) brandId String inquiryFormId String + offeringId String? brand BrandProfile @relation(fields: [brandId], references: [id], onDelete: Cascade) inquiryForm InquiryForm @relation(fields: [inquiryFormId], references: [id], onDelete: Restrict) + offering Offering? @relation(fields: [offeringId], references: [id], onDelete: SetNull) formVersion Int fieldsSnapshot Json values Json diff --git a/apps/api/src/admin-workspace.controller.ts b/apps/api/src/admin-workspace.controller.ts index 93fb15d..f9491fb 100644 --- a/apps/api/src/admin-workspace.controller.ts +++ b/apps/api/src/admin-workspace.controller.ts @@ -253,7 +253,10 @@ class AdminWorkspaceController { this.requireAdmin(request); return this.prisma.inquirySubmission.findMany({ where: { brandId: this.brandId() }, - include: { inquiryForm: { select: { name: true } } }, + include: { + inquiryForm: { select: { name: true } }, + offering: { select: { id: true, name: true } }, + }, orderBy: { createdAt: "desc" }, }); } diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index ab8496d..c22c998 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -252,6 +252,7 @@ export class CustomerInquirySubmissionController { data: { brandId: identity.brandId, inquiryFormId: form.id, + offeringId: form.offeringId, formVersion: form.version, fieldsSnapshot: form.fieldsSnapshot as Prisma.InputJsonValue, values: body.values as Prisma.InputJsonValue, diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index c6d9cf1..f560fe1 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -234,6 +234,7 @@ test("admin can create and version an inquiry form", async () => { }); assert.equal(submission.statusCode, 201); assert.equal(JSON.parse(submission.body).formVersion, 2); + assert.equal(JSON.parse(submission.body).offeringId, offering.id); const adminSubmissionsWithoutToken = await request("/admin/workspace/submissions"); assert.equal(adminSubmissionsWithoutToken.statusCode, 401); const adminSubmissions = await request("/admin/workspace/submissions", { @@ -243,6 +244,10 @@ test("admin can create and version an inquiry form", async () => { assert.ok( JSON.parse(adminSubmissions.body).some((item) => item.id === JSON.parse(submission.body).id), ); + const savedSubmission = JSON.parse(adminSubmissions.body).find( + (item) => item.id === JSON.parse(submission.body).id, + ); + assert.equal(savedSubmission.offering.id, offering.id); } finally { await prisma.inquirySubmission.deleteMany({ where: { inquiryFormId: id } }); await prisma.inquiryForm.delete({ where: { id } });