@chevre/domain 23.0.0 → 23.1.0-alpha.1

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.js

@@ -16,50 +16,13 @@ const factory = require("../../../../../factory");
  */
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof programMembershipUsed === 'string') {
             throw new factory.errors.NotImplemented('programMembershipUsed as string not implemented');
-            // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-            // const { authorizedObject } = await CodeService.verifyToken({
-            //     project: { id: params.project.id },
-            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            //     token: String(programMembershipUsed)
-            // })(repos);
-            // const permitOwnershipInfo = authorizedObject;
-            // if (Array.isArray(permitOwnershipInfo)) {
-            //     throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-            // }
-            // if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-            // }
-            // const typeOfGood = permitOwnershipInfo.typeOfGood;
-            // if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-            // }
-            // const issuedThroughTypeOf = typeOfGood.issuedThrough?.typeOf;
-            // if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
-            // }
-            // if (typeof typeOfGood.issuedThrough?.id !== 'string') {
-            //     throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            // }
-            // if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
-            //     programMembershipUsedAsPermit = {
-            //         identifier: typeOfGood.identifier,
-            //         issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-            //         typeOf: factory.permit.PermitType.Permit
-            //     };
-            // } else {
-            //     throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
-            // }
         }
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
@@ -81,47 +44,54 @@ function requestedProgramMembershipUsed2permit(params) {
                 if (object.typeOf !== 'OwnershipInfo') {
                     throw new factory.errors.Argument('programMembershipUsed', 'invalid authorization');
                 }
-                // const ownershipInfoId = object.id;
-                // const permitOwnershipInfo = (await repos.ownershipInfo.search({
-                //     limit: 1,
-                //     page: 1,
-                //     project: { id: { $eq: params.project.id } },
-                //     ids: [ownershipInfoId],
-                //     ownedFrom: now,
-                //     ownedThrough: now
-                // })).shift();
-                // if (permitOwnershipInfo === undefined) {
-                //     throw new factory.errors.NotFound('OwnershipInfo');
-                // }
                 // audience検証
                 if ((audience === null || audience === void 0 ? void 0 : audience.typeOf) !== factory.transactionType.PlaceOrder || audience.id !== placeOrder.id) {
                     throw new factory.errors.Argument('programMembershipUsed', 'audience not matched with placeOrder');
                 }
                 const permitOwnershipInfo = object;
-                if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
-                }
-                const issuedThroughTypeOf = (_a = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
-                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                    programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf },
-                        typeOf: factory.permit.PermitType.Permit
-                    };
+                const ownedGoodType = (_a = permitOwnershipInfo.typeOfGood) === null || _a === void 0 ? void 0 : _a.typeOf;
+                if (ownedGoodType === factory.permit.PermitType.Permit) {
+                    const issuedThroughTypeOf = (_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf;
+                    if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                        programMembershipUsedAsPermit = {
+                            identifier: permitOwnershipInfo.typeOfGood.identifier,
+                            issuedThrough: { typeOf: issuedThroughTypeOf },
+                            typeOf: factory.permit.PermitType.Permit
+                        };
+                    }
+                    else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
+                        || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                        if (typeof ((_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.id) !== 'string') {
+                            throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                        }
+                        programMembershipUsedAsPermit = {
+                            identifier: permitOwnershipInfo.typeOfGood.identifier,
+                            issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                            typeOf: factory.permit.PermitType.Permit
+                        };
+                    }
+                    else {
+                        throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    }
                 }
-                else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
-                    || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                    if (typeof ((_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
-                        throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                else if (ownedGoodType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    // CreditCard決済の場合、決済方法所有権を受け入れる(2025-11-11~)
+                    const paymentServiceId = (_d = permitOwnershipInfo.typeOfGood) === null || _d === void 0 ? void 0 : _d.id;
+                    const paymentMethodId = permitOwnershipInfo.typeOfGood.serviceOutput.paymentMethodId;
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentServiceId required');
+                    }
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentMethodId required');
                     }
                     programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                        identifier: paymentMethodId,
+                        issuedThrough: { id: paymentServiceId, typeOf: ownedGoodType },
                         typeOf: factory.permit.PermitType.Permit
                     };
                 }
                 else {
-                    throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
                 }
             }
         }

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

@@ -0,0 +1,38 @@
+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 type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
+import * as PayTransactionService from '../../../assetTransaction/pay';
+interface IFixTransactionNumberRepos {
+    action: ActionRepo;
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    transaction: TransactionRepo;
+    transactionNumber: TransactionNumberRepo;
+}
+type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+/**
+ * 決済承認時の取引番号を決定する
+ */
+declare function fixTransactionNumber(params: {
+    object: IObjectWithoutDetail;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): IFixTransactionNumberOperation<{
+    transactionNumber: string;
+    pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
+    creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
+    permitOrInvoice?: never;
+    id?: never;
+} | {
+    /**
+     * 完了済の決済承認アクションID
+     */
+    id: string;
+}>;
+export { fixTransactionNumber };

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

@@ -0,0 +1,88 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixTransactionNumber = fixTransactionNumber;
+const factory = require("../../../../factory");
+const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
+const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./handlePrePublishedPaymentMethodIdOnAuthorizing");
+/**
+ * 決済承認時の取引番号を決定する
+ */
+function fixTransactionNumber(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { paymentServiceType, transaction, object } = params;
+        // 取引番号生成
+        let transactionNumber;
+        let pendingPaymentAgencyTransaction;
+        let creditCard = object.creditCard;
+        // ticketTokenを解釈(2024-08-13~)
+        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+            project: { id: transaction.project.id },
+            object: object,
+            paymentServiceType,
+            purpose: { id: transaction.id }
+        })(repos);
+        /**
+         * 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~)
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.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 paymentMethodIdByTicketToken === 'string') {
+                    transactionNumber = paymentMethodIdByTicketToken;
+                }
+            }
+        }
+        // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
+        if (typeof object.paymentMethodId === 'string' && object.paymentMethodId.length > 0) {
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                // 指定されたpaymentMethodIdとチケットから読み取った決済方法IDは一致しなければいけない
+                if (paymentMethodIdByTicketToken !== object.paymentMethodId) {
+                    throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
+                }
+            }
+            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
+                object: object,
+                prePublishedPaymentMethodId: object.paymentMethodId,
+                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;
+            }
+            else {
+                throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction required on paymentMethodId specified');
+            }
+        }
+        // 取引番号発行済でなければ発行
+        if (typeof transactionNumber !== 'string') {
+            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
+        // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        );
+    });
+}

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

@@ -1,7 +1,7 @@
-import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
-import type { ITransactionInProgress, TransactionRepo } from '../../../repo/transaction';
-import * as PayTransactionService from '../../assetTransaction/pay';
+import * as factory from '../../../../factory';
+import type { ActionRepo } from '../../../../repo/action';
+import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import * as PayTransactionService from '../../../assetTransaction/pay';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
 declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;

package/lib/chevre/service/payment/any/{handlePrePublishedPaymentMethodIdOnAuthorizing.js → authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js}

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePrePublishedPaymentMethodIdOnAuthorizing = handlePrePublishedPaymentMethodIdOnAuthorizing;
 const createDebug = require("debug");
-const factory = require("../../../factory");
+const factory = require("../../../../factory");
 const debug = createDebug('chevre-domain:service:payment');
 function recipe2paymentAgencyTransaction(actionRecipe) {
     var _a;

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

@@ -34,7 +34,6 @@ 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'>;
-    permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

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

@@ -0,0 +1,25 @@
+import * as factory from '../../../../factory';
+import type { AuthorizationRepo } from '../../../../repo/authorization';
+import type { TicketRepo } from '../../../../repo/ticket';
+import type { ITransactionInProgress } from '../../../../repo/transaction';
+import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
+interface IFixTransactionNumberRepos {
+    authorization: AuthorizationRepo;
+    ticket: TicketRepo;
+    transactionNumber: TransactionNumberRepo;
+}
+type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail & {
+    ticketToken?: string;
+};
+/**
+ * 外部決済ロケーション発行時の取引番号を決定する
+ */
+declare function fixTransactionNumberOnPublishPaymentUrl(params: {
+    object: IObjectWithoutDetail;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'id' | 'project'>;
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+}): IFixTransactionNumberOperation<{
+    transactionNumber: string;
+}>;
+export { fixTransactionNumberOnPublishPaymentUrl };

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

@@ -0,0 +1,51 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixTransactionNumberOnPublishPaymentUrl = fixTransactionNumberOnPublishPaymentUrl;
+const factory = require("../../../../factory");
+const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
+/**
+ * 外部決済ロケーション発行時の取引番号を決定する
+ */
+function fixTransactionNumberOnPublishPaymentUrl(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { paymentServiceType, transaction, object } = params;
+        // 取引番号生成
+        let transactionNumber;
+        // support ticketToken(2024-08-21~)
+        const { permitOrInvoice } = 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;
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.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 transactionNumber !== 'string') {
+            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            transactionNumber = publishTransactionNumberResult.transactionNumber;
+        }
+        return {
+            transactionNumber
+            // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        };
+    });
+}

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

@@ -8,11 +8,11 @@ declare function verifyTicketTokenAsNeeded(params: {
     };
     object: Pick<factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'issuedThrough' | 'ticketToken'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    purpose: factory.action.authorize.paymentMethod.any.IPurpose;
+    purpose: Pick<factory.action.authorize.paymentMethod.any.IPurpose, 'id'>;
 }): (repos: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
 }) => Promise<{
     permitOrInvoice?: IPermitOrInvoice;
 }>;
-export { verifyTicketTokenAsNeeded };
+export { IPermitOrInvoice, verifyTicketTokenAsNeeded };

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

@@ -45,24 +45,40 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     if (authorizedObject.typeOf === 'OwnershipInfo') {
                         const { typeOfGood } = authorizedObject;
-                        if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
-                            throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                        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');
+                            }
                         }
-                        // FaceToFace以外の場合、発行サービスIDを検証
-                        if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                            if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                        else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
+                            // 決済方法所有権を受け入れる(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');
                             }
-                        }
-                        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' };
+                            permitOrInvoice = { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' };
                         }
                         else {
-                            throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                            throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
                         }
                     }
                     else {

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

@@ -23,14 +23,14 @@ const factory = require("../../factory");
 // import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 const PayTransactionService = require("../assetTransaction/pay");
 const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const fixTransactionNumber_1 = require("./any/authorize/fixTransactionNumber");
+const fixTransactionNumberOnPublishPaymentUrl_1 = require("./any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
 const factory_1 = require("./any/factory");
 const fixOrderAsNeeded_1 = require("./any/fixOrderAsNeeded");
-const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./any/handlePrePublishedPaymentMethodIdOnAuthorizing");
 const onPaymentStatusChanged_1 = require("./any/onPaymentStatusChanged");
 Object.defineProperty(exports, "onPaymentStatusChanged", { enumerable: true, get: function () { return onPaymentStatusChanged_1.onPaymentStatusChanged; } });
 const person2username_1 = require("./any/person2username");
 Object.defineProperty(exports, "person2username", { enumerable: true, get: function () { return person2username_1.person2username; } });
-const verifyTicketTokenAsNeeded_1 = require("./any/verifyTicketTokenAsNeeded");
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -319,7 +319,9 @@ function processVoidPayTransaction(params) {
 /**
  * 外部決済ロケーションを発行する
  */
+// tslint:disable-next-line:max-func-body-length
 function publishPaymentUrl(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { paymentServiceType, purpose, project } = params;
@@ -328,6 +330,9 @@ function publishPaymentUrl(params) {
         }
         try {
             const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
+            if (project.id !== transaction.project.id) {
+                throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+            }
             // publishOrderNumber(2025-03-11~)
             yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
                 project: { id: transaction.project.id },
@@ -335,19 +340,25 @@ function publishPaymentUrl(params) {
                 object: { orderDate: new Date() }
             })(repos);
             // 取引番号生成
-            let transactionNumber;
-            // support ticketToken(2024-08-21~)
-            const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(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 (typeof transactionNumber !== 'string') {
-                const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-                transactionNumber = publishTransactionNumberResult.transactionNumber;
-            }
+            const { transactionNumber } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
+                object: params.object,
+                transaction,
+                paymentServiceType
+            })(repos);
+            // let transactionNumber: string | undefined;
+            // // support ticketToken(2024-08-21~)
+            // const { permitOrInvoice } =
+            //     await verifyTicketTokenAsNeeded({ project, object: params.object, paymentServiceType, purpose })(repos);
+            // if (permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) {
+            //     const paymentMethodIdByPermit = permitOrInvoice?.identifier;
+            //     if (typeof paymentMethodIdByPermit === 'string') {
+            //         transactionNumber = paymentMethodIdByPermit;
+            //     }
+            // }
+            // if (typeof transactionNumber !== 'string') {
+            //     const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            //     transactionNumber = publishTransactionNumberResult.transactionNumber;
+            // }
             let result;
             // URL発行
             const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
@@ -411,67 +422,77 @@ function authorize(params) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
+        if (project.id !== transaction.project.id) {
+            throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
+        }
         const { confirmationNumber, orderNumber } = yield (0, fixOrderAsNeeded_1.fixOrderAsNeeded)({
             project: { id: transaction.project.id },
             purpose
             // paymentServiceType
         })(repos);
         // 取引番号生成
-        let transactionNumber;
-        let pendingPaymentAgencyTransaction;
-        let creditCard = params.object.creditCard;
-        // ticketTokenを解釈(2024-08-13~)
-        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
-        /**
-         * 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~)
-            }
-        }
-        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.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 paymentMethodIdByTicketToken === 'string') {
-                    transactionNumber = paymentMethodIdByTicketToken;
-                }
-            }
-        }
-        // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
-        if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
-            if (typeof paymentMethodIdByTicketToken === 'string') {
-                if (paymentMethodIdByTicketToken !== params.object.paymentMethodId) {
-                    throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
-                }
-            }
-            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
-                object: params.object,
-                prePublishedPaymentMethodId: params.object.paymentMethodId,
-                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 = params.object.paymentMethodId;
-                pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
-            }
-            else {
-                throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction requied on paymentMethodId specified');
-            }
-        }
-        // 取引番号発行済でなければ発行
-        if (typeof transactionNumber !== 'string') {
-            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-            transactionNumber = publishTransactionNumberResult.transactionNumber;
-        }
+        const fixTransactionNumberResult = yield (0, fixTransactionNumber_1.fixTransactionNumber)({
+            object: params.object,
+            transaction,
+            paymentServiceType
+        })(repos);
+        if (typeof fixTransactionNumberResult.id === 'string') {
+            return { id: fixTransactionNumberResult.id };
+        }
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
+        // let transactionNumber: string | undefined;
+        // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
+        // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
+        // // ticketTokenを解釈(2024-08-13~)
+        // const { permitOrInvoice } =
+        //     await verifyTicketTokenAsNeeded({ project, object: params.object, paymentServiceType, purpose })(repos);
+        // /**
+        //  * ticketTokenによって指定された決済方法ID
+        //  */
+        // let paymentMethodIdByTicketToken: string | undefined;
+        // if (permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) {
+        //     paymentMethodIdByTicketToken = permitOrInvoice?.identifier;
+        //     if (typeof paymentMethodIdByTicketToken === 'string') {
+        //         transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+        //     }
+        // } else if (permitOrInvoice?.typeOf === 'Invoice') {
+        //     // support paymentServiceType.MovieTicket(2024-11-23~)
+        //     if (typeof permitOrInvoice?.paymentMethodId === 'string') {
+        //         paymentMethodIdByTicketToken = permitOrInvoice?.paymentMethodId;
+        //         if (typeof paymentMethodIdByTicketToken === 'string') {
+        //             transactionNumber = paymentMethodIdByTicketToken;
+        //         }
+        //     }
+        // }
+        // // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
+        // if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
+        //     if (typeof paymentMethodIdByTicketToken === 'string') {
+        //         if (paymentMethodIdByTicketToken !== params.object.paymentMethodId) {
+        //             throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
+        //         }
+        //     }
+        //     const { authorizeParams, existingCompletedAuthorizeAction } = await handlePrePublishedPaymentMethodIdOnAuthorizing({
+        //         object: params.object,
+        //         prePublishedPaymentMethodId: params.object.paymentMethodId,
+        //         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 = params.object.paymentMethodId;
+        //         pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
+        //     } else {
+        //         throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction requied on paymentMethodId specified');
+        //     }
+        // }
+        // // 取引番号発行済でなければ発行
+        // if (typeof transactionNumber !== 'string') {
+        //     const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+        //     transactionNumber = publishTransactionNumberResult.transactionNumber;
+        // }
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
@@ -547,7 +568,11 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_1.createAuthorizeResult)(Object.assign({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails }, ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined));
+        const result = (0, factory_1.createAuthorizeResult)({
+            payTransaction,
+            object: authorizeObjectIncludingPaymentMethodDetails
+            // ...(permitOrInvoice?.typeOf === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined
+        });
         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.2.0-alpha.4",
-    "@cinerino/sdk": "12.7.0-alpha.1",
+    "@chevre/factory": "5.2.0-alpha.6",
+    "@cinerino/sdk": "12.7.0-alpha.3",
     "@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.0.0"
+  "version": "23.1.0-alpha.1"
 }