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

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

@@ -62,6 +62,7 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
  */
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
+    private readonly transactionModel;
     constructor(connection: Connection);
     createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
@@ -147,6 +148,26 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
          */
         onlyPlaceOrder: boolean;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 特定の進行中取引の決済方法IDを保管する
+     * transactionsへの保管としてひとまず定義(2026-07-11~)
+     */
+    savePaymentMethodId(params: {
+        id: string;
+        paymentMethod: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
+    }): Promise<void>;
+    /**
+     * 進行中取引に保管された採用済決済方法を検索する
+     */
+    findInProgressPaymentMethodId(params: {
+        id: string;
+    }): Promise<string | undefined>;
+    /**
+     * 保管された採用済決済方法を検索する
+     */
+    findPaymentMethodId(params: {
+        id: string;
+    }): Promise<string | undefined>;
     deleteByIdentifier(params: {
         identifier: string;
     }): Promise<import("mongodb").DeleteResult>;

package/lib/chevre/repo/orderInTransaction.js

@@ -5,6 +5,7 @@ exports.OrderInTransactionRepo = void 0;
 const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
+const transaction_1 = require("./mongoose/schemas/transaction");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 // const debug = createDebug('chevre-domain:repo:orderInTransaction');
 /**
@@ -12,9 +13,11 @@ const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
  */
 class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveRepo {
     orderModel;
+    transactionModel;
     constructor(connection) {
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
+        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
     }
     async createPlaceOrderIfNotExists(params) {
         const { orderNumber, project, identifier, broker, seller, customer } = params;
@@ -274,6 +277,62 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         }, { $set: { confirmationNumber } })
             .exec();
     }
+    /**
+     * 特定の進行中取引の決済方法IDを保管する
+     * transactionsへの保管としてひとまず定義(2026-07-11~)
+     */
+    async savePaymentMethodId(params) {
+        const { paymentMethodId } = params.paymentMethod;
+        if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+            throw new factory_1.factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
+        }
+        await this.transactionModel.findOneAndUpdate({
+            _id: { $eq: params.id },
+            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
+        }, {
+            $set: { 'object.paymentMethods': params.paymentMethod }
+        }, {
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec()
+            .then((doc) => {
+            if (doc === null) {
+                throw new factory_1.factory.errors.ArgumentNull(factory_1.factory.transactionType.PlaceOrder);
+            }
+        });
+    }
+    /**
+     * 進行中取引に保管された採用済決済方法を検索する
+     */
+    async findInProgressPaymentMethodId(params) {
+        const doc = await this.transactionModel.findOne({
+            _id: { $eq: params.id },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
+            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
+        }, { 'object.paymentMethods': 1 })
+            .lean()
+            .exec();
+        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;
+    }
+    /**
+     * 保管された採用済決済方法を検索する
+     */
+    async findPaymentMethodId(params) {
+        const doc = await this.transactionModel.findOne({
+            _id: { $eq: params.id },
+            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder }
+        }, { 'object.paymentMethods': 1 })
+            .lean()
+            .exec();
+        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;
+    }
     async deleteByIdentifier(params) {
         return this.orderModel.deleteOne({
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },

package/lib/chevre/repo/transaction/placeOrder.d.ts

@@ -37,12 +37,6 @@ export declare class PlaceOrderRepo {
     }): Promise<(Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IKeyOfProjection> & {
         id: string;
     })[]>;
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    findInProgressPaymentMethodId(params: {
-        id: string;
-    }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
     /**
      * 取引期限変更
      */
@@ -51,17 +45,6 @@ export declare class PlaceOrderRepo {
         id: string;
         expires: Date;
     }): Promise<void>;
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    findByIdAndUpdateInProgress(params: {
-        id: string;
-        update: {
-            $set?: {
-                'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
-            };
-        };
-    }): Promise<void>;
     /**
      * 進行中取引のobjectに注文番号を保管する
      */

package/lib/chevre/repo/transaction/placeOrder.js

@@ -186,22 +186,6 @@ class PlaceOrderRepo {
             .lean()
             .exec();
     }
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    async findInProgressPaymentMethodId(params) {
-        const doc = await this.transactionModel.findOne({
-            _id: { $eq: params.id },
-            typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, { 'object.paymentMethods': 1 })
-            .lean() // 2024-08-26~
-            .exec();
-        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 doc.object.paymentMethods;
-    }
     // /**
     //  * 取引の注文番号を検索する
     //  */
@@ -272,60 +256,6 @@ class PlaceOrderRepo {
             throw new factory_1.factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory_1.factory.transactionStatusType.InProgress} not found`);
         }
     }
-    // /**
-    //  * 取引オブジェクトを更新
-    //  * 注文名称など
-    //  */
-    // public async updateObject(params: {
-    //     typeOf: factory.transactionType.PlaceOrder;
-    //     id: string;
-    //     object?: {
-    //         name?: string;
-    //     };
-    // }): Promise<void> {
-    //     const doc = await this.transactionModel.findOneAndUpdate(
-    //         {
-    //             _id: { $eq: params.id },
-    //             typeOf: { $eq: params.typeOf },
-    //             status: { $eq: factory.transactionStatusType.InProgress }
-    //         },
-    //         {
-    //             $set: {
-    //                 ...(typeof params.object?.name === 'string') ? { 'object.name': params.object.name } : undefined
-    //             }
-    //         },
-    //         {
-    //             projection: { _id: 1 }
-    //         }
-    //     )
-    //         .lean<{ _id: ObjectId }>()
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(
-    //             this.transactionModel.modelName,
-    //             `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`
-    //         );
-    //     }
-    // }
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    async findByIdAndUpdateInProgress(params) {
-        await this.transactionModel.findOneAndUpdate({
-            _id: { $eq: params.id },
-            status: { $eq: factory_1.factory.transactionStatusType.InProgress }
-        }, params.update, {
-            // new: true,
-            projection: { _id: 1 }
-        })
-            .lean()
-            .exec()
-            .then((doc) => {
-            if (doc === null) {
-                throw new factory_1.factory.errors.ArgumentNull(this.transactionModel.modelName);
-            }
-        });
-    }
     /**
      * 進行中取引のobjectに注文番号を保管する
      */

package/lib/chevre/service/assetTransaction/pay/start/factory.js

@@ -82,7 +82,8 @@ function createStartParams(params, options) {
             break;
         }
         default:
-        // no op
+            // no op
+            throw new factory_1.factory.errors.NotImplemented(`paymentServiceType: ${params.paymentServiceType} not implemented`);
     }
     // const informPaymentParams = createInformPaymentParams({
     //     paymentService: <factory.service.paymentService.IService | undefined>params.paymentService
@@ -122,12 +123,10 @@ function createStartParams(params, options) {
             : paymentMethodType,
         amount: paymentMethodAmount, // MonetaryAmount対応(2023-08-14~)
         identifier: paymentMethodType, // 追加(2023-08-29~)
+        totalPaymentDue,
         ...(typeof params.object.paymentMethod?.description === 'string')
             ? { description: params.object.paymentMethod?.description }
             : undefined,
-        ...(totalPaymentDue !== undefined)
-            ? { totalPaymentDue: totalPaymentDue }
-            : undefined,
         ...(typeof accountId === 'string') ? { accountId: accountId } : undefined,
         ...(typeof params.object.paymentMethod?.method === 'string')
             ? { method: params.object.paymentMethod?.method }

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -3,7 +3,8 @@ import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
 import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
-import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
+import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+import type { ITransactionInProgress } from '../../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import { IInvoiceByTicketToken } from '../factory';
@@ -13,7 +14,7 @@ interface IFixTransactionNumberRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-    placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts

@@ -3,7 +3,8 @@ import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
 import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
-import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
+import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+import type { ITransactionInProgress } from '../../../../repo/transaction/placeOrder';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import type { IInvoiceByTicketToken } from '../factory';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
@@ -17,7 +18,7 @@ interface IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-    placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
 }
 /**
  * 決済承認前の決済採用アクションを参照する
@@ -29,9 +30,9 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
 }): (repos: IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;
-        paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
         pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction;
         acceptAction2ticketResult?: IAcceptAction2ticketResult;
+        paymentMethodByTransaction?: never;
     };
     existingCompletedAuthorizeAction?: never;
 } | {

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

@@ -98,25 +98,8 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
         let existingCompletedAuthorizeAction;
         let acceptPayAction;
         // transaction.objectへのアクセス回避(2024-05-30~)
-        // const paymentMethodByTransaction = transaction.object.paymentMethods;
-        const paymentMethodByTransaction = await repos.placeOrder.findInProgressPaymentMethodId({ id: params.transaction.id });
-        if (params.prePublishedPaymentMethodId === paymentMethodByTransaction?.paymentMethodId) {
-            // check existence of acceptAction when authorizing payment(2024-06-01~)
-            // acceptPayAction = (<Pick<IAcceptPayAction, 'object' | 'result' | 'id' | 'instrument'>[]>await repos.action.search<factory.actionType.AcceptAction>(
-            //     {
-            //         limit: 1,
-            //         page: 1,
-            //         project: { id: { $eq: params.transaction.project.id } },
-            //         typeOf: { $eq: factory.actionType.AcceptAction },
-            //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-            //         purpose: { id: { $in: [params.transaction.id] } },
-            //         object: {
-            //             transactionNumber: { $eq: params.prePublishedPaymentMethodId },
-            //             typeOf: { $eq: factory.assetTransactionType.Pay }
-            //         }
-            //     },
-            //     ['object', 'result', 'instrument']
-            // )).shift();
+        const paymentMethodIdByTransaction = await repos.orderInTransaction.findInProgressPaymentMethodId({ id: params.transaction.id });
+        if (params.prePublishedPaymentMethodId === paymentMethodIdByTransaction) {
             acceptPayAction = (await repos.acceptPayAction.findCompletedAcceptActionsByTransactionNumber({
                 project: { id: params.transaction.project.id },
                 purpose: { id: params.transaction.id },
@@ -154,17 +137,6 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                 throw new factory_1.factory.errors.Argument('paymentMethodId', 'pendingPaymentAgencyTransaction not found');
             }
             // 既に承認済であれば何もしない(2023-05-15~)
-            // const existingCompletedAuthorizeActions = <IAuthorizePaymentAction[]>
-            //     await repos.action.searchByPurpose<factory.actionType.AuthorizeAction>({
-            //         typeOf: factory.actionType.AuthorizeAction,
-            //         purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
-            //         actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
-            //         object: {
-            //             paymentMethodId: { $eq: params.prePublishedPaymentMethodId },
-            //             typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
-            //         },
-            //         sort: { startDate: factory.sortType.Ascending }
-            //     });
             const existingCompletedAuthorizeActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
                 purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
                 actionStatus: { $eq: factory_1.factory.actionStatusType.CompletedActionStatus },
@@ -185,7 +157,7 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                 acceptPayAction
             })(repos);
             return {
-                authorizeParams: { creditCard, pendingPaymentAgencyTransaction, paymentMethodByTransaction, acceptAction2ticketResult }
+                authorizeParams: { creditCard, pendingPaymentAgencyTransaction, acceptAction2ticketResult }
             };
         }
         else {

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

@@ -78,13 +78,15 @@ function authorize(params) {
             authorizePaymentMethodAction: repos.authorizePaymentMethodAction,
             authorization: repos.authorization,
             ticket: repos.ticket,
-            placeOrder: repos.placeOrder,
+            orderInTransaction: repos.orderInTransaction,
             transactionNumber: repos.transactionNumber
         });
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken, ticketToken } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, 
+        // invoiceByTicketToken,
+        ticketToken } = fixTransactionNumberResult;
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_2.createMovieTicket) : undefined;
         const { accountId } = await fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
@@ -196,10 +198,10 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_2.createAuthorizeResult)({
+        const result = (0, factory_2.payTransaction2actionResult)({
             payTransaction,
-            object: authorizeObjectIncludingPaymentMethodDetails,
-            invoiceByTicketToken
+            // object: authorizeObjectIncludingPaymentMethodDetails,
+            // invoiceByTicketToken
         });
         await repos.authorizePaymentMethodAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };

package/lib/chevre/service/payment/any/factory.d.ts

@@ -49,13 +49,13 @@ export declare function creatPayTransactionStartParams(params: {
     instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 };
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
-export declare function createAuthorizeResult(params: {
-    object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
+/**
+ * 決済取引から決済承認アクション結果を生成する
+ */
+export declare function payTransaction2actionResult(params: {
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
-    /**
-     * 決済方法チケットの承認対象
-     */
-    invoiceByTicketToken?: IInvoiceByTicketToken;
+    object?: never;
+    invoiceByTicketToken?: never;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

package/lib/chevre/service/payment/any/factory.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.creatPublishPaymentUrlParams = creatPublishPaymentUrlParams;
 exports.creatPayTransactionStartParams = creatPayTransactionStartParams;
 exports.createMovieTicket = createMovieTicket;
-exports.createAuthorizeResult = createAuthorizeResult;
+exports.payTransaction2actionResult = payTransaction2actionResult;
 exports.optimizeAction4inform = optimizeAction4inform;
 const moment_1 = __importDefault(require("moment"));
 const util_1 = require("util");
@@ -193,8 +193,14 @@ function createMovieTicket(params) {
         serviceOutput
     };
 }
-function createAuthorizeResult(params) {
-    const payTransactionObject = params.payTransaction.object;
+/**
+ * 決済取引から決済承認アクション結果を生成する
+ */
+function payTransaction2actionResult(params) {
+    const { 
+    // object,
+    payTransaction } = params;
+    const payTransactionObject = payTransaction.object;
     const totalPaymentDue = payTransactionObject.paymentMethod?.totalPaymentDue;
     if (typeof totalPaymentDue?.typeOf !== 'string') {
         throw new factory_1.factory.errors.Internal('payTransaction.object.paymentMethod.totalPaymentDue undefined');
@@ -208,7 +214,8 @@ function createAuthorizeResult(params) {
         ? payTransactionObject.paymentMethod?.amount?.currency
         : undefined;
     const paymentMethodAsObject = {
-        typeOf: params.object.paymentMethod,
+        // typeOf: object.paymentMethod,
+        typeOf: payTransactionObject.paymentMethod.identifier,
         // CreditCardIFのカード通貨区分を追加(2023-08-15~)
         ...(payTransactionObject.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard
             && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
@@ -223,9 +230,11 @@ function createAuthorizeResult(params) {
         }
     }
     let invoiceOrderItems;
-    if (params.object.referencesOrder.typeOf === factory_1.factory.order.OrderType.Order) {
-        if (Array.isArray(params.object.referencesOrder.orderedItem)) {
-            invoiceOrderItems = params.object.referencesOrder.orderedItem;
+    // const referencesOrderByObject = object.referencesOrder;
+    const referencesOrderByObject = payTransactionObject.serviceOutput?.referencesOrder;
+    if (referencesOrderByObject?.typeOf === factory_1.factory.order.OrderType.Order) {
+        if (Array.isArray(referencesOrderByObject.orderedItem)) {
+            invoiceOrderItems = referencesOrderByObject.orderedItem;
         }
     }
     const referencesOrder = {
@@ -239,8 +248,6 @@ function createAuthorizeResult(params) {
             ? payTransactionObject.paymentMethod.accountId
             : '',
         issuedThrough,
-        // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
-        // paymentMethod: params.object.paymentMethod,
         paymentMethodAsObject,
         paymentStatus,
         paymentMethodId: (typeof payTransactionObject.paymentMethodId === 'string')
@@ -248,22 +255,12 @@ function createAuthorizeResult(params) {
             : '',
         name: (typeof payTransactionObject.paymentMethod?.name === 'string')
             ? payTransactionObject.paymentMethod.name
-            : params.object.paymentMethod,
+            : payTransactionObject.paymentMethod.identifier,
         totalPaymentDue: totalPaymentDue,
-        additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [],
+        additionalProperty: (Array.isArray(payTransactionObject.paymentMethod.additionalProperty)) ? payTransactionObject.paymentMethod.additionalProperty : [],
         typeOf: factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment,
         referencesOrder // add(2025-11-23~)
     };
-    // eslint-disable-next-line no-warning-comments
-    // TODO 保留 resultにメンバーシップを追加(2024-08-13~)
-    // let resultAsPermit: factory.action.authorize.paymentMethod.any.IResultAsPermit | undefined;
-    // if (typeof params.permit?.identifier === 'string') {
-    //     resultAsPermit = {
-    //         typeOf: factory.permit.PermitType.Permit,
-    //         identifier: params.permit.identifier,
-    //         issuedThrough: { serviceType: params.permit.issuedThrough?.serviceType }
-    //     };
-    // }
     // Arrayに統一(2023-09-04~)
     // if (resultAsPermit !== undefined) {
     //     return [resultAsInvoice, resultAsPermit];

package/lib/chevre/service/payment/any/invalidatePaymentUrl.d.ts

@@ -6,6 +6,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IInvalidatePaymentUrlRepos {
     accountingReport: AccountingReportRepo;
@@ -16,6 +17,7 @@ interface IInvalidatePaymentUrlRepos {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
+    orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }
 /**

package/lib/chevre/service/payment/any/invalidatePaymentUrl.js

@@ -25,14 +25,6 @@ function invalidatePaymentUrl(params) {
         // }
         // support multiple accept actions(2025-02-25~)
         let acceptPayActions = await repos.acceptPayAction.findAcceptActionsByPurpose({
-            // project: { id: { $eq: transaction.project.id } },
-            // typeOf: { $eq: factory.actionType.AcceptAction },
-            // // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, // all statuses(2025-02-26~)
-            // purpose: { id: { $in: [transaction.id] } },
-            // object: {
-            //     // transactionNumber: { $eq: paymentMethodIdByPaymentUrl },
-            //     typeOf: { $eq: factory.assetTransactionType.Pay }
-            // }
             project: { id: transaction.project.id },
             purpose: { id: transaction.id },
         }, ['object']);
@@ -43,9 +35,10 @@ function invalidatePaymentUrl(params) {
                 // support OrderCanceled(2025-02-25~)
                 const orderCancelled = params.purpose.result?.order?.orderStatus === factory_1.factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
-                    const paymentMethodIdByPaymentUrl = transaction.object.paymentMethods?.paymentMethodId;
-                    if (typeof paymentMethodIdByPaymentUrl === 'string') {
-                        acceptPayActions = acceptPayActions.filter(({ object }) => object.transactionNumber !== paymentMethodIdByPaymentUrl);
+                    // 確定取引の場合、注文に紐づいた決済方法IDは除外しなければいけない
+                    const paymentMethodIdByTransaction = await repos.orderInTransaction.findPaymentMethodId({ id: transaction.id });
+                    if (typeof paymentMethodIdByTransaction === 'string') {
+                        acceptPayActions = acceptPayActions.filter(({ object }) => object.transactionNumber !== paymentMethodIdByTransaction);
                     }
                 }
                 break;
@@ -106,60 +99,5 @@ function invalidatePaymentUrl(params) {
         if (invalidatePaymentUrlTasks.length > 0) {
             await repos.task.saveMany(invalidatePaymentUrlTasks, { emitImmediately: true });
         }
-        // const paymentMethodIdByPaymentUrl = transaction.object.paymentMethods?.paymentMethodId;
-        // if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0) {
-        //     const acceptPayAction = (<Pick<IAcceptPayAction, 'object'>[]>await repos.action.search(
-        //         {
-        //             limit: 1,
-        //             page: 1,
-        //             project: { id: { $eq: transaction.project.id } },
-        //             typeOf: { $eq: factory.actionType.AcceptAction },
-        //             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-        //             purpose: { id: { $in: [transaction.id] } },
-        //             object: {
-        //                 transactionNumber: { $eq: paymentMethodIdByPaymentUrl },
-        //                 typeOf: { $eq: factory.assetTransactionType.Pay }
-        //             }
-        //         },
-        //         ['object']
-        //     )).shift();
-        //     if (acceptPayAction !== undefined) {
-        //         // const paymentMethodType = transaction.object.paymentMethods?.typeOf;
-        //         const paymentMethodType = acceptPayAction.object.object.paymentMethod.identifier;
-        //         if (typeof paymentMethodType === 'string' && paymentMethodType.length > 0) {
-        //             // chevreで決済URL無効化
-        //             await PayTransactionService.invalidatePaymentUrl({
-        //                 project: transaction.project,
-        //                 typeOf: factory.actionType.RefundAction,
-        //                 agent: {
-        //                     typeOf: transaction.seller.typeOf,
-        //                     name: (typeof transaction.seller.name === 'string')
-        //                         ? transaction.seller.name
-        //                         : String(transaction.seller.name?.ja),
-        //                     id: transaction.seller.id
-        //                 },
-        //                 recipient: {
-        //                     typeOf: transaction.agent.typeOf,
-        //                     id: transaction.agent.id,
-        //                     name: transaction.agent.name
-        //                 },
-        //                 object: [{
-        //                     typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-        //                     id: acceptPayAction.object.object.id,
-        //                     paymentMethod: {
-        //                         additionalProperty: [],
-        //                         name: paymentMethodType,
-        //                         typeOf: paymentMethodType,
-        //                         paymentMethodId: paymentMethodIdByPaymentUrl
-        //                     },
-        //                     refundFee: 0
-        //                 }],
-        //                 purpose: { typeOf: transaction.typeOf, id: transaction.id },
-        //                 instrument: [],
-        //                 ...(typeof params.sameAs?.id === 'string') ? { sameAs: params.sameAs } : undefined
-        //             })(repos, settings);
-        //         }
-        //     }
-        // }
     };
 }

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -7,6 +7,7 @@ import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
@@ -22,6 +23,7 @@ interface IPublishPaymentUrlRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    orderInTransaction: OrderInTransactionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/payment/any/publishPaymentUrl.js

@@ -104,23 +104,9 @@ function publishPaymentUrl(params) {
                 executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
             })(repos, settings);
             // 取引に保管
-            const paymentMethodByPaymentUrl = {
-                // typeOf: params.object.paymentMethod, // discontinue(2024-06-05~)
-                paymentMethodId: result.paymentMethodId
-                // paymentUrl: result.paymentUrl, // migrate to recipe(2024-06-05~)
-                // issuedThrough: {
-                //     id: (typeof startParams.object.id === 'string') ? startParams.object.id : ''
-                // } // migrate to acceptAction(2024-06-05~)
-                // GMO IFを保管(2024-01-01~)
-                // entryTranArgs: result.entryTranArgs, // migrate to recipe(2024-06-05~)
-                // entryTranResult: result.entryTranResult, // migrate to recipe(2024-06-05~)
-                // execTranArgs: result.execTranArgs, // migrate to recipe(2024-06-05~)
-                // execTranResult: result.execTranResult, // migrate to recipe(2024-06-05~)
-                // paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~) // migrate to acceptAction(2024-06-05~)
-            };
-            await repos.placeOrder.findByIdAndUpdateInProgress({
+            await repos.orderInTransaction.savePaymentMethodId({
                 id: transaction.id,
-                update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
+                paymentMethod: { paymentMethodId: result.paymentMethodId }
             });
             return {
                 paymentMethodId: result.paymentMethodId,

package/lib/chevre/service/payment/any/voidPayTransaction.d.ts

@@ -7,6 +7,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 /**
  * 決済承認中止
@@ -29,6 +30,7 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
+    orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;
 export { voidPayTransaction, };

package/lib/chevre/service/payment/any/voidPayTransaction.js

@@ -8,29 +8,7 @@ const processVoidPayTransaction_1 = require("./processVoidPayTransaction");
  * タスクから決済承認を取り消す
  */
 function voidPayTransaction(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
-        // 決済承認アクション確認不要(2024-03-12~)
-        // 決済承認アクションを検索
-        // let authorizeActions = <factory.action.authorize.paymentMethod.any.IAction[]>
-        //     await repos.action.searchByPurpose({
-        //         typeOf: factory.actionType.AuthorizeAction,
-        //         purpose: {
-        //             typeOf: params.purpose.typeOf,
-        //             id: params.purpose.id
-        //         }
-        //     });
-        // authorizeActions = authorizeActions.filter(
-        //     (a) => a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
-        // );
-        // // Chevreを使用した承認を取り消し
-        // const authorizeActionsWithChevre = authorizeActions.filter((a) => {
-        //     return a.instrument?.identifier === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
-        // });
-        // if (authorizeActionsWithChevre.length > 0) {
-        //     await processVoidPayTransaction(params)(repos);
-        // }
+    return async (repos) => {
         await (0, processVoidPayTransaction_1.processVoidPayTransaction)(params)(repos);
         // 決済URL無効化もここで処理
         await (0, invalidatePaymentUrl_1.invalidatePaymentUrl)(params)(repos);

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts

@@ -26,7 +26,7 @@ declare function processAuthorizeCreditCard(params: {
     callbackType3ds?: factory.service.paymentService.ICallbackType3ds;
     orderId: string;
     availableChannel: Pick<factory.serviceChannel.IServiceChannelCreditCard, 'credentials' | 'serviceUrl'>;
-    object: factory.assetTransaction.pay.IPaymentMethod;
+    object: factory.assetTransaction.pay.IPaymentMethodWithoutDetail;
     /**
      * 決済URL発行処理かどうか
      */

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js

@@ -15,6 +15,9 @@ function processAuthorizeCreditCard(params) {
         // const { cardSeq, memberId } = creditCard as IUnauthorizedCardOfMember; // 会員カード廃止(2026-04-07~)
         const { cardNo, cardPass, expire } = creditCard;
         const { token } = creditCard;
+        if (typeof params.object.amount !== 'number') {
+            throw new factory_1.factory.errors.Argument('object.amount', 'must be number');
+        }
         const retUrl = creditCard?.retUrl;
         // 3DS拡張(2024-01-02~)
         if (params.processPublishPaymentUrl === true && typeof retUrl === 'string' && retUrl.length > 0) {
@@ -32,13 +35,8 @@ function processAuthorizeCreditCard(params) {
             entryTranArgs = {
                 shopId, shopPass, orderId,
                 jobCd: gmo_service_1.GMO.factory.util.JobCd.Auth,
-                amount: (typeof params.object.amount === 'number')
-                    ? params.object.amount
-                    : params.object.amount.value,
-                // siteId: params.availableChannel.credentials?.siteId,
-                // sitePass: params.availableChannel.credentials?.sitePass,
+                amount: params.object.amount,
                 tdFlag: gmo_service_1.GMO.factory.util.TdFlag.Version2,
-                // tdTenantName: '',
                 tds2Type: gmo_service_1.GMO.factory.util.Tds2Type.Error
             };
             entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
@@ -65,9 +63,7 @@ function processAuthorizeCreditCard(params) {
             entryTranArgs = {
                 shopId, shopPass, orderId,
                 jobCd: gmo_service_1.GMO.factory.util.JobCd.Auth,
-                amount: (typeof params.object.amount === 'number')
-                    ? params.object.amount
-                    : params.object.amount.value,
+                amount: params.object.amount,
                 siteId: params.availableChannel.credentials?.siteId,
                 sitePass: params.availableChannel.credentials?.sitePass
             };

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -9,7 +9,7 @@ const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 // import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -48,7 +48,7 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
-                // orderInTransaction: new OrderInTransactionRepo(connection),
+                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

package/lib/chevre/service/task/voidPayTransaction.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const acceptPay_1 = require("../../repo/action/acceptPay");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -10,8 +9,8 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
-// import { TransactionRepo } from '../../repo/transaction';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -24,7 +23,6 @@ function call(params) {
             sameAs: { id: params.id }
         })({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            // action: new ActionRepo(connection),
             acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
             authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -32,10 +30,8 @@ function call(params) {
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
             task: new task_1.TaskRepo(connection),
+            orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
-            // transaction: new TransactionRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.5.0-alpha.5",
+    "@chevre/factory": "9.5.0-alpha.6",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.16"
+  "version": "25.2.0-alpha.18"
 }