@chevre/domain 25.0.0-alpha.17 → 25.0.0-alpha.18

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -72,6 +72,11 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
         project: {
             id: string;
         };
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
     }): Promise<string>;
     /**
      * 注文取引からcustomerを参照する

package/lib/chevre/repo/orderInTransaction.js

@@ -49,12 +49,13 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
      * 注文取引から注文番号を参照する
      * 存在しなければNotFoundError
      */
-    async findOrderNumberByIdentifier(params) {
+    async findOrderNumberByIdentifier(params, options) {
         const { project, identifier } = params;
+        const onlyPlaceOrder = options.onlyPlaceOrder === true;
         const doc = await this.orderModel.findOne({
             identifier: { $eq: identifier },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            'project.id': { $eq: project.id }
+            'project.id': { $eq: project.id },
+            ...((onlyPlaceOrder) && { typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder } })
         }, {
             _id: 0,
             orderNumber: 1

package/lib/chevre/service/offer/event/authorize.js

@@ -28,7 +28,7 @@ function authorize(params, options) {
         const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
             identifier: transaction.id,
             project: { id: params.project.id },
-        });
+        }, { onlyPlaceOrder: true });
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({

package/lib/chevre/service/payment/any/authorize/fixOrderAsNeeded.js

@@ -20,7 +20,7 @@ function fixOrderAsNeeded(params) {
         const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
             identifier: params.purpose.id,
             project: { id: params.project.id },
-        });
+        }, { onlyPlaceOrder: true });
         return { confirmationNumber, orderNumber };
     };
 }

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -19,16 +19,17 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction');
 /**
  * 進行中でない取引を処理する
  */
-function processTransactionNotInProgress(transaction) {
+function processTransactionNotInProgress(params) {
     return async (repos) => {
+        const { transaction, orderNumber } = params;
         if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
             const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
-                orderNumber: { $eq: String(transaction.object.orderNumber) }
+                orderNumber: { $eq: orderNumber }
             });
             // if (resultCustomer === undefined) {
             //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             // }
-            const { confirmationNumber, orderNumber } = transaction.object;
+            const { confirmationNumber } = transaction.object;
             // Confirmedの取引であればobjectには必ず存在するはず
             if (typeof confirmationNumber !== 'string' || typeof orderNumber !== 'string'
                 || confirmationNumber === '' || orderNumber === '') {
@@ -62,18 +63,24 @@ function confirm(params, options) {
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
-        const confirmResult = await processTransactionNotInProgress(transaction)(repos);
+        // 注文ドキュメントから注文番号を参照(取引開始時に発行済の前提)(2026-06-26~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.id,
+            project: { id: transaction.project.id }
+        }, { onlyPlaceOrder: false } // すでに取引確定済かもしれないのでfalse
+        );
+        const confirmResult = await processTransactionNotInProgress({ transaction, orderNumber })(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
         }
         if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
-        // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
-        const orderNumber = transaction.object.orderNumber;
-        if (typeof orderNumber !== 'string' || orderNumber === '') {
-            throw new factory_1.factory.errors.Argument('transactionId', 'orderNumber not issued');
-        }
+        // // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
+        // const orderNumber = transaction.object.orderNumber;
+        // if (typeof orderNumber !== 'string' || orderNumber === '') {
+        //     throw new factory.errors.Argument('transactionId', 'orderNumber not issued');
+        // }
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -77,7 +77,7 @@ function updateAgent(params) {
             const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
                 identifier: params.id,
                 project: { id: transaction.project.id },
-            });
+            }, { onlyPlaceOrder: true });
             const customerName = (typeof customer.name === 'string' && customer.name !== '')
                 ? customer.name
                 : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.17"
+  "version": "25.0.0-alpha.18"
 }