@chevre/domain 24.0.0-alpha.1 → 24.0.0-alpha.11

package/lib/chevre/repo/transactionNumber.js

@@ -51,13 +51,11 @@ class TransactionNumberRepo {
         const timestamp = (0, moment_timezone_1.default)(params.startDate)
             .valueOf()
             .toString();
-        let dataFeedExpires;
         const dataFeedIdentifier = timestamp;
-        let incrReply;
-        dataFeedExpires = (0, moment_timezone_1.default)(params.startDate)
+        const dataFeedExpires = (0, moment_timezone_1.default)(params.startDate)
             .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
             .toDate();
-        incrReply = await this.counterRepo.incrementByMongo({
+        const incrReply = await this.counterRepo.incrementByMongo({
             identifier: dataFeedIdentifier,
             includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.transactionNumber },
             expires: dataFeedExpires

package/lib/chevre/repo/trip.js

@@ -88,9 +88,8 @@ class TripRepo {
         return docs.map((doc) => doc.toObject());
     }
     async updatePartiallyById(params) {
-        let doc;
         const { typeOf, ...updateFields } = params.attributes;
-        doc = await this.tripModel.findOneAndUpdate({
+        const doc = await this.tripModel.findOneAndUpdate({
             _id: params.id,
             typeOf: params.attributes.typeOf
         }, {

package/lib/chevre/repository.d.ts

@@ -84,6 +84,8 @@ import type { TaskRepo } from './repo/task';
 import type { TelemetryRepo } from './repo/telemetry';
 import type { TicketRepo } from './repo/ticket';
 import type { TransactionRepo } from './repo/transaction';
+import type { PlaceOrderRepo } from './repo/transaction/placeOrder';
+import type { ReturnOrderRepo } from './repo/transaction/returnOrder';
 import type { TransactionNumberRepo } from './repo/transactionNumber';
 import type { TransactionProcessRepo } from './repo/transactionProcess';
 import type { TripRepo } from './repo/trip';
@@ -466,6 +468,16 @@ export type Transaction = TransactionRepo;
 export declare namespace Transaction {
     function createInstance(...params: ConstructorParameters<typeof TransactionRepo>): Promise<TransactionRepo>;
 }
+export declare namespace transaction {
+    type PlaceOrder = PlaceOrderRepo;
+    namespace PlaceOrder {
+        function createInstance(...params: ConstructorParameters<typeof PlaceOrderRepo>): Promise<PlaceOrderRepo>;
+    }
+    type ReturnOrder = ReturnOrderRepo;
+    namespace ReturnOrder {
+        function createInstance(...params: ConstructorParameters<typeof ReturnOrderRepo>): Promise<ReturnOrderRepo>;
+    }
+}
 export type TransactionNumber = TransactionNumberRepo;
 export declare namespace TransactionNumber {
     function createInstance(...params: ConstructorParameters<typeof TransactionNumberRepo>): Promise<TransactionNumberRepo>;

package/lib/chevre/repository.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedPaymentMethod = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = void 0;
+exports.WebSite = exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Permit = exports.Person = exports.paymentMethod = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1001,6 +1001,31 @@ var Transaction;
     }
     Transaction.createInstance = createInstance;
 })(Transaction || (exports.Transaction = Transaction = {}));
+var transaction;
+(function (transaction) {
+    let PlaceOrder;
+    (function (PlaceOrder) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/transaction/placeOrder')))).PlaceOrderRepo;
+            }
+            return new repo(...params);
+        }
+        PlaceOrder.createInstance = createInstance;
+    })(PlaceOrder = transaction.PlaceOrder || (transaction.PlaceOrder = {}));
+    let ReturnOrder;
+    (function (ReturnOrder) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/transaction/returnOrder')))).ReturnOrderRepo;
+            }
+            return new repo(...params);
+        }
+        ReturnOrder.createInstance = createInstance;
+    })(ReturnOrder = transaction.ReturnOrder || (transaction.ReturnOrder = {}));
+})(transaction || (exports.transaction = transaction = {}));
 var TransactionNumber;
 (function (TransactionNumber) {
     let repo;

package/lib/chevre/service/account.js

@@ -75,27 +75,20 @@ function open(params) {
 function transferMoney(actionAttributes) {
     return async (repos) => {
         const action = actionAttributes;
-        let fromAccountNumber;
-        let toAccountNumber;
-        try {
-            fromAccountNumber = (typeof action.fromLocation.accountNumber === 'string')
-                ? action.fromLocation.accountNumber
-                /* istanbul ignore next */
-                : undefined;
-            toAccountNumber = (typeof action.toLocation.accountNumber === 'string')
-                ? action.toLocation.accountNumber
-                /* istanbul ignore next */
-                : undefined;
-            await repos.account.settleTransaction({
-                fromAccountNumber: fromAccountNumber,
-                toAccountNumber: toAccountNumber,
-                amount: (typeof action.amount === 'number') ? action.amount : Number(action.amount.value),
-                transactionId: action.purpose.id
-            });
-        }
-        catch (error) {
-            throw error;
-        }
+        const fromAccountNumber = (typeof action.fromLocation.accountNumber === 'string')
+            ? action.fromLocation.accountNumber
+            /* istanbul ignore next */
+            : undefined;
+        const toAccountNumber = (typeof action.toLocation.accountNumber === 'string')
+            ? action.toLocation.accountNumber
+            /* istanbul ignore next */
+            : undefined;
+        await repos.account.settleTransaction({
+            fromAccountNumber: fromAccountNumber,
+            toAccountNumber: toAccountNumber,
+            amount: (typeof action.amount === 'number') ? action.amount : Number(action.amount.value),
+            transactionId: action.purpose.id
+        });
     };
 }
 /**

package/lib/chevre/service/accountTransaction/deposit.js

@@ -60,14 +60,8 @@ function start(params) {
             ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
         };
         // 取引作成
-        let transaction;
-        try {
-            // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = await repos.accountTransaction.startByIdentifier(startParams);
-        }
-        catch (error) {
-            throw error;
-        }
+        // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
+        const transaction = await repos.accountTransaction.startByIdentifier(startParams);
         const pendingTransaction = {
             typeOf: transaction.typeOf,
             id: transaction.id,

package/lib/chevre/service/accountTransaction/transfer.js

@@ -82,14 +82,8 @@ function start(params) {
             ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
         };
         // 取引作成
-        let transaction;
-        try {
-            // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = await repos.accountTransaction.startByIdentifier(startParams);
-        }
-        catch (error) {
-            throw error;
-        }
+        // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
+        const transaction = await repos.accountTransaction.startByIdentifier(startParams);
         const pendingTransaction = {
             typeOf: transaction.typeOf,
             id: transaction.id,

package/lib/chevre/service/accountTransaction/withdraw.js

@@ -67,14 +67,8 @@ function start(params) {
             ...(typeof params.identifier === 'string' && params.identifier.length > 0) ? { identifier: params.identifier } : undefined
         };
         // 取引作成
-        let transaction;
-        try {
-            // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
-            transaction = await repos.accountTransaction.startByIdentifier(startParams);
-        }
-        catch (error) {
-            throw error;
-        }
+        // 取引識別子が指定されていれば、進行中取引のユニークネスを保証する
+        const transaction = await repos.accountTransaction.startByIdentifier(startParams);
         const pendingTransaction = {
             typeOf: transaction.typeOf,
             id: transaction.id,

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -192,37 +192,32 @@ function aggregateOfferByEvent(params) {
 function calculateOfferCount(params) {
     return async (repos) => {
         let offerCount = 0;
-        try {
-            const eventOffers = params.event.offers;
-            if (typeof eventOffers?.itemOffered?.id === 'string') {
-                const eventService = (await repos.product.projectFields({
+        const eventOffers = params.event.offers;
+        if (typeof eventOffers?.itemOffered?.id === 'string') {
+            const eventService = (await repos.product.projectFields({
+                limit: 1,
+                page: 1,
+                id: { $eq: eventOffers.itemOffered.id }
+            }, ['hasOfferCatalog']
+            // []
+            )).shift();
+            if (eventService === undefined) {
+                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+            }
+            // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
+            const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
+            if (typeof firstCatalogIdOfProduct === 'string') {
+                const catalogs = await repos.offerCatalog.projectFields({
                     limit: 1,
                     page: 1,
-                    id: { $eq: eventOffers.itemOffered.id }
-                }, ['hasOfferCatalog']
-                // []
-                )).shift();
-                if (eventService === undefined) {
-                    throw new factory.errors.NotFound(factory.product.ProductType.EventService);
-                }
-                // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-                const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
-                if (typeof firstCatalogIdOfProduct === 'string') {
-                    const catalogs = await repos.offerCatalog.projectFields({
-                        limit: 1,
-                        page: 1,
-                        id: { $in: [firstCatalogIdOfProduct] }
-                    }, ['numberOfItems']);
-                    const numberOfItems = catalogs.shift()?.numberOfItems;
-                    if (typeof numberOfItems === 'number') {
-                        offerCount = numberOfItems;
-                    }
+                    id: { $in: [firstCatalogIdOfProduct] }
+                }, ['numberOfItems']);
+                const numberOfItems = catalogs.shift()?.numberOfItems;
+                if (typeof numberOfItems === 'number') {
+                    offerCount = numberOfItems;
                 }
             }
         }
-        catch (error) {
-            throw error;
-        }
         return { offerCount };
     };
 }
@@ -231,11 +226,8 @@ function aggregateReservationByEvent(params) {
         // 収容人数を集計
         let maximumAttendeeCapacity;
         let remainingAttendeeCapacity;
-        let attendeeCount;
-        let checkInCount;
-        let reservationCount;
         const reservationType = factory.reservationType.EventReservation;
-        reservationCount = await repos.reservation.count({
+        const reservationCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
@@ -275,12 +267,12 @@ function aggregateReservationByEvent(params) {
                 remainingAttendeeCapacity = 0;
             }
         }
-        attendeeCount = await repos.reservation.count({
+        const attendeeCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
             attended: true
         });
-        checkInCount = await repos.reservation.count({
+        const checkInCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
             checkedIn: true

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

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirm = confirm;
 function confirm(params) {
     return async (repos) => {
-        let stateReserveArgs;
-        let stateReserveResult;
         let delReserveArgs;
-        stateReserveArgs = params.object;
-        stateReserveResult = await repos.reserveService.stateReserve(stateReserveArgs);
+        const stateReserveArgs = params.object;
+        const stateReserveResult = await repos.reserveService.stateReserve(stateReserveArgs);
         if (stateReserveResult !== null) {
             delReserveArgs = {
                 theaterCode: stateReserveArgs.theaterCode,

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

@@ -95,29 +95,8 @@ function start(params) {
             expires: params.expires
         };
         // 取引開始
-        let transaction;
-        try {
-            transaction = await repos.assetTransaction.start(startParams);
-            // const pendingTransaction = await authorizeAccount({ transaction })(repos);
-            await authorizeAccount({ transaction })(repos);
-            // 更新不要(2023-02-20~)
-            // await repos.assetTransaction.findByIdAndUpdate<factory.assetTransactionType.MoneyTransfer>({
-            //     id: transaction.id,
-            //     update: {
-            //         'object.pendingTransaction': {
-            //             typeOf: pendingTransaction.typeOf,
-            //             id: pendingTransaction.id,
-            //             transactionNumber: pendingTransaction.transactionNumber,
-            //             ...(typeof pendingTransaction.identifier === 'string')
-            //                 ? { identifier: pendingTransaction.identifier }
-            //                 : undefined
-            //         }
-            //     }
-            // });
-        }
-        catch (error) {
-            throw error;
-        }
+        const transaction = await repos.assetTransaction.start(startParams);
+        await authorizeAccount({ transaction })(repos);
         return transaction;
     };
 }

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

@@ -33,17 +33,12 @@ function check(params) {
     return async (repos, settings) => {
         let action;
         const paymentServiceType = params.object[0]?.typeOf;
-        try {
-            switch (paymentServiceType) {
-                case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                    action = await MovieTicketPayment.checkMovieTicket(params)(repos, settings);
-                    break;
-                default:
-                    throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
-            }
-        }
-        catch (error) {
-            throw error;
+        switch (paymentServiceType) {
+            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+                action = await MovieTicketPayment.checkMovieTicket(params)(repos, settings);
+                break;
+            default:
+                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
         return action;
     };

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

@@ -61,7 +61,6 @@ function confirm(params) {
             || typeof orderNumber !== 'string' || orderNumber.length === 0) {
             throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
         }
-        let potentialActions;
         // 注文検証
         const existingOrders = await repos.order.projectFields({
             limit: 1,
@@ -77,7 +76,7 @@ function confirm(params) {
             object: { paymentMethod: { paymentMethodId: transaction.transactionNumber } },
             purpose: { confirmationNumber, orderNumber, typeOf: factory.order.OrderType.Order }
         };
-        potentialActions = { pay: [payActionData4order] };
+        const potentialActions = { pay: [payActionData4order] };
         await repos.assetTransaction.confirm({
             typeOf: factory.assetTransactionType.Pay,
             id: transaction.id,

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

@@ -1,7 +1,7 @@
 /**
  * 決済取引サービス
  */
-import * as GMO from '@motionpicture/gmo-service';
+import type * as GMO from '@motionpicture/gmo-service';
 import { Settings } from '../../../settings';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';

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

@@ -2,11 +2,17 @@
  * 決済取引ファクトリー
  */
 import * as factory from '../../../../factory';
+import type { IPaymentAgencyTransaction } from '../../../payment/creditCard';
+/**
+ * 決済取引開始パラメータ生成
+ */
 export declare function createStartParams(params: factory.assetTransaction.pay.IStartParamsWithoutDetail & {
-    transactionNumber: string;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
-    amount: number;
-    paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'>;
+    paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | Pick<factory.product.IProduct, 'availableChannel' | 'id' | 'serviceOutput' | 'serviceType'> | {
+        typeOf: factory.service.paymentService.PaymentServiceType.FaceToFace;
+        id?: never;
+        serviceType?: never;
+    };
     location?: factory.action.trade.pay.ILocation;
     informActions: {
         /**
@@ -20,3 +26,45 @@ export declare function createStartParams(params: factory.assetTransaction.pay.I
         id: string;
     };
 }): factory.assetTransaction.IStartParams<factory.assetTransactionType.Pay>;
+/**
+ * クレジットカード決済用の追加オプションを生成する
+ */
+export declare function createAuthorizeCreditCardOptions(options: {
+    executor?: {
+        id?: string;
+    };
+    pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
+}): {
+    pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction | undefined;
+    executor: {
+        id: string;
+    } | {
+        id?: undefined;
+    };
+};
+/**
+ * ムビチケ決済用の追加オプションを生成する
+ */
+export declare function createAuthorizeMovieTicketOptions(options: {
+    executor?: {
+        id?: string;
+    };
+    purpose: {
+        id?: string;
+    };
+    checkedAction: {
+        id: string;
+    };
+}): {
+    executor: {
+        id: string;
+    } | {
+        id?: undefined;
+    };
+    purpose: {
+        id?: string;
+    };
+    checkedAction: {
+        id: string;
+    };
+};

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

@@ -24,11 +24,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = createStartParams;
+exports.createAuthorizeCreditCardOptions = createAuthorizeCreditCardOptions;
+exports.createAuthorizeMovieTicketOptions = createAuthorizeMovieTicketOptions;
 /**
  * 決済取引ファクトリー
  */
 const factory = __importStar(require("../../../../factory"));
+function createServiceOutputAsPayTransactionObject(params) {
+    return {
+        serviceOutput: (params.object.serviceOutput?.typeOf === 'Invoice')
+            ? params.object.serviceOutput
+            : {
+                typeOf: 'Invoice',
+                referencesOrder: { typeOf: factory.order.OrderType.Order }
+            }
+    };
+}
+/**
+ * 決済取引開始パラメータ生成
+ */
 function createStartParams(params, options) {
+    // 金額をfix
+    const amount = params.object.paymentMethod?.amount;
+    if (typeof amount !== 'number') {
+        throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
+    }
+    const transactionNumber = params.transactionNumber;
+    if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
+        throw new factory.errors.ArgumentNull('transactionNumber');
+    }
     const { instrument } = params;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
@@ -48,14 +72,14 @@ function createStartParams(params, options) {
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.priceCurrency.JPY,
-                value: params.amount
+                value: amount
             };
             break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.priceCurrency.JPY,
-                value: params.amount
+                value: amount
             };
             accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
@@ -109,7 +133,7 @@ function createStartParams(params, options) {
     const paymentMethodAmount = {
         typeOf: 'MonetaryAmount',
         currency: paymentMethodCurrency,
-        value: params.amount
+        value: amount
     };
     const paymentMethod = {
         additionalProperty: (Array.isArray(params.object.paymentMethod?.additionalProperty))
@@ -140,19 +164,14 @@ function createStartParams(params, options) {
             ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
             : undefined
     };
+    const { serviceOutput } = createServiceOutputAsPayTransactionObject(params);
     const object = {
         accountId: (typeof accountId === 'string') ? accountId : '',
         paymentMethodId: params.transactionNumber,
         typeOf: params.paymentServiceType,
         id: paymentServiceId,
-        // onPaymentStatusChanged: { informPayment: params.informActions }, // discontinue(2025-02-09~)
         paymentMethod,
-        serviceOutput: (params.object.serviceOutput?.typeOf === 'Invoice') // support serviceOutput(2025-11-24~)
-            ? params.object.serviceOutput
-            : {
-                typeOf: 'Invoice',
-                referencesOrder: { typeOf: factory.order.OrderType.Order }
-            },
+        serviceOutput, // support serviceOutput(2025-11-24~)
         ...(params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
             ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
             : undefined
@@ -178,14 +197,32 @@ function createStartParams(params, options) {
         ...(potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
     };
 }
-// function createInformPaymentParams(params: {
-//     paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'potentialAction'>;
-// }): factory.product.IInformPayment[] {
-//     const informPaymentParams: factory.product.IInformPayment[] = [];
-//     // プロダクト設定を適用
-//     const informPaymentParamsByProduct = params.paymentService?.availableChannel?.onPaymentStatusChanged?.informPayment;
-//     if (Array.isArray(informPaymentParamsByProduct)) {
-//         informPaymentParams.push(...informPaymentParamsByProduct);
-//     }
-//     return informPaymentParams;
-// }
+/**
+ * 決済プロセッサに渡す実行者情報を生成する
+ */
+function createExecutor(options) {
+    return (typeof options.executor?.id === 'string')
+        ? { id: options.executor.id }
+        : {}; // タスク関連付け(2024-05-18~)
+}
+/**
+ * クレジットカード決済用の追加オプションを生成する
+ */
+function createAuthorizeCreditCardOptions(options) {
+    return {
+        executor: createExecutor(options),
+        ...(options.pendingPaymentAgencyTransaction !== undefined
+            ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
+            : {})
+    };
+}
+/**
+ * ムビチケ決済用の追加オプションを生成する
+ */
+function createAuthorizeMovieTicketOptions(options) {
+    return {
+        executor: createExecutor(options),
+        purpose: options.purpose,
+        checkedAction: options.checkedAction
+    };
+}

package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.d.ts

@@ -0,0 +1,10 @@
+import * as factory from '../../../../../factory';
+import type { PaymentServiceRepo } from '../../../../../repo/paymentService';
+import type { ProductRepo } from '../../../../../repo/product';
+export declare function fixPaymentService(params: factory.assetTransaction.pay.IStartParamsWithoutDetail): (repos: {
+    paymentService: PaymentServiceRepo;
+    product: ProductRepo;
+}) => Promise<{
+    paymentServiceType: factory.service.paymentService.PaymentServiceType;
+    paymentService?: Pick<factory.product.IProduct, "availableChannel" | "id" | "serviceOutput" | "serviceType" | "potentialAction"> | Pick<factory.service.paymentService.IService, "availableChannel" | "id" | "serviceOutput" | "serviceType" | "potentialAction"> | undefined;
+}>;