@chevre/domain 25.2.0-alpha.3 → 25.2.0-alpha.31

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
@@ -9,6 +10,7 @@ import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/i
 interface IOnPayTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts

@@ -1,4 +1,5 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
@@ -6,6 +7,7 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -11,6 +12,7 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
 interface IOnAssetTransactionStatusChangedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -1,9 +1,13 @@
+import type { MessageRepo } from '../../../../repo/message';
 import type { TaskRepo } from '../../../../repo/task';
 import { factory } from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
-    sendEmailMessage?: Pick<factory.action.transfer.send.message.email.IAttributes, 'object'>[];
+    sendEmailMessage?: {
+        object: factory.action.transfer.send.message.email.IOptimizedObject;
+    }[];
     order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {
+    message: MessageRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { createSendEmailMessageTaskIfNotExist };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -1,45 +1,107 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;
+const debug_1 = __importDefault(require("debug"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
+const debug = (0, debug_1.default)('chevre-domain:service:order');
 function createSendEmailMessageTaskIfNotExist(params) {
     return async (repos) => {
         const sendEmailMessageActions = params.sendEmailMessage;
         const now = new Date();
-        if (Array.isArray(sendEmailMessageActions)) {
-            await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
-                const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, index);
-                const simpleOrder = {
-                    typeOf: params.order.typeOf,
-                    orderNumber: params.order.orderNumber,
-                    // price: params.order.price,
-                    // priceCurrency: params.order.priceCurrency,
-                    orderDate: params.order.orderDate
-                };
-                const actionAttributes = {
-                    project: params.order.project,
-                    typeOf: factory_1.factory.actionType.SendAction,
-                    object: sendEmailMessageAction.object,
-                    agent: params.order.project,
-                    recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
-                    // potentialActions: {}, // discontinue(2024-06-25~)
-                    purpose: simpleOrder
-                };
-                const sendEmailMessageTask = {
-                    alternateName: taskIdentifier,
-                    identifier: taskIdentifier,
-                    project: params.order.project,
-                    name: factory_1.factory.taskName.SendEmailMessage,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: now, // なるはやで実行
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { actionAttributes }
-                };
-                await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
-            }));
+        // 取引のpotentialActions参照を廃止して、messageリポジトリを参照して存在すればタスクを作成(2026-07-16~)
+        const message4order = (await repos.message.findMessages({
+            limit: 1,
+            page: 1,
+            about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } },
+            mainEntity: { orderNumber: { $eq: params.order.orderNumber } }
+        }, ['identifier'])).shift();
+        debug('createSendEmailMessageTaskIfNotExist: message4order:', JSON.stringify(message4order));
+        if (typeof message4order?.identifier === 'string') {
+            // 取引のpotentialActionsが存在する間は、メッセージ識別子が想定通りか確認する
+            const messageIdentifierByTransaction = sendEmailMessageActions?.at(0)?.object.identifier;
+            if (typeof messageIdentifierByTransaction === 'string') {
+                debug('createSendEmailMessageTaskIfNotExist: identifier matched?', message4order.identifier, messageIdentifierByTransaction);
+                if (message4order.identifier !== messageIdentifierByTransaction) {
+                    throw new factory_1.factory.errors.Internal(`message identifier not matched. ${message4order.identifier} ${messageIdentifierByTransaction}`);
+                }
+            }
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, 0 // 複数メッセージに対応していた時期の名残(2026-07-16~)
+            );
+            const simpleOrder = {
+                typeOf: params.order.typeOf,
+                orderNumber: params.order.orderNumber,
+                orderDate: params.order.orderDate
+            };
+            const actionAttributes = {
+                project: params.order.project,
+                typeOf: factory_1.factory.actionType.SendAction,
+                object: {
+                    identifier: message4order.identifier,
+                    typeOf: factory_1.factory.creativeWorkType.EmailMessage
+                },
+                agent: params.order.project,
+                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+                purpose: simpleOrder
+            };
+            const sendEmailMessageTask = {
+                alternateName: taskIdentifier,
+                identifier: taskIdentifier,
+                project: params.order.project,
+                name: factory_1.factory.taskName.SendEmailMessage,
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: now, // なるはやで実行
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: { actionAttributes }
+            };
+            await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
         }
+        // if (Array.isArray(sendEmailMessageActions)) {
+        //     await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
+        //         const taskIdentifier: string = format(
+        //             '%s:%s:%s:%s:%s:%s',
+        //             params.order.project.id,
+        //             factory.taskName.SendEmailMessage,
+        //             params.order.typeOf,
+        //             params.order.orderNumber,
+        //             factory.orderStatus.OrderProcessing,
+        //             index
+        //         );
+        //         const simpleOrder: factory.order.ISimpleOrder = {
+        //             typeOf: params.order.typeOf,
+        //             orderNumber: params.order.orderNumber,
+        //             orderDate: params.order.orderDate
+        //         };
+        //         const actionAttributes: factory.task.sendEmailMessage.IData['actionAttributes'] = {
+        //             project: params.order.project,
+        //             typeOf: factory.actionType.SendAction,
+        //             object: sendEmailMessageAction.object,
+        //             agent: params.order.project,
+        //             recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+        //             purpose: simpleOrder
+        //         };
+        //         const sendEmailMessageTask: factory.task.IAttributes<factory.taskName.SendEmailMessage> & {
+        //             alternateName: string;
+        //             identifier: string;
+        //         } = {
+        //             alternateName: taskIdentifier,
+        //             identifier: taskIdentifier,
+        //             project: params.order.project,
+        //             name: factory.taskName.SendEmailMessage,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now, // なるはやで実行
+        //             remainingNumberOfTries: 10,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: { actionAttributes }
+        //         };
+        //         await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
+        //     }));
+        // }
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts

@@ -1,3 +1,4 @@
+import type { MessageRepo } from '../../../repo/message';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
@@ -13,6 +14,7 @@ declare function onOrderProcessing(params: {
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
+    message: MessageRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js

@@ -8,7 +8,7 @@ exports.onOrderReturned = onOrderReturned;
  * 注文返品時処理
  */
 const debug_1 = __importDefault(require("debug"));
-const google_libphonenumber_1 = require("google-libphonenumber");
+const customerTelephone2COATelNum_1 = require("../../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../../factory");
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_2 = require("./onOrderReturned/factory");
@@ -104,11 +104,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
                 if (typeof superEventLocationBranchCode !== 'string') {
                     throw new factory_1.factory.errors.ArgumentNull('order.reservationForSuperEventLocationBranchCodes');
                 }
-                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                // COAでは数字のみ受け付けるので数字以外を除去
-                telNum = telNum.replace(/[^\d]/g, '');
+                const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(order.customer.telephone) });
                 returnReserveTransactionAction = {
                     project: order.project,
                     typeOf: factory_1.factory.actionType.ReturnAction,

package/lib/chevre/service/order/payOrder.d.ts

@@ -1,4 +1,5 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -10,6 +11,7 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
  */
 declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
     acceptedOffer: AcceptedOfferRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

package/lib/chevre/service/order/placeOrder.d.ts

@@ -3,6 +3,7 @@ import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AuthorizeOfferActionRepo } from '../../repo/action/authorizeOffer';
 import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authorizePaymentMethod';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { SettingRepo } from '../../repo/setting';
@@ -17,6 +18,7 @@ interface IPlaceOrderRepos {
     action: ActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     setting: SettingRepo;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
-const factory_1 = require("../../../../factory");
 const publishConfirmationNumberIfNotExist_1 = require("../../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
 function fixOrderAsNeeded(params) {
     return async (repos) => {
@@ -12,7 +11,7 @@ function fixOrderAsNeeded(params) {
         // if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
         const confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.purpose.id,
-            status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
+            // status: { $in: [factory.transactionStatusType.InProgress] },
             object: { orderDate }
         })(repos);
         // }

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

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

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

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

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

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

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

@@ -78,13 +78,15 @@ function authorize(params) {
             authorizePaymentMethodAction: repos.authorizePaymentMethodAction,
             authorization: repos.authorization,
             ticket: repos.ticket,
-            placeOrder: repos.placeOrder,
+            orderInTransaction: repos.orderInTransaction,
             transactionNumber: repos.transactionNumber
         });
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, invoiceByTicketToken, ticketToken } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, 
+        // invoiceByTicketToken,
+        ticketToken } = fixTransactionNumberResult;
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_2.createMovieTicket) : undefined;
         const { accountId } = await fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
@@ -196,10 +198,10 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_2.createAuthorizeResult)({
+        const result = (0, factory_2.payTransaction2actionResult)({
             payTransaction,
-            object: authorizeObjectIncludingPaymentMethodDetails,
-            invoiceByTicketToken
+            // object: authorizeObjectIncludingPaymentMethodDetails,
+            // invoiceByTicketToken
         });
         await repos.authorizePaymentMethodAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
@@ -209,40 +211,14 @@ function authorize(params) {
  * 承認しようとしているobjectからaccountIdを決定する
  */
 function fixAccountIdIfPossible(params) {
-    return async (
-    // repos: {
-    //     action: ActionRepo;
-    //     authorization: AuthorizationRepo;
-    //     ticket: TicketRepo;
-    // }
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => {
+    return async () => {
         let accountId = '';
-        const fromLocation = params.object?.fromLocation;
+        // const fromLocation = params.object?.fromLocation;
         const movieTickets = params.object?.movieTickets;
-        // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
-        if (typeof fromLocation === 'string') {
-            throw new factory_1.factory.errors.NotImplemented('object.fromLocation as string not implemented');
-            // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
-            // const { authorizedObject } = await verifyToken({
-            //     project: { id: params.project.id },
-            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            //     token: fromLocation
-            // })(repos);
-            // const paymentCardOwnershipInfo = authorizedObject;
-            // if (Array.isArray(paymentCardOwnershipInfo)) {
-            //     throw new factory.errors.NotImplemented('fromLocation as an array not implemented');
-            // }
-            // if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
-            //     throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
-            // }
-            // if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-            //     throw new factory.errors.Argument('fromLocation', 'must be Permit');
-            // }
-            // accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
-        }
+        // // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
+        // if (typeof fromLocation === 'string') {
+        //     throw new factory.errors.NotImplemented('object.fromLocation as string not implemented');
+        // }
         // 購入番号管理番号をaccountIdにセット(2024-03-24~)
         if (Array.isArray(movieTickets) && movieTickets.length > 0) {
             accountId = movieTickets[0].identifier; // 決済カードidentifierは1つのみ許可の前提

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

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

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

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

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

@@ -18,7 +18,9 @@ interface IFindAcceptActionResult {
         name?: string;
         message?: string;
     };
-    result?: factory.action.accept.pay.IResult;
+    result?: Pick<factory.action.accept.pay.IResult, 'paymentMethodId'> & {
+        paymentUrl: string;
+    };
 }
 declare function findAcceptAction(params: {
     project: {