@chevre/domain 23.1.0-alpha.9 → 23.1.0

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

@@ -47,17 +47,73 @@ function recipe2paymentAgencyTransaction(actionRecipe) {
     }
     return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
 }
+/**
+ * 決済採用アクションから決済方法チケットを参照する
+ */
+function acceptAction2ticket(params) {
+    // tslint:disable-next-line:cyclomatic-complexity
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { acceptPayAction, project } = params;
+        const ticketToken = (_b = (_a = acceptPayAction.instrument) === null || _a === void 0 ? void 0 : _a.find((ticketAsInstrument) => ticketAsInstrument.typeOf === 'Ticket')) === null || _b === void 0 ? void 0 : _b.ticketToken;
+        let acceptAction2ticketResult;
+        if (typeof ticketToken === 'string' && ticketToken !== '') {
+            const ticket = (yield repos.ticket.findTickets({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: project.id } },
+                ticketToken: { $eq: ticketToken }
+            }, ['ticketToken'])).shift();
+            if (ticket === undefined) {
+                throw new factory.errors.NotFound('Ticket');
+            }
+            // 承認を参照
+            const validAuthorization = yield repos.authorization.findValidOneByCode({
+                project: { id: params.project.id },
+                code: ticket.ticketToken
+            });
+            const authorizedObject = validAuthorization.object;
+            if (authorizedObject.typeOf === 'OwnershipInfo') {
+                const { typeOfGood } = authorizedObject;
+                if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+                    || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket
+                    || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                    if (acceptPayAction.object.transactionNumber !== typeOfGood.serviceOutput.paymentMethodId) {
+                        // 念のため決済方法IDの一致検証
+                        throw new factory.errors.Internal('acceptPayAction.object.transactionNumber must be the same as typeOfGood.serviceOutput.paymentMethodId');
+                    }
+                    acceptAction2ticketResult = {
+                        invoiceByTicketToken: typeOfGood.serviceOutput,
+                        ticketToken
+                    };
+                }
+                else {
+                    throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
+                }
+            }
+            else {
+                throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
+            }
+        }
+        return { acceptAction2ticketResult };
+    });
+}
+/**
+ * 決済承認前の決済採用アクションを参照する
+ */
+// tslint:disable-next-line:max-func-body-length
 function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let creditCard;
         let pendingPaymentAgencyTransaction;
         let existingCompletedAuthorizeAction;
+        let acceptPayAction;
         // transaction.objectへのアクセス回避(2024-05-30~)
         // const paymentMethodByTransaction = transaction.object.paymentMethods;
         const paymentMethodByTransaction = yield repos.transaction.findInProgressPaymentMethodId({ id: params.transaction.id });
         if (params.prePublishedPaymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
             // check existence of acceptAction when authorizing payment(2024-06-01~)
-            const acceptPayAction = (yield repos.action.search({
+            acceptPayAction = (yield repos.action.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.transaction.project.id } },
@@ -68,7 +124,7 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                     transactionNumber: { $eq: params.prePublishedPaymentMethodId },
                     typeOf: { $eq: factory.assetTransactionType.Pay }
                 }
-            }, ['object', 'result'])).shift();
+            }, ['object', 'result', 'instrument'])).shift();
             if (acceptPayAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.AcceptAction);
             }
@@ -113,10 +169,17 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
             });
             existingCompletedAuthorizeAction = existingCompletedAuthorizeActions.shift();
             if (existingCompletedAuthorizeAction !== undefined) {
-                return { existingCompletedAuthorizeAction: { id: existingCompletedAuthorizeAction.id } };
+                return {
+                    existingCompletedAuthorizeAction: { id: existingCompletedAuthorizeAction.id }
+                };
             }
+            // 採用アクションのinstrumentから、決済方法チケットを参照する(2025-11-23~)
+            const { acceptAction2ticketResult } = yield acceptAction2ticket({
+                project: { id: params.transaction.project.id },
+                acceptPayAction
+            })(repos);
             return {
-                authorizeParams: { creditCard, pendingPaymentAgencyTransaction, paymentMethodByTransaction }
+                authorizeParams: { creditCard, pendingPaymentAgencyTransaction, paymentMethodByTransaction, acceptAction2ticketResult }
             };
         }
         else {
@@ -126,16 +189,13 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
     });
 }
 /**
- * 注文取引に保管された決済情報を承認しようとしている決済の整合性を検証する
+ * 決済採用と決済承認の整合性を検証する
  */
 function validatePaymentMethodByTransaction(params) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const paymentServiceIdByObject = params.object.issuedThrough.id;
     const amountByObject = params.object.amount;
     const paymentMethodTypeByObject = params.object.paymentMethod;
-    // const paymentServiceIdByTransaction = params.paymentMethodByTransaction.issuedThrough.id;
-    // const amountByTransaction = params.paymentMethodByTransaction.paymentMethod?.amount;
-    // const paymentMethodTypeByTransaction = params.paymentMethodByTransaction.paymentMethod?.identifier;
     const paymentServiceIdByTransaction = params.acceptObject.object.id;
     const amountByTransaction = (_a = params.acceptObject.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
     const paymentMethodTypeByTransaction = (_b = params.acceptObject.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
@@ -151,4 +211,22 @@ function validatePaymentMethodByTransaction(params) {
     if (paymentMethodTypeByObject !== paymentMethodTypeByTransaction) {
         throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
     }
+    // 注文アイテム検証(2025-11-25)
+    let eventIdsMustBe = [];
+    let eventIdsByAuthorizeAction = [];
+    const orderedItemsByAcceptAction = (_c = params.acceptObject.object.serviceOutput) === null || _c === void 0 ? void 0 : _c.referencesOrder.orderedItem;
+    const orderedItemsByAuthorizeAction = (_d = params.object.referencesOrder) === null || _d === void 0 ? void 0 : _d.orderedItem;
+    if (Array.isArray(orderedItemsByAcceptAction)) {
+        eventIdsMustBe = orderedItemsByAcceptAction.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
+    }
+    if (Array.isArray(orderedItemsByAuthorizeAction)) {
+        eventIdsByAuthorizeAction =
+            orderedItemsByAuthorizeAction.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
+    }
+    debug('validatePaymentMethodByTransaction: eventIdsMustBe,eventIdsByAuthorizeAction:', JSON.stringify(eventIdsMustBe), JSON.stringify(eventIdsByAuthorizeAction));
+    const eventIdsMatched = eventIdsMustBe.length === eventIdsByAuthorizeAction.length
+        && eventIdsMustBe.every((eventIdMustExist) => eventIdsByAuthorizeAction.includes(eventIdMustExist));
+    if (!eventIdsMatched) {
+        throw new factory.errors.Argument('id', `referencesOrder.orderedItem between authorze and accept not matched.`);
+    }
 }

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

@@ -1,16 +1,25 @@
 import * as factory from '../../../factory';
+/**
+ * 決済方法チケットによって表現された請求情報
+ */
+export type IInvoiceByTicketToken = factory.authorization.IInvoiceAsPaymentMethodServiceOutput;
 export type INotification = factory.notification.payAction.IPayAction4inform | factory.notification.refundAction.IRefundAction4inform;
 export declare function creatPublishPaymentUrlParams(params: {
     accountId?: string;
-    object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;
     location?: factory.action.trade.pay.ILocation;
     identifier?: string;
+    /**
+     * 決済採用に使用される決済方法チケットトークン
+     */
+    ticketToken?: string;
 }): Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'agent' | 'location' | 'project' | 'recipient' | 'transactionNumber' | 'typeOf'> & {
     object: factory.action.accept.pay.IPayObject;
     identifier?: string;
+    instrument: factory.action.accept.pay.IInstrument[];
 };
 export declare function creatPayTransactionStartParams(params: {
     accountId?: string;
@@ -26,14 +35,22 @@ export declare function creatPayTransactionStartParams(params: {
         confirmationNumber: string;
         orderNumber: string;
     };
-    action: Pick<factory.action.authorize.invoice.IAction, 'id' | 'typeOf'>;
+    action: Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'typeOf'>;
+    /**
+     * 決済方法チケット
+     */
+    ticketToken?: string;
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    instrument: factory.action.trade.pay.IInstrument[];
+    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;
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
+    /**
+     * 決済方法チケットの承認対象
+     */
+    invoiceByTicketToken?: IInvoiceByTicketToken;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

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

@@ -22,9 +22,14 @@ function creatPublishPaymentUrlParams(params) {
     const object = {
         typeOf: params.paymentServiceType,
         id: issuedThroughId,
-        paymentMethod
+        paymentMethod,
+        serviceOutput: {
+            typeOf: 'Invoice',
+            referencesOrder: params.object.referencesOrder
+        }
     };
-    return Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
+    const ticketAsInstrument = (typeof params.ticketToken === 'string') ? { ticketToken: params.ticketToken, typeOf: 'Ticket' } : undefined;
+    return Object.assign(Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,
             id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
@@ -38,12 +43,13 @@ function creatPublishPaymentUrlParams(params) {
             typeOf: params.transaction.seller.typeOf
         }, object }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
         ? { location: params.location }
-        : undefined), (typeof params.identifier === 'string')
+        : undefined), { instrument: (ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] }), (typeof params.identifier === 'string')
         ? { identifier: params.identifier }
         : undefined);
 }
 function creatPayTransactionStartParams(params) {
     var _a, _b, _c, _d;
+    const { ticketToken } = params;
     let expires = moment(params.transaction.expires)
         .add(1, 'month')
         .toDate(); // 余裕を持って
@@ -61,9 +67,11 @@ function creatPayTransactionStartParams(params) {
         ? params.accountId
         : (typeof params.object.accountId === 'string') ? params.object.accountId : undefined;
     const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
+    const ticketAsInstrument = (typeof ticketToken === 'string') ? { ticketToken, typeOf: 'Ticket' } : undefined;
     const instrument = [
         { id: params.action.id, typeOf: params.action.typeOf },
-        { orderNumber, typeOf: factory.order.OrderType.Order }
+        { orderNumber, typeOf: factory.order.OrderType.Order },
+        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] // add ticketAsInstrument(2025-11-25~)
     ];
     return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,
@@ -89,7 +97,11 @@ function creatPayTransactionStartParams(params) {
         }, object: {
             typeOf: params.paymentServiceType,
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined),
+            serviceOutput: {
+                typeOf: 'Invoice',
+                referencesOrder: params.object.referencesOrder
+            }
         }, expires: expires, purpose: {
             typeOf: factory.order.OrderType.Order,
             confirmationNumber,
@@ -156,6 +168,13 @@ function createAuthorizeResult(params) {
             paymentStatus = factory.paymentStatusType.PaymentDue;
         }
     }
+    let invoiceOrderItems;
+    if (params.object.referencesOrder.typeOf === factory.order.OrderType.Order) {
+        if (Array.isArray(params.object.referencesOrder.orderedItem)) {
+            invoiceOrderItems = params.object.referencesOrder.orderedItem;
+        }
+    }
+    const referencesOrder = Object.assign({ typeOf: factory.order.OrderType.Order }, (Array.isArray(invoiceOrderItems) && invoiceOrderItems.length > 0) ? { orderedItem: invoiceOrderItems } : undefined);
     // Array対応(2023-09-02~)
     const resultAsInvoice = {
         accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
@@ -174,7 +193,8 @@ function createAuthorizeResult(params) {
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,
         additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [],
-        typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment
+        typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment,
+        referencesOrder // add(2025-11-23~)
     };
     // tslint:disable-next-line:no-suspicious-comment
     // TODO 保留 resultにメンバーシップを追加(2024-08-13~)

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

@@ -21,5 +21,9 @@ declare function fixTransactionNumberOnPublishPaymentUrl(params: {
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
 }): IFixTransactionNumberOperation<{
     transactionNumber: string;
+    /**
+     * 決済採用に使用される決済方法チケットトークン
+     */
+    ticketToken?: string;
 }>;
 export { fixTransactionNumberOnPublishPaymentUrl };

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

@@ -17,26 +17,30 @@ const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
  */
 function fixTransactionNumberOnPublishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         const { paymentServiceType, transaction, object } = params;
         // 取引番号生成
         let transactionNumber;
+        let ticketToken;
         // support ticketToken(2024-08-21~)
-        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+        const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
             object,
             paymentServiceType,
             purpose: { id: transaction.id }
         })(repos);
-        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
-            const paymentMethodIdByPermit = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
-            if (typeof paymentMethodIdByPermit === 'string') {
-                transactionNumber = paymentMethodIdByPermit;
-            }
+        if (((_a = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.permit.PermitType.Permit) {
+            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${(_b = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _b === void 0 ? void 0 : _b.typeOf} discontinued`);
+            // const paymentMethodIdByPermit = permitOrInvoice?.identifier;
+            // if (typeof paymentMethodIdByPermit === 'string') {
+            //     transactionNumber = paymentMethodIdByPermit;
+            // }
         }
-        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+        else if (((_c = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _c === void 0 ? void 0 : _c.typeOf) === 'Invoice') {
             // support Invoice ticket(2025-11-09~)
-            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
-                transactionNumber = permitOrInvoice.paymentMethodId;
+            if (typeof ((_d = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _d === void 0 ? void 0 : _d.paymentMethodId) === 'string') {
+                transactionNumber = verifyPaymentMethodTicketResult.invoiceByTicketToken.paymentMethodId;
+                ticketToken = verifyPaymentMethodTicketResult.ticketToken;
             }
         }
         if (typeof transactionNumber !== 'string') {
@@ -44,8 +48,8 @@ function fixTransactionNumberOnPublishPaymentUrl(params) {
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
         return {
-            transactionNumber
-            // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+            transactionNumber,
+            ticketToken
         };
     });
 }

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

@@ -1,7 +1,7 @@
 import * as factory from '../../../factory';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { TicketRepo } from '../../../repo/ticket';
-type IPermitOrInvoice = Pick<factory.ownershipInfo.IPermitAsGood, 'identifier' | 'typeOf'> | Pick<factory.invoice.IInvoice, 'paymentMethodId' | 'typeOf'>;
+import type { IInvoiceByTicketToken } from './factory';
 declare function verifyTicketTokenAsNeeded(params: {
     project: {
         id: string;
@@ -13,6 +13,9 @@ declare function verifyTicketTokenAsNeeded(params: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
 }) => Promise<{
-    permitOrInvoice?: IPermitOrInvoice;
+    verifyPaymentMethodTicketResult?: {
+        invoiceByTicketToken: IInvoiceByTicketToken;
+        ticketToken: string;
+    };
 }>;
-export { IPermitOrInvoice, verifyTicketTokenAsNeeded };
+export { verifyTicketTokenAsNeeded };

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

@@ -18,14 +18,14 @@ function verifyTicketTokenAsNeeded(params) {
         var _a;
         const { paymentServiceType, object, project } = params;
         const { issuedThrough, ticketToken } = object;
-        let permitOrInvoice;
+        let verifyPaymentMethodTicketResult;
         // メンバーシップチケットが指定された場合、メンバーシップコードへ変換する
         if (typeof ticketToken === 'string' && ticketToken !== '') {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                 case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    const ticket = (yield repos.ticket.projectFields({
+                    const ticket = (yield repos.ticket.findTickets({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
@@ -47,26 +47,9 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     if (authorizedObject.typeOf === 'OwnershipInfo') {
                         const { typeOfGood } = authorizedObject;
-                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit || typeOfGood.typeOf === 'Invoice') {
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
                             // discontinue(2025-11-14~)
                             throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${typeOfGood.typeOf} discontinued`);
-                            // if (typeOfGood.issuedThrough?.typeOf !== paymentServiceType) {
-                            //     throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
-                            // }
-                            // // FaceToFace以外の場合、発行サービスIDを検証
-                            // if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                            //     if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
-                            //         throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
-                            //     }
-                            // }
-                            // if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
-                            //     permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
-                            // } else if (typeOfGood.typeOf === 'Invoice') {
-                            //     //  support paymentServiceType.MovieTicket(2024-11-23~)
-                            //     permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
-                            // } else {
-                            //     throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
-                            // }
                         }
                         else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
                             || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket
@@ -81,7 +64,10 @@ function verifyTicketTokenAsNeeded(params) {
                                     throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
                                 }
                             }
-                            permitOrInvoice = { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' };
+                            verifyPaymentMethodTicketResult = {
+                                invoiceByTicketToken: { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' },
+                                ticketToken
+                            };
                         }
                         else {
                             throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
@@ -96,6 +82,6 @@ function verifyTicketTokenAsNeeded(params) {
                     throw new factory.errors.NotImplemented(`ticketToken issued through ${paymentServiceType} not implemented`);
             }
         }
-        return { permitOrInvoice };
+        return { verifyPaymentMethodTicketResult };
     });
 }

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

@@ -7,6 +7,7 @@ import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../repo/confirmationNumber';
 import type { CredentialsRepo } from '../../repo/credentials';
 import type { EventRepo } from '../../repo/event';
+import type { EventSeriesRepo } from '../../repo/eventSeries';
 import type { OrderNumberRepo } from '../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
@@ -85,6 +86,7 @@ interface IAuthorizeRepos {
     confirmationNumber: ConfirmationNumberRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
+    eventSeries: EventSeriesRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -102,6 +104,8 @@ interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
+    event: EventRepo;
+    eventSeries: EventSeriesRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -125,7 +129,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;

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

@@ -323,7 +323,7 @@ function processVoidPayTransaction(params) {
 function publishPaymentUrl(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
@@ -340,7 +340,7 @@ function publishPaymentUrl(params) {
                 object: { orderDate: new Date() }
             })(repos);
             // 取引番号生成
-            const { transactionNumber } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
+            const { transactionNumber, ticketToken } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
                 object: params.object,
                 transaction,
                 paymentServiceType
@@ -361,9 +361,13 @@ function publishPaymentUrl(params) {
             // }
             let result;
             // URL発行
-            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
-            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined));
-            const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
+            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+                // support referencesOrder(2025-11-24~)
+                referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                    ? params.object.referencesOrder
+                    : { typeOf: factory.order.OrderType.Order } });
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
+            const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
                 executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
@@ -416,7 +420,7 @@ function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPay
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
@@ -439,7 +443,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken, ticketToken } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -497,10 +501,14 @@ function authorize(params) {
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
         })();
-        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+            // support referencesOrder(2025-11-24~)
+            referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                ? params.object.referencesOrder
+                : { typeOf: factory.order.OrderType.Order } }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
-        const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
+        const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
         const uniqueActionIdentifier = util.format(`%s:%s:%s`, factory.actionType.AuthorizeAction, factory.action.authorize.paymentMethod.any.ResultType.Payment, authorizeObject.paymentMethodId);
         const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
                 typeOf: transaction.agent.typeOf,
@@ -514,7 +522,7 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_b = transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                    : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja)
             }, purpose: { typeOf: transaction.typeOf, id: transaction.id }, identifier: uniqueActionIdentifier }, (typeof taskId === 'string') ? { sameAs: { id: taskId, typeOf: 'Task' } } : undefined // タスク関連付け(2024-04-22~)
         );
         const action = yield repos.action.start(actionAttributes);
@@ -530,7 +538,8 @@ function authorize(params) {
                 // confirmationNumber required(2025-02-12~)
                 // orderNumber required(2025-02-14~)
                 order: { confirmationNumber, orderNumber },
-                action: { id: action.id, typeOf: action.typeOf }
+                action: { id: action.id, typeOf: action.typeOf },
+                ticketToken
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
@@ -570,8 +579,8 @@ function authorize(params) {
         }
         const result = (0, factory_1.createAuthorizeResult)({
             payTransaction,
-            object: authorizeObjectIncludingPaymentMethodDetails
-            // ...(permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined
+            object: authorizeObjectIncludingPaymentMethodDetails,
+            invoiceByTicketToken
         });
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };

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

@@ -15,11 +15,6 @@ function createPayOrderAction(params) {
         confirmationNumber: params.order.confirmationNumber,
         orderNumber: params.order.orderNumber
     };
-    // const instrument: factory.action.trade.pay.IInstrument = {
-    //     id: params.transaction.id,
-    //     transactionNumber: params.transaction.transactionNumber,
-    //     typeOf: params.transaction.typeOf
-    // };
     const instrument = [
         {
             id: params.transaction.id,

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

@@ -48,11 +48,6 @@ function authorize(params, transaction, paymentServiceId, options) {
                     }, typeOf: paymentMethodType }, (typeof accountId === 'string') ? { accountId } : undefined),
                 movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets
             };
-            // const instrument: factory.action.trade.pay.IInstrument = {
-            //     id: transaction.id,
-            //     transactionNumber: transaction.transactionNumber,
-            //     typeOf: transaction.typeOf
-            // };
             const instrument = [
                 {
                     id: transaction.id,

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

@@ -18,6 +18,7 @@ const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
+const eventSeries_1 = require("../../repo/eventSeries");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -63,6 +64,7 @@ function call(params) {
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
                 }),
                 event: new event_1.EventRepo(connection),
+                eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

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

@@ -14,6 +14,8 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
+const event_1 = require("../../repo/event");
+const eventSeries_1 = require("../../repo/eventSeries");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -43,6 +45,8 @@ function call(params) {
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
+                event: new event_1.EventRepo(connection),
+                eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),