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

package/lib/chevre/repo/place/section.js

@@ -23,20 +23,12 @@ class SectionRepo {
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
-    createScreeningRoomSection(screeningRoomSection) {
+    createSection(screeningRoomSection, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const screeningRoom = screeningRoomSection.containedInPlace;
-            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-            }
-            const movieTheater = screeningRoom.containedInPlace;
-            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
-            }
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
             // 施設存在確認
-            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoomSection.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
+            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: project.id }, branchCode: { $eq: movieTheaterCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
                 : undefined), { _id: 1 })
                 .lean()
                 .exec();
@@ -46,13 +38,13 @@ class SectionRepo {
             // セクションコードが存在しなければ追加する
             const doc = yield this.placeModel.findOneAndUpdate({
                 typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoomSection.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
-                branchCode: { $eq: screeningRoom.branchCode },
+                'project.id': { $eq: project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
+                branchCode: { $eq: roomCode },
                 'containsPlace.branchCode': { $ne: screeningRoomSection.branchCode }
             }, {
                 $push: {
-                    containsPlace: Object.assign({ typeOf: screeningRoomSection.typeOf, branchCode: screeningRoomSection.branchCode, name: screeningRoomSection.name }, (Array.isArray(screeningRoomSection.additionalProperty))
+                    containsPlace: Object.assign({ typeOf: factory.placeType.ScreeningRoomSection, branchCode: screeningRoomSection.branchCode, name: screeningRoomSection.name }, (Array.isArray(screeningRoomSection.additionalProperty))
                         ? { additionalProperty: screeningRoomSection.additionalProperty }
                         : undefined)
                 }
@@ -68,21 +60,16 @@ class SectionRepo {
             return doc.toObject();
         });
     }
+    /**
+     * セクションの名称と追加特性を編集する
+     */
     // tslint:disable-next-line:max-func-body-length
-    updateScreeningRoomSection(screeningRoomSection, $unset) {
+    updateSectionByBranchCode(screeningRoomSection, $unset, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const screeningRoom = screeningRoomSection.containedInPlace;
-            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-            }
-            const movieTheater = screeningRoom.containedInPlace;
-            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
-            }
-            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoomSection.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode }, branchCode: { $eq: screeningRoom.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
-                : undefined), Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                : undefined), Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
                 ? {
                     'containsPlace.$[screeningRoomSection].name': screeningRoomSection.name
                 }
@@ -90,13 +77,73 @@ class SectionRepo {
                 ? {
                     'containsPlace.$[screeningRoomSection].additionalProperty': screeningRoomSection.additionalProperty
                 }
-                : undefined), (Array.isArray(screeningRoomSection.containsPlace) && screeningRoomSection.containsPlace.length > 0)
+                : undefined), ($unset !== undefined && $unset !== null) ? { $unset } : undefined), {
+                new: true,
+                arrayFilters: [
+                    { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
+                ],
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+            }
+            return doc.toObject();
+        });
+    }
+    /**
+     * セクションの座席を上書きする
+     */
+    // tslint:disable-next-line:max-func-body-length
+    overwriteSeats(screeningRoomSection, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
+            const { containsPlace } = screeningRoomSection;
+            if (!Array.isArray(containsPlace)) {
+                throw new factory.errors.ArgumentNull('containsPlace');
+            }
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                : undefined), Object.assign({}, (containsPlace.length > 0)
                 ? {
-                    'containsPlace.$[screeningRoomSection].containsPlace': screeningRoomSection.containsPlace.map((p) => {
+                    'containsPlace.$[screeningRoomSection].containsPlace': containsPlace.map((p) => {
                         return Object.assign(Object.assign(Object.assign({ typeOf: p.typeOf, branchCode: p.branchCode }, (p.name !== undefined && p.name !== null) ? { name: p.name } : undefined), (Array.isArray(p.seatingType)) ? { seatingType: p.seatingType } : undefined), (Array.isArray(p.additionalProperty)) ? { additionalProperty: p.additionalProperty } : undefined);
                     })
                 }
-                : undefined), ($unset !== undefined && $unset !== null) ? { $unset } : undefined), {
+                : undefined), {
+                new: true,
+                arrayFilters: [
+                    { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
+                ],
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+            }
+            return doc.toObject();
+        });
+    }
+    // tslint:disable-next-line:max-func-body-length
+    migrateSectionIdentifier(screeningRoomSection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
+            }
+            const movieTheater = screeningRoom.containedInPlace;
+            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
+            }
+            const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                'project.id': { $eq: screeningRoomSection.project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
+                branchCode: { $eq: screeningRoom.branchCode },
+                'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
+            }, {
+                'containsPlace.$[screeningRoomSection].identifier': screeningRoomSection.identifier
+            }, {
                 new: true,
                 arrayFilters: [
                     { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
@@ -209,7 +256,7 @@ class SectionRepo {
                 { $unwind: '$containsPlace' },
                 ...matchStages,
                 {
-                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
+                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', identifier: '$containsPlace.identifier', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
                         ? {
                             containedInPlace: {
                                 typeOf: '$typeOf',
@@ -295,14 +342,14 @@ class SectionRepo {
                 .exec();
         });
     }
-    deleteScreeningRoomSection(screeningRoomSection) {
+    deleteSectionByBranchCode(screeningRoomSection, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoomSection.project.id }, 'containedInPlace.branchCode': {
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': {
                     $exists: true,
-                    $eq: screeningRoomSection.containedInPlace.containedInPlace.branchCode
-                }, branchCode: { $eq: screeningRoomSection.containedInPlace.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
+                    $eq: movieTheaterCode
+                }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
                 : undefined), {
                 $pull: {
                     containsPlace: {

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

@@ -1,16 +1,21 @@
 import * as factory from '../../../factory';
+import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
-export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> | {
+export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> & {
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
+} | {
     object: factory.action.accept.pay.IPayObject & {
         paymentMethod: factory.action.accept.pay.IPaymentMethod & {
             movieTickets: never;
         };
     };
+    instrument: factory.action.accept.pay.IInstrument[];
 }): (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
 }) => Promise<void>;

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

@@ -19,14 +19,18 @@ const debug = createDebug('chevre-domain:service:assetTransaction:pay');
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
+// tslint:disable-next-line:max-func-body-length
 function validateAcceptedPaymentMethodIfNeeded(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        const now = new Date();
         /**
          * 検証対象のイベントIDリスト
          */
         let checkingEventIds;
         const paymentServiceType = params.object.typeOf;
+        const paymentServiceId = params.object.id;
         // CreditCard or MovieTicket?
         if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
             // クレジットカードIF決済の場合、objectに注文アイテム指定があればそちらで検証する
@@ -77,10 +81,28 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                 }
                 if (((_b = eventSeries.offers) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.offerType.AggregateOffer) {
                     // 対応決済方法オファーIDの指定が必要
-                    throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferId');
-                    // if (paymentAccepted !== true) {
-                    //     throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
-                    // }
+                    const acceptedPaymentMethodOfferIds = [];
+                    params.instrument.forEach((instrument) => {
+                        if (instrument.typeOf === factory.offerType.Offer) {
+                            acceptedPaymentMethodOfferIds.push(instrument.id);
+                        }
+                    });
+                    if (acceptedPaymentMethodOfferIds.length === 0) {
+                        throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferIds');
+                    }
+                    // 全施設コンテンツについて有効な対応決済方法オファーの存在を検証
+                    const validAcceptedPaymentMethodOffer = (yield repos.acceptedPaymentMethod.findAcceptedPaymentMethods({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: acceptedPaymentMethodOfferIds }, // 指定されたIDで
+                        itemOffered: { id: { $eq: eventSeriesId } }, // リソースに対して
+                        acceptedPaymentMethod: { id: { $eq: paymentServiceId } }, // 決済方法を許可
+                        validFrom: { $lte: now }, // 現在有効
+                        validThrough: { $gte: now } // 現在有効
+                    }, ['identifier'])).shift();
+                    if (validAcceptedPaymentMethodOffer === undefined) {
+                        throw new factory.errors.NotFound(factory.offerType.Offer, `payment not accepted. eventSeriesId: ${eventSeriesId}`);
+                    }
                 }
                 else {
                     // 集約オファーでなければ検証の必要なし

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

@@ -5,6 +5,7 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -21,6 +22,7 @@ import type { TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     credentials: CredentialsRepo;
@@ -62,6 +64,7 @@ export type ICheckOperation<T> = (repos: {
     paymentServiceProvider: PaymentServiceProviderRepo;
 }, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

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

@@ -16,6 +16,7 @@ export declare function creatPublishPaymentUrlParams(params: {
      * 決済採用に使用される決済方法チケットトークン
      */
     ticketToken?: string;
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'agent' | 'location' | 'project' | 'recipient' | 'transactionNumber' | 'typeOf'> & {
     object: factory.action.accept.pay.IPayObject;
     identifier?: string;
@@ -40,6 +41,10 @@ export declare function creatPayTransactionStartParams(params: {
      * 決済方法チケット
      */
     ticketToken?: string;
+    /**
+     * ツールとしての対応決済方法オファー
+     */
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): factory.assetTransaction.pay.IStartParamsWithoutDetail & {
     instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
 };

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

@@ -28,7 +28,15 @@ function creatPublishPaymentUrlParams(params) {
             referencesOrder: params.object.referencesOrder
         }
     };
+    const instrument = [];
     const ticketAsInstrument = (typeof params.ticketToken === 'string') ? { ticketToken: params.ticketToken, typeOf: 'Ticket' } : undefined;
+    if (ticketAsInstrument !== undefined) {
+        instrument.push(ticketAsInstrument);
+    }
+    // instrumentを対応決済方法オファーに対応(2025-12-14~)
+    if (Array.isArray(params.instrument)) {
+        instrument.push(...params.instrument);
+    }
     return Object.assign(Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,
             id: params.transaction.seller.id,
@@ -43,7 +51,7 @@ function creatPublishPaymentUrlParams(params) {
             typeOf: params.transaction.seller.typeOf
         }, object }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
         ? { location: params.location }
-        : undefined), { instrument: (ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] }), (typeof params.identifier === 'string')
+        : undefined), { instrument }), (typeof params.identifier === 'string')
         ? { identifier: params.identifier }
         : undefined);
 }
@@ -71,7 +79,8 @@ function creatPayTransactionStartParams(params) {
     const instrument = [
         { id: params.action.id, typeOf: params.action.typeOf },
         { orderNumber, typeOf: factory.order.OrderType.Order },
-        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [] // add ticketAsInstrument(2025-11-25~)
+        ...(ticketAsInstrument !== undefined) ? [ticketAsInstrument] : [], // add ticketAsInstrument(2025-11-25~)
+        ...(Array.isArray(params.instrument)) ? params.instrument : [] // instrumentを対応決済方法オファーに対応(2025-12-14~)
     ];
     return Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
             typeOf: params.transaction.seller.typeOf,

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

@@ -1,5 +1,6 @@
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -79,6 +80,7 @@ declare function processVoidPayTransaction(params: factory.task.IData<factory.ta
     transaction: TransactionRepo;
 }) => Promise<void>;
 interface IAuthorizeRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -101,6 +103,7 @@ interface IAuthorizeRepos {
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 interface IPublishPaymentUrlRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
@@ -143,6 +146,7 @@ declare function publishPaymentUrl(params: {
      * add identifier for an unique index(2025-02-25~)
      */
     identifier?: string;
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 /**
  * 決済承認
@@ -173,6 +177,10 @@ declare function authorize(params: {
          */
         id: string;
     };
+    /**
+     * ツールとしての対応決済方法オファー
+     */
+    instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
 }): IAuthorizeOperation<{
     /**
      * 承認アクションID

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

@@ -366,7 +366,7 @@ function publishPaymentUrl(params) {
                 referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
                     ? params.object.referencesOrder
                     : { typeOf: factory.order.OrderType.Order } });
-            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location, instrument: params.instrument }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
             const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
@@ -539,7 +539,8 @@ function authorize(params) {
                 // orderNumber required(2025-02-14~)
                 order: { confirmationNumber, orderNumber },
                 action: { id: action.id, typeOf: action.typeOf },
-                ticketToken
+                ticketToken,
+                instrument: params.instrument
             });
             payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,

package/lib/chevre/service/task/authorizePayment.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = require("../../factory");
+const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -52,8 +53,9 @@ function call(params) {
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
-            yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+            yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
              }))({
+                acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = require("../../factory");
+const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -41,7 +42,8 @@ function call(params) {
         const actionRepo = new action_1.ActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+            yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [], sameAs: { id: params.id } }))({
+                acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),