@chevre/domain 24.1.0-alpha.3 → 24.1.0-alpha.30

package/lib/chevre/service/reserve/confirmReservation.js

@@ -61,7 +61,8 @@ function confirmReservation(params) {
                             ...rawReservation.reservedTicket,
                             ticketType: ticketTypeByTransaction
                         },
-                        reservationFor: reserveTransaction.object.reservationFor // reservationForは予約取引から参照する(2026-04-05~)
+                        reservationFor: reserveTransaction.object.reservationFor, // reservationForは予約取引から参照する(2026-04-05~)
+                        issuedThrough: reserveTransaction.object.issuedThrough // issuedThroughは予約取引から補完する(2026-05-08~)
                     };
                 });
                 confirmedReservations = confirmedReservations.map((r) => {
@@ -189,25 +190,24 @@ params, options) {
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         const subReservations = reserveTransaction.object.subReservation;
-                        const issuedThrough = reserveTransaction.object.issuedThrough;
+                        // const issuedThrough = reserveTransaction.object.issuedThrough;
                         if (Array.isArray(subReservations)
                             && typeof reservationFor?.typeOf === 'string'
-                            && typeof issuedThrough?.typeOf === 'string') {
-                            // confirmManyに変更(2023-06-13~)
-                            const confirmManyIfNotExistResult = await repos.reservation.confirmManyIfNotExist({
+                        // && typeof issuedThrough?.typeOf === 'string'
+                        ) {
+                            await repos.reservation.confirmManyIfNotExist({
                                 bookingTime: reserveTransaction.startDate, // startDateに設定(2024-04-08~)
                                 project: { id: reserveTransaction.project.id },
                                 provider: (typeof reserveTransaction.object.provider?.id === 'string')
                                     ? reserveTransaction.object.provider
                                     : { id: reserveTransaction.agent.id, typeOf: factory_1.factory.organizationType.Corporation },
                                 subReservation: subReservations,
-                                issuedThrough,
+                                // issuedThrough,
                                 reservationFor,
                                 reservationNumber: reserveTransaction.object.reservationNumber,
                                 underName,
                                 broker: reserveTransaction.object.broker
                             });
-                            debug('confirmManyIfNotExistResult:', confirmManyIfNotExistResult, 'reservationNumber:', reservationPackage.reservationNumber);
                         }
                     }
                     else {

package/lib/chevre/service/reserve/factory.js

@@ -21,7 +21,8 @@ function createCancelPendingReservationAction(params) {
         const reservationPackage = {
             typeOf: factory_1.factory.reservationType.ReservationPackage,
             reservationNumber: transaction.transactionNumber,
-            reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
+            // discontinue reservationFor(2026-05-09~)
+            // reservationFor: { typeOf: reservationFor.typeOf, id: String(reservationFor.id) },
             reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
                 ? params.transaction.object.reservationStatus
                 : factory_1.factory.reservationStatusType.ReservationPending

package/lib/chevre/service/reserve/findByCode.d.ts

@@ -5,7 +5,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
 type IReservationResult = Pick<factory.reservation.eventReservation.IReservation, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
-        ticketType: Pick<factory.reservation.eventReservation.ITicketType, 'identifier'> & {
+        ticketType: Pick<factory.assetTransaction.reserve.ITicketType, 'identifier'> & {
             name: {
                 ja?: string;
             };

package/lib/chevre/service/reserve/findByCode.js

@@ -39,7 +39,8 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    }, ['itemOffered'])).shift();
+                    }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+                    )).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

package/lib/chevre/service/reserve/findReservations.d.ts

@@ -1,21 +1,21 @@
 import { factory } from '../../factory';
 import type { ReserveTransactionRepo } from '../../repo/assetTransaction/reserve';
-import type { IDeprecatedField, IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+import type { IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
 /**
  * 予約検索レスポンスとしての予約
  * 予約ドキュメントに予約取引の情報を補完する
  */
-type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+type IReservationAsFindResult = Omit<factory.reservation.eventReservation.IReservation, 'underName' | 'reservedTicket' | 'reservationFor'> & {
     underName?: factory.assetTransaction.reserve.IUnderName;
     reservedTicket?: factory.assetTransaction.reserve.IObjectSubReservation['reservedTicket'];
     reservationFor?: factory.assetTransaction.reserve.IReservationFor;
+    price?: never;
 };
 /**
  * 予約を検索する
  */
 export declare function findReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
-    inclusion: Partial<Record<IKeyOfProjection | IDeprecatedField, 1>>;
+    inclusion: Partial<Record<IKeyOfProjection | 'underName', 1>>;
 }): (repos: {
     assetTransaction: {
         reserve: ReserveTransactionRepo;

package/lib/chevre/service/reserve/findReservations.js

@@ -1,11 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findReservations = findReservations;
-const debug_1 = __importDefault(require("debug"));
-const debug = (0, debug_1.default)('chevre-domain:service:reserve:findReservations');
 /**
  * 予約を検索する
  */
@@ -17,41 +12,28 @@ function findReservations(params, options) {
             return [];
         }
         else {
-            const requirePrice = Object.keys(inclusion).includes('price');
             const requireUnderName = Object.keys(inclusion).includes('underName');
             const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
             const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
+            // const requirePrice = Object.keys(inclusion).includes('price');
+            // const requirePriceCurrency = Object.keys(inclusion).includes('priceCurrency');
+            // const requireIssuedThrough = Object.keys(inclusion).includes('issuedThrough');
+            // const requireNumSeats = Object.keys(inclusion).includes('numSeats');
             const reservationIds = rawReservations.map(({ id }) => id);
             const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
                 ids: reservationIds
             });
-            // 予約取引から参照した予約数と同じはず
-            debug('useReserveTransaction: true. reservations.length === subReservations.length?', rawReservations.length === subReservations.length);
             return rawReservations.map((reservation) => {
                 const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
-                const priceByTransaction = subReservationByTransaction?.price;
                 const underNameByTransaction = subReservationByTransaction?.underName;
                 const ticketTypeByTransaction = subReservationByTransaction?.reservedTicket?.ticketType;
                 const reservationForByTransaction = subReservationByTransaction?.reservationFor;
-                // 予約ドキュメントを最適化し始めたため、もう等しくない(2026-04-06~)
-                // // 予約取引から参照した属性と全く等しいはず
-                // if (requirePrice) {
-                // }
-                // if (requireUnderName) {
-                // }
-                // if (requireReservedTicket) {
-                // }
-                // if (requireReservationFor) {
-                //     const reservationForMatched = isDeepStrictEqual(reservation.reservationFor, reservationForByTransaction);
-                //     debug('requireReservationFor. reservationForMatched?', reservationForMatched);
-                //     if (!reservationForMatched) {
-                //         console.error('reservationForMatched: false!!!', reservation.id);
-                //     }
-                // }
-                const { reservationFor, reservedTicket, ...rawReservation4result } = reservation; // eslint-disable-line @typescript-eslint/no-unused-vars
+                // const priceByTransaction = subReservationByTransaction?.price;
+                // const issuedThroughByTransaction = subReservationByTransaction?.issuedThrough;
+                // const numSeatsByTransaction = subReservationByTransaction?.numSeats;
+                const { reservationFor: _reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
                 return {
                     ...rawReservation4result, // 予約ドキュメントはそのまま返す
-                    ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
                     ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
                     ...(requireReservedTicket && ticketTypeByTransaction !== undefined) // ticketTypeがあれば上書き
                         ? {
@@ -64,6 +46,14 @@ function findReservations(params, options) {
                     ...(requireReservationFor && reservationForByTransaction !== undefined)
                         ? { reservationFor: reservationForByTransaction }
                         : undefined, // reservationForがあれば上書き(2026-04-06~)
+                    // ...(requirePrice && priceByTransaction !== undefined) ? { price: priceByTransaction } : undefined, // priceがあれば上書き
+                    // ...(requirePriceCurrency) ? { priceCurrency: factory.priceCurrency.JPY } : undefined, // 必要あらば固定値を補完(2026-05-08~)
+                    // ...(requireIssuedThrough && issuedThroughByTransaction !== undefined)
+                    //     ? { issuedThrough: issuedThroughByTransaction }
+                    //     : undefined, // issuedThroughがあれば上書き(2026-05-09~)
+                    // ...(requireNumSeats && numSeatsByTransaction !== undefined)
+                    //     ? { numSeats: numSeatsByTransaction }
+                    //     : undefined, // issuedThroughがあれば上書き(2026-05-09~)
                 };
             });
         }

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -5,13 +5,14 @@ import { factory } from '../../../factory';
 import { AuthorizationRepo } from '../../../repo/authorization';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor'> & {
-    price?: factory.reservation.eventReservation.IPrice;
+export type IConfirmedReservation = Omit<factory.reservation.eventReservation.IReservation, 'price' | 'underName' | 'reservedTicket' | 'reservationFor' | 'issuedThrough'> & {
+    price?: factory.assetTransaction.reserve.IPrice;
     underName?: Pick<factory.reservation.IUnderName, 'id' | 'typeOf'>;
     reservedTicket: Omit<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'> & {
-        ticketType: factory.reservation.eventReservation.ITicketType;
+        ticketType: factory.assetTransaction.reserve.ITicketType;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
 };
 /**
  * 予約確定後のアクション

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -98,22 +98,14 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 }
             }
             const subReservations4inform = confirmedReservations.map((r) => {
-                const { additionalProperty, additionalTicketText, 
-                // attended, checkedIn,
-                id, modifiedTime, 
-                // numSeats,
-                price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
                 return {
-                    // bookingTime, // discontinue(2024-10-27~)
                     id,
                     typeOf,
                     reservedTicket,
                     ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                    // ...(typeof attended === 'boolean') ? { attended } : undefined, // discontinue(2024-10-27~)
-                    // ...(typeof checkedIn === 'boolean') ? { checkedIn } : undefined, // discontinue(2024-10-27~)
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    // ...(typeof numSeats === 'number') ? { numSeats } : undefined, // discontinue(2024-10-27~)
                     ...(price !== undefined) ? { price } : undefined,
                     ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
                     ...(Array.isArray(subReservation)) ? { subReservation } : undefined

package/lib/chevre/service/reserve/searchByOrder.js

@@ -11,14 +11,19 @@ function searchByOrder(params) {
             page: params.page,
             project: { id: { $eq: params.project.id } },
             orderNumber: { $eq: params.orderNumber },
-            acceptedOffers: { itemOffered: { typeOf: { $in: [reservationType] } } }
-        }, ['itemOffered']);
+            acceptedOffers: {
+                itemOffered: {
+                // typeOf: { $in: [reservationType] }
+                }
+            }
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;
             }
             else {
-                // 検索条件にreservationTypeを含めているので、ありえないケース
+                // EventReservationしか存在しないので、ありえないケース
                 throw new factory_1.factory.errors.Internal(`unexpected itemOffered.typeOf ${offer.itemOffered.typeOf}`);
             }
         });

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -20,7 +20,7 @@ export declare function useReservation(params: {
          */
         id: string;
     };
-    instrument?: Pick<factory.action.consume.use.reservation.ITicketAsInstrument, 'ticketToken'> | factory.action.consume.use.reservation.IInstrument[];
+    instrument: factory.action.consume.use.reservation.IInstrument[];
     location?: {
         identifier?: string;
     };

package/lib/chevre/service/reserve/useReservation.js

@@ -16,7 +16,6 @@ function useReservation(params) {
     return async (repos) => {
         const reservationId = params.object.id;
         let ticketToken;
-        // const ticketToken = params?.instrument?.ticketToken;
         if (Array.isArray(params.instrument)) {
             for (const eachInstrument of params.instrument) {
                 if (eachInstrument.typeOf === 'Ticket' && typeof eachInstrument.ticketToken === 'string') {
@@ -24,9 +23,8 @@ function useReservation(params) {
                     break;
                 }
             }
-        }
-        else {
-            ticketToken = params?.instrument?.ticketToken;
+            // } else {
+            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -34,36 +32,34 @@ function useReservation(params) {
         // 予約検索
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
-            inclusion: ['issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: [
+                // 'issuedThrough',
+                // 'reservedTicket',
+                'project', 'reservationFor', 'reservationNumber', 'typeOf'
+            ]
         });
-        if (typeof reservation.issuedThrough.id !== 'string') {
-            // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
-            throw new factory_1.factory.errors.Internal('reservation.issuedThrough.id must be string');
-        }
-        const { reservedTicket } = reservation;
-        // optimize(2024-05-07~)
+        // if (typeof reservation.issuedThrough.id !== 'string') {
+        //     // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
+        //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
+        // }
+        // const { reservedTicket } = reservation;
+        // optimize(2026-05-06~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,
             typeOf: reservation.typeOf,
-            issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            reservedTicket: {
-                typeOf: reservedTicket.typeOf,
-                // discontinue ticketType(2026-03-25~)
-                // ticketType: {
-                //     identifier: reservedTicket.ticketType.identifier,
-                //     typeOf: reservedTicket.ticketType.typeOf,
-                //     ...(typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined
-                // },
-                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
-            }
+            // discontinue issuedThrough,reservedTicket(2026-05-06~)
+            // issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
+            // reservedTicket: {
+            //     typeOf: reservedTicket.typeOf,
+            //     ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+            //     ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
+            // }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
             {
-                // ...(typeof token === 'string') ? { token } : undefined, // discontinue token(2024-10-03~)
                 ...(typeof ticketToken === 'string') ? { ticketToken } : undefined,
                 typeOf: 'Ticket'
             },

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

@@ -61,11 +61,11 @@ function call(params) {
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
             const { agent, object, potentialActions, purpose } = params.data;
             // agent.idからflgMemberを自動セット(2024-12-16~)
             const isMember = memberClients.includes(agent.id);

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

@@ -48,7 +48,7 @@ function call(params) {
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {

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

@@ -54,7 +54,7 @@ function call(params) {
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint,
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
             const { object, instrument } = data;
             await (0, cancelReservation_2.cancelPendingReservation)({
                 object,

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

@@ -25,7 +25,7 @@ function call(params) {
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {

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

@@ -41,7 +41,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await confirmReserveTransaction({
             ...params.data,
             project: params.project,
@@ -137,7 +137,8 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, ['itemOffered', 'offeredThrough']);
+        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        );
         return {
             ...order,
             acceptedOffers

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

@@ -27,9 +27,12 @@ function createAccountingReport(params) {
             orderNumber: data.object.mainEntity.orderNumber,
             project: { id: params.project.id },
             inclusion: [
-                'orderNumber', 'project', 'customer', 'confirmationNumber',
-                'paymentMethods', 'orderedItem', 'price', 'priceCurrency', 'seller', 'broker', 'typeOf', 'orderDate'
-            ] // explicit projection(2024-07-25~)
+                'orderNumber', 'project', 'paymentMethods', 'seller', 'typeOf', 'orderDate'
+                // 'customer', 'confirmationNumber',
+                // 'orderedItem',
+                // 'broker',
+                // 'price', 'priceCurrency',
+            ]
         });
         const simpleOrder = {
             typeOf: order.typeOf,
@@ -37,7 +40,6 @@ function createAccountingReport(params) {
             orderDate: order.orderDate
         };
         const actionObject = {
-            // ...params,
             mainEntity: { orderNumber: simpleOrder.orderNumber },
             typeOf: 'Report'
         };
@@ -51,13 +53,9 @@ function createAccountingReport(params) {
         };
         const action = await repos.action.start(actionAttributes);
         try {
-            const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                orderNumber: { $eq: data.object.mainEntity.orderNumber },
-                project: { id: { $eq: params.project.id } }
-            });
             await (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)({
                 ...order,
-                acceptedOffers
+                // acceptedOffers
             })(repos);
         }
         catch (error) {

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

@@ -57,7 +57,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await EventAggregationService.importFromCOA(params.data)({
             event: new event_1.EventRepo(connection),
             reserveService

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

@@ -64,7 +64,7 @@ function call(params) {
         const masterService = new coa_service_1.COA.service.Master({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
         await EventService.importFromCOA(params.data)({
             action: new action_1.ActionRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),

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

@@ -67,7 +67,7 @@ function call(params) {
         const masterService = new coa_service_1.COA.service.Master({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
         await OfferService.event.importFromCOA({
             project: { id: params.data.project.id },
             theaterCode: params.data.theaterCode,

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

@@ -38,7 +38,7 @@ function call(params) {
             order: new order_1.OrderRepo(connection)
         });
         const paymentServiceId = payActionAttributes.object.at(0)?.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, payByTask_1.payByTask)(

package/lib/chevre/service/task/payment/payByTask.js

@@ -71,13 +71,14 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 acceptedOffers: {
                     itemOffered: {
-                        typeOf: { $in: [factory_1.factory.reservationType.EventReservation] },
+                        // typeOf: { $in: [factory.reservationType.EventReservation] }, // EventReservationしか存在しないので不要(2026-05-12~)
                         // movieTicketsに結合されたイベントID,座席コードで絞る
                         reservationFor: { id: { $in: [reservationForId] } },
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
                     }
                 }
-            }, ['itemOffered', 'priceSpecification']);
+            }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+            );
         }
         return {
             ...orderWithoutAcceptedOffers,

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

@@ -35,7 +35,7 @@ function call(params) {
             data = params;
         }
         const paymentServiceId = data.object.at(0)?.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, refundByTask_1.refundByTask)(data)({

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

@@ -75,7 +75,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await returnReserve({
             ...params.data,
             sameAs: { id: params.id }

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

@@ -60,7 +60,7 @@ function call(params) {
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
             const { agent, object } = params.data;
             if (object.typeOf === factory_1.factory.eventType.ScreeningEventSeries) {
                 await syncEventSeries({

package/lib/chevre/service/task/useReservation.d.ts

@@ -1,6 +1,6 @@
+import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.useReservation.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.useReservation.ITask, IExecutableTaskKeys>): IOperationExecute<void>;

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

@@ -12,25 +12,15 @@ const useReservation_1 = require("../reserve/useReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
-        let instrument;
-        // support array(2025-02-17~)
-        if (Array.isArray(data.instrument)) {
-            instrument = data.instrument;
-        }
-        else {
-            if (data.instrument?.typeOf === 'Ticket') {
-                instrument = [data.instrument];
-            }
-        }
+        const { data, project } = params;
         await (0, useReservation_1.useReservation)({
-            project: data.project,
+            project,
             agent: data.agent,
             object: data.object,
-            instrument,
-            // ...(typeof data.instrument?.typeOf === 'string') ? { instrument: data.instrument } : undefined,
-            ...(typeof data.location?.typeOf === 'string') ? { location: data.location } : undefined
+            instrument: data.instrument,
+            ...(typeof data.location?.identifier === 'string') ? { location: data.location } : undefined
         })({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -39,8 +29,6 @@ function call(data) {
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

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

@@ -24,7 +24,7 @@ function call(data) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         const paymentServiceId = data.object.object.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, voidPaymentByTask_1.voidPaymentByTask)(data)({

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

@@ -50,7 +50,7 @@ function call(params) {
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, voidTransaction_1.voidTransaction)({

package/lib/chevre/service/taskHandler.js

@@ -74,6 +74,7 @@ function executeTask(task, next) {
                 case factory_1.factory.taskName.SendEmailMessage:
                 case factory_1.factory.taskName.SyncResourcesFromCOA:
                 case factory_1.factory.taskName.TriggerWebhook:
+                case factory_1.factory.taskName.UseReservation:
                     callResult = await call(task)(settings, options);
                     break;
                 default:

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateInvoiceReferencesOrder.d.ts

@@ -4,5 +4,5 @@ declare function validateInvoiceReferencesOrder(authorizePaymentActions: IAuthor
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[]): void;
 export { validateInvoiceReferencesOrder };