@chevre/domain 23.1.0-alpha.15 → 23.1.0-alpha.16

package/example/src/chevre/project/unsetProjectSettings.ts

@@ -0,0 +1,67 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+
+    const cursor = projectRepo.getCursor(
+        {
+            _id: { $nin: ['ttts-development', 'sskts-development'] }
+        },
+        {
+            _id: 1,
+            settings: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const project: Pick<chevre.factory.project.IProject, 'id' | 'typeOf' | 'settings'> = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', project.id, i);
+        const includeCustomerAsFindByConfirmationNumberResult = project.settings?.includeCustomerAsFindByConfirmationNumberResult;
+        let alreadyMigrated = true;
+        if (typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean'
+            && includeCustomerAsFindByConfirmationNumberResult === true) {
+            alreadyMigrated = false;
+        }
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', project.id, i);
+        } else {
+            console.log(
+                'updating project...',
+                project.id, i);
+            await projectRepo.unsetUnnecessaryFields({
+                filter: {
+                    _id: { $eq: project.id }
+                },
+                $unset: {
+                    'settings.includeCustomerAsFindByConfirmationNumberResult': 1
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                project.id, i);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -78,6 +78,7 @@ export declare function publishPaymentUrl(params: Pick<factory.assetTransaction.
      * add identifier for an unique index(2025-02-25~)
      */
     identifier?: string;
+    instrument: factory.action.accept.pay.IInstrument[];
 }, options: {
     purposeAsTransaction: {
         id: string;

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

@@ -84,7 +84,7 @@ function publishPaymentUrl(params, options) {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
-            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id } }, (typeof taskId === 'string')
+            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id }, instrument: (Array.isArray(params.instrument)) ? params.instrument : [] }, (typeof taskId === 'string')
             ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
             : undefined), (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { location: params.location }

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

@@ -5,6 +5,7 @@ import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
+import { IInvoiceByTicketToken } from '../factory';
 interface IFixTransactionNumberRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
@@ -27,6 +28,10 @@ declare function fixTransactionNumber(params: {
     transactionNumber: string;
     pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
     creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
+    /**
+     * 承認時に指定のチケット、あるいは、決済採用時に指定のチケット
+     */
+    invoiceByTicketToken?: IInvoiceByTicketToken;
     permitOrInvoice?: never;
     id?: never;
 } | {

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

@@ -18,13 +18,15 @@ 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;
         // 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 +36,20 @@ 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;
                 }
             }
         }
@@ -63,14 +67,17 @@ 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;
+                }
             }
             else {
                 throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction required on paymentMethodId specified');
@@ -81,7 +88,7 @@ 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 }, (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'>;
     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.projectFields({
+                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 {

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

@@ -1,4 +1,8 @@
 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;
@@ -8,9 +12,14 @@ export declare function creatPublishPaymentUrlParams(params: {
     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;
@@ -34,6 +43,10 @@ export declare function createMovieTicket(params: factory.action.trade.pay.IMovi
 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

@@ -24,7 +24,8 @@ function creatPublishPaymentUrlParams(params) {
         id: issuedThroughId,
         paymentMethod
     };
-    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,7 +39,7 @@ 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);
 }
@@ -131,7 +132,8 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
+    const { invoiceByTicketToken } = params;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
@@ -156,9 +158,16 @@ function createAuthorizeResult(params) {
             paymentStatus = factory.paymentStatusType.PaymentDue;
         }
     }
+    let invoiceOrderItems;
+    if (typeof (invoiceByTicketToken === null || invoiceByTicketToken === void 0 ? void 0 : invoiceByTicketToken.paymentMethodId) === 'string') {
+        if (Array.isArray((_e = invoiceByTicketToken.referencesOrder) === null || _e === void 0 ? void 0 : _e.orderedItem)) {
+            invoiceOrderItems = invoiceByTicketToken.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')
+        accountId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
         issuedThrough,
@@ -169,12 +178,13 @@ function createAuthorizeResult(params) {
         paymentMethodId: (typeof payTransactionObject.paymentMethodId === 'string')
             ? payTransactionObject.paymentMethodId
             : '',
-        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
+        name: (typeof ((_g = payTransactionObject.paymentMethod) === null || _g === void 0 ? void 0 : _g.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : 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,7 +18,7 @@ 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) {
@@ -64,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}`);
@@ -79,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.js

@@ -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
@@ -362,7 +362,7 @@ 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 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 = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
@@ -439,7 +439,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -570,8 +570,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/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.3.0-alpha.1",
-    "@cinerino/sdk": "12.9.0-alpha.0",
+    "@chevre/factory": "5.3.0-alpha.2",
+    "@cinerino/sdk": "12.9.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.15"
+  "version": "23.1.0-alpha.16"
 }