@chevre/domain 23.1.0-alpha.3 → 23.1.0-alpha.30

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

@@ -18,13 +18,16 @@ const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./handlePrePub
  */
 function fixTransactionNumber(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         const { paymentServiceType, transaction, object } = params;
         // 取引番号生成
         let transactionNumber;
         let pendingPaymentAgencyTransaction;
         let creditCard = object.creditCard;
+        let invoiceByTicketToken;
+        let ticketToken;
         // ticketTokenを解釈(2024-08-13~)
-        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+        const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
             object: object,
             paymentServiceType,
@@ -34,18 +37,21 @@ function fixTransactionNumber(params) {
          * ticketTokenによって指定された決済方法ID
          */
         let paymentMethodIdByTicketToken;
-        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
-            paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
-            if (typeof paymentMethodIdByTicketToken === 'string') {
-                transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
-            }
+        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`);
+            // paymentMethodIdByTicketToken = permitOrInvoice?.identifier;
+            // if (typeof paymentMethodIdByTicketToken === 'string') {
+            //     transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+            // }
         }
-        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 paymentServiceType.MovieTicket(2024-11-23~)
-            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
-                paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId;
+            if (typeof ((_d = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _d === void 0 ? void 0 : _d.paymentMethodId) === 'string') {
+                paymentMethodIdByTicketToken = (_e = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _e === void 0 ? void 0 : _e.paymentMethodId;
                 if (typeof paymentMethodIdByTicketToken === 'string') {
                     transactionNumber = paymentMethodIdByTicketToken;
+                    invoiceByTicketToken = verifyPaymentMethodTicketResult.invoiceByTicketToken;
+                    ticketToken = verifyPaymentMethodTicketResult.ticketToken;
                 }
             }
         }
@@ -63,14 +69,18 @@ function fixTransactionNumber(params) {
                 transaction
             })(repos);
             if (existingCompletedAuthorizeAction !== undefined) {
+                // 既に承認済であれば何もしない
                 return { id: existingCompletedAuthorizeAction.id };
             }
             else if (authorizeParams !== undefined) {
                 // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
-                // creditCard = authorizeParams.paymentMethodByTransaction.paymentMethod?.creditCard;
                 creditCard = authorizeParams.creditCard;
                 transactionNumber = object.paymentMethodId;
                 pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
+                if (typeof ((_f = authorizeParams.acceptAction2ticketResult) === null || _f === void 0 ? void 0 : _f.ticketToken) === 'string') {
+                    invoiceByTicketToken = authorizeParams.acceptAction2ticketResult.invoiceByTicketToken;
+                    ticketToken = authorizeParams.acceptAction2ticketResult.ticketToken;
+                }
             }
             else {
                 throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction required on paymentMethodId specified');
@@ -81,7 +91,8 @@ function fixTransactionNumber(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined
+        return Object.assign(Object.assign(Object.assign({ transactionNumber,
+            ticketToken }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (invoiceByTicketToken !== undefined) ? { invoiceByTicketToken } : undefined
         // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
         );
     });

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

@@ -1,23 +1,40 @@
 import * as factory from '../../../../factory';
 import type { ActionRepo } from '../../../../repo/action';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
 import * as PayTransactionService from '../../../assetTransaction/pay';
+import type { IInvoiceByTicketToken } from '../factory';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
+interface IAcceptAction2ticketResult {
+    invoiceByTicketToken: IInvoiceByTicketToken;
+    ticketToken: string;
+}
+/**
+ * 決済承認前の決済採用アクションを参照する
+ */
 declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
-    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod' | 'referencesOrder'>;
     prePublishedPaymentMethodId: string;
     transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
 }): (repos: {
     action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
 }) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;
         paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
         pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction;
+        acceptAction2ticketResult?: IAcceptAction2ticketResult;
     };
-    existingCompletedAuthorizeAction?: {
+    existingCompletedAuthorizeAction?: never;
+} | {
+    existingCompletedAuthorizeAction: {
         id: string;
     };
+    authorizeParams?: never;
+    acceptAction2ticketResult?: never;
 }>;
 export { handlePrePublishedPaymentMethodIdOnAuthorizing };

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

@@ -11,19 +11,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;
 const factory = require("../../../factory");
+// tslint:disable-next-line:max-func-body-length
 function verifyTicketTokenAsNeeded(params) {
+    // tslint:disable-next-line:cyclomatic-complexity
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        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 } },
@@ -45,37 +47,27 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     if (authorizedObject.typeOf === 'OwnershipInfo') {
                         const { typeOfGood } = authorizedObject;
-                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit || typeOfGood.typeOf === 'Invoice') {
-                            if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.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');
-                            }
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
+                            // discontinue(2025-11-14~)
+                            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${typeOfGood.typeOf} discontinued`);
                         }
                         else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
-                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
                             // 決済方法所有権を受け入れる(2025-11-11~)
                             if (typeOfGood.typeOf !== paymentServiceType) {
                                 throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
                             }
-                            if (typeOfGood.id !== issuedThrough.id) {
-                                throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                            // FaceToFace以外の場合、発行サービスIDを検証
+                            if (typeOfGood.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                                if (typeOfGood.id !== issuedThrough.id) {
+                                    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}`);
@@ -90,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;