@chevre/domain 25.2.0-alpha.18 → 25.2.0-alpha.19

package/lib/chevre/repo/mongoose/schemas/order.d.ts

@@ -7,6 +7,10 @@ type IDocType = Omit<factory.order.IOrder, 'id'> & {
      * 注文取引IDとして再定義(2026-06-22~)
      */
     identifier?: string;
+    /**
+     * 外部URL決済の場合に発行される決済方法IDとして定義(2026-07-12~)
+     */
+    paymentMethodId?: string;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/mongoose/schemas/order.js

@@ -27,6 +27,7 @@ const schemaDefinition = {
     dateReturned: Date,
     orderedItem: [mongoose_1.SchemaTypes.Mixed],
     identifier: { type: String, required: true }, // 注文取引IDとして再定義(2026-06-22~)
+    paymentMethodId: { type: String, required: false }, // 注文取引から移行(2026-07-12~)
     // 以下廃止(2026-06-13~)
     // identifier: SchemaTypes.Mixed, // 廃止するためにMixed化(2026-06-12~)
     // isGift: Boolean,

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

@@ -135,6 +135,7 @@ export declare class OrderRepo {
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer[];
         identifier?: string;
+        paymentMethodId?: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -142,6 +143,7 @@ export declare class OrderRepo {
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer[];
         identifier?: string;
+        paymentMethodId?: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/repo/orderInTransaction.js

@@ -298,7 +298,20 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             .exec()
             .then((doc) => {
             if (doc === null) {
-                throw new factory_1.factory.errors.ArgumentNull(factory_1.factory.transactionType.PlaceOrder);
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
+            }
+        });
+        // 注文ドキュメントにも保管する(2026-07-12~)
+        await this.orderModel.findOneAndUpdate({
+            identifier: { $eq: params.id },
+            paymentMethodId: { $exists: false },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+        }, { $set: { paymentMethodId: params.paymentMethod } }, { projection: { _id: 1 } })
+            .lean()
+            .exec()
+            .then((doc) => {
+            if (doc === null) {
+                throw new factory_1.factory.errors.NotFound('orderInTransaction');
             }
         });
     }
@@ -331,7 +344,24 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${factory_1.factory.transactionType.PlaceOrder} ${factory_1.factory.transactionStatusType.InProgress} not found`);
         }
-        return (typeof doc.object.paymentMethods?.paymentMethodId === 'string') ? doc.object.paymentMethods.paymentMethodId : undefined;
+        const paymentMethodId = doc.object.paymentMethods?.paymentMethodId;
+        if (typeof paymentMethodId === 'string') {
+            // 注文ドキュメントにも発行済の場合、同一性を検証(2026-07-12~)
+            const orderDoc = await this.orderModel.findOne({ identifier: { $eq: params.id } }, { paymentMethodId: 1 })
+                .lean()
+                .exec();
+            if (orderDoc === null) {
+                throw new factory_1.factory.errors.NotFound('orderInTransaction');
+            }
+            const paymentMethodIdByOrder = orderDoc.paymentMethodId;
+            if (typeof paymentMethodIdByOrder === 'string') {
+                console.log('paymentMethodId matched?', JSON.stringify(doc), JSON.stringify(orderDoc));
+                if (paymentMethodId !== paymentMethodIdByOrder) {
+                    throw new factory_1.factory.errors.Internal('paymentMethodId not matched unexpectedly');
+                }
+            }
+        }
+        return (typeof paymentMethodId === 'string') ? paymentMethodId : undefined;
     }
     async deleteByIdentifier(params) {
         return this.orderModel.deleteOne({

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -6,7 +6,11 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: {
+    id: string;
+}, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer, options: {
+    paymentMethodIdByTransaction?: string;
+}): void;
 /**
  * 注文オファー数検証
  */

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

@@ -21,8 +21,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
-    // validateProfile(transaction);
+function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, eventReservationAcceptedOffers, payTransactions, customer, options) {
+    const { paymentMethodIdByTransaction } = options;
     validateProfile({ customer });
     (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions);
     // 請求のreferencesOrder検証(2025-11-23~)
@@ -61,7 +61,7 @@ function validateTransaction(transaction, acceptPayActions, authorizePaymentActi
         });
     }
     // 決済URLが発行されている場合、検証
-    validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions);
+    validatePaymentUrl({ paymentMethodIdByTransaction, acceptPayActions, authorizePaymentActions });
 }
 function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentActions, eventReservationAcceptedOffers) {
     const paymentMethodTypes = [];
@@ -106,9 +106,11 @@ function validateProfile(params) {
         throw new factory_1.factory.errors.Argument('Transaction', 'customer name required');
     }
 }
-function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions) {
+function validatePaymentUrl(params) {
+    const { paymentMethodIdByTransaction, acceptPayActions, authorizePaymentActions } = params;
     // 決済URLが発行されている場合、検証
-    const paymentMethodId = transaction.object.paymentMethods?.paymentMethodId;
+    const paymentMethodId = paymentMethodIdByTransaction;
+    debug('validatePaymentUrl: paymentMethodIdByTransaction:', paymentMethodIdByTransaction);
     if (typeof paymentMethodId === 'string' && paymentMethodId.length > 0) {
         // check existing accept action(2025-02-26~)
         const acceptActionExists = acceptPayActions.some(({ object, result }) => {
@@ -116,6 +118,7 @@ function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActio
                 && result?.paymentMethodId === paymentMethodId
                 && typeof result?.paymentUrl === 'string';
         });
+        debug('validatePaymentUrl: acceptActionExists:', acceptActionExists);
         if (!acceptActionExists) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.AcceptAction);
         }
@@ -127,6 +130,7 @@ function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActio
                 : undefined;
             return resultAsInvoice?.paymentMethodId === paymentMethodId;
         });
+        debug('validatePaymentUrl: authorizePaymentAction4paymentUrlExists:', authorizePaymentAction4paymentUrlExists);
         if (!authorizePaymentAction4paymentUrlExists) {
             throw new factory_1.factory.errors.Argument('Transaction', 'Payment for published payment URL required');
         }

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

@@ -82,10 +82,12 @@ function confirm(params, options) {
         // if (typeof orderNumber !== 'string' || orderNumber === '') {
         //     throw new factory.errors.Argument('transactionId', 'orderNumber not issued');
         // }
+        // 注文に決済方法IDが発行済か確認(2026-07-12)
+        const paymentMethodIdByTransaction = await repos.orderInTransaction.findPaymentMethodId({ id: params.id });
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
-        if (typeof transaction.object.paymentMethods?.paymentMethodId === 'string') {
+        if (typeof paymentMethodIdByTransaction === 'string') {
             acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
         // 必要あらば注文コード発行(2024-02-05~)
@@ -149,7 +151,8 @@ function confirm(params, options) {
             authorizePaymentActions, authorizeEventServiceOfferActions,
             acceptedOffers, payTransactions, customer,
             ...(typeof code === 'string') ? { code } : undefined,
-            ...((Array.isArray(unitPriceOfferConditions)) && { unitPriceOfferConditions })
+            ...((Array.isArray(unitPriceOfferConditions)) && { unitPriceOfferConditions }),
+            paymentMethodIdByTransaction
         }, options);
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
@@ -321,7 +324,10 @@ function createResult(params, options) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
+    const { paymentMethodIdByTransaction } = params;
+    (0, validation_1.validateTransaction)({ id: transaction.id }, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer, {
+        ...((typeof paymentMethodIdByTransaction === 'string') && { paymentMethodIdByTransaction })
+    });
     const { paymentMethods, price } = (0, factory_2.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers

package/package.json

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