sitero 0.0.16 → 0.0.17

package/dist/src/core/server/infrastructure/database/order/command/order-command-repository.js

@@ -1,35 +1,61 @@
 import { connectOne } from '../../utils/connect.js';
 import { orderToDomain } from '../utils/order-to-domain.js';
 
+const ORDER_NUMBER_TIME_ZONE = "Asia/Taipei";
+function formatOrderNumberDate(date, timeZone) {
+  return new Intl.DateTimeFormat("en-CA", {
+    timeZone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).format(date).replaceAll("-", "");
+}
+async function generateOrderNumber(tx) {
+  const dateKey = formatOrderNumberDate(/* @__PURE__ */ new Date(), ORDER_NUMBER_TIME_ZONE);
+  const sequence = await tx.$queryRaw`
+    INSERT INTO order_number_sequences ("date", "current_value")
+    VALUES (${dateKey}, 1)
+    ON CONFLICT ("date")
+    DO UPDATE
+    SET "current_value" = order_number_sequences."current_value" + 1
+    RETURNING "current_value" as "currentValue"
+  `;
+  return `${dateKey}${String(sequence[0].currentValue).padStart(4, "0")}`;
+}
 function createOrderCommandRepository(prisma) {
   async function create({
+    orderNumber: _orderNumber,
     isTest,
     user,
     items,
     ...rest
   }) {
-    const created = await prisma.order.create({
-      data: {
-        ...rest,
-        // states
-        ...isTest !== void 0 ? { isTest } : {},
-        // ------------------------------------
-        // relations
-        // ------------------------------------
-        // User
-        user: connectOne(user),
-        // OrderItem
-        items: {
-          create: items.map(({ product, ...itemRest }) => ({
-            ...itemRest,
-            // ------------------------------------
-            // relations
-            // ------------------------------------
-            // Post
-            product: connectOne(product)
-          }))
+    const created = await prisma.$transaction(async (tx) => {
+      const orderNumber = await generateOrderNumber(tx);
+      return tx.order.create({
+        data: {
+          ...rest,
+          orderNumber,
+          // states
+          ...isTest !== void 0 ? { isTest } : {},
+          // ------------------------------------
+          // relations
+          // ------------------------------------
+          // User
+          user: connectOne(user),
+          // OrderItem
+          items: {
+            create: items.map(({ product, ...itemRest }) => ({
+              ...itemRest,
+              // ------------------------------------
+              // relations
+              // ------------------------------------
+              // Post
+              product: connectOne(product)
+            }))
+          }
         }
-      }
+      });
     });
     return orderToDomain(created);
   }

package/dist/src/web/server/interfaces/actions/resources/order/commands/create/order-create-action.js

@@ -2,7 +2,6 @@ import { getTranslator } from 'intor/next/server';
 import '../../../../../../../../core/domain/resources/admin/constants.js';
 import '../../../../../../../../core/domain/resources/user/constants.js';
 import { ORDER_SHIPPING_STATUS, ORDER_PAYMENT_STATUS, ORDER_PAYMENT_METHODS } from '../../../../../../../../core/domain/resources/order/props.js';
-import { generateOrderNumber } from '../../../../../../../../core/domain/resources/order/utils/generate-order-number.js';
 import { orderCreateValidator } from './order-create-validator.js';
 
 function createOrderCreateAction(ctx) {
@@ -31,7 +30,9 @@ function createOrderCreateAction(ctx) {
         }).parseAsync(formData);
         const order = await repositories.orderCommandRepository.create({
           ...rest,
-          orderNumber: isTest ? generateOrderNumber({ prefix: "\u6E2C\u8A66" }) : generateOrderNumber(),
+          // orderNumber: isTest
+          //   ? generateOrderNumber({ prefix: "測試" })
+          //   : generateOrderNumber(),
           // states
           isTest,
           // --- money

package/dist/types/src/core/server/infrastructure/database/order/command/order-command-repository.d.ts

@@ -2,7 +2,7 @@ import type { CreateParams, UpdateParams } from "./types";
 import type { PrismaClient } from "../../../../../../../prisma/generated/client";
 import type { Order } from "../../../../../domain";
 export declare function createOrderCommandRepository(prisma: PrismaClient): {
-    create: ({ isTest, user, items, ...rest }: CreateParams) => Promise<Order>;
+    create: ({ orderNumber: _orderNumber, isTest, user, items, ...rest }: CreateParams) => Promise<Order>;
     update: ({ id, ...rest }: UpdateParams) => Promise<Order>;
     delete: ({ id }: {
         id: string;

package/dist/types/src/core/server/infrastructure/database/order/command/order-command-repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-command-repository.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/server/infrastructure/database/order/command/order-command-repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY;+CAS5D,YAAY,KAAG,OAAO,CAAC,KAAK,CAAC;8BAiCO,YAAY,KAAG,OAAO,CAAC,KAAK,CAAC;qBAarC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,KAAK,CAAC;EAe/D"}
+{"version":3,"file":"order-command-repository.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/server/infrastructure/database/order/command/order-command-repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,EAEV,YAAY,EACb,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA+BnD,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,YAAY;0EAU5D,YAAY,KAAG,OAAO,CAAC,KAAK,CAAC;8BAuCO,YAAY,KAAG,OAAO,CAAC,KAAK,CAAC;qBAarC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,KAAK,CAAC;EAe/D"}

package/dist/types/src/web/server/interfaces/actions/resources/order/commands/create/order-create-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-create-action.d.ts","sourceRoot":"","sources":["../../../../../../../../../../../src/web/server/interfaces/actions/resources/order/commands/create/order-create-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACf,MAAM,iDAAiD,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAKL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACd,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;GAEG;AAEH,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,EAChD,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,eAAe,GAAG,gBAAgB,CACpE,GAAG;IACF,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,cAAc,GAAG,IAAI,CAAC;IACjC,KAAK,EAAE,UAAU,CAAC;IAClB,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,aAAa,IAUhB,eAErC;IACD,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;;IAqHF"}
+{"version":3,"file":"order-create-action.d.ts","sourceRoot":"","sources":["../../../../../../../../../../../src/web/server/interfaces/actions/resources/order/commands/create/order-create-action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACf,MAAM,iDAAiD,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACd,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;GAEG;AAEH,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,EAChD,MAAM,GAAG,WAAW,GAAG,OAAO,GAAG,eAAe,GAAG,gBAAgB,CACpE,GAAG;IACF,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,cAAc,GAAG,IAAI,CAAC;IACjC,KAAK,EAAE,UAAU,CAAC;IAClB,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,aAAa,IAUhB,eAErC;IACD,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;;IAqHF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sitero",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",