@chevre/domain 24.1.0-alpha.27 → 24.1.0-alpha.29

package/lib/chevre/repo/acceptedOffer.d.ts

@@ -19,7 +19,6 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
      * オファー展開の注文検索
      */
     searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
-        useMatchBeforeUnwind: boolean;
         useReserveTransaction: boolean;
     }): Promise<(factory.order.IOrder & {
         acceptedOffers: [IAcceptedOffer];

package/lib/chevre/repo/acceptedOffer.js

@@ -1,16 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcceptedOfferRepo = void 0;
-const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 const order_2 = require("./order");
 const settings_1 = require("../settings");
-const debug = (0, debug_1.default)('chevre-domain:repo:acceptedOffer');
+// const debug = createDebug('chevre-domain:repo:acceptedOffer');
 /**
  * 注文オファーリポジトリ
  */
@@ -24,16 +20,13 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
      * オファー展開の注文検索
      */
     async searchWithUnwoundAcceptedOffers(params, projection, options) {
-        const { useMatchBeforeUnwind } = options;
         const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
         const aggregate = this.orderModel.aggregate();
-        if (useMatchBeforeUnwind) {
-            // unwind->matchでは遅い？
-            // match->unwind->matchにする(2026-05-08~)
-            conditions.forEach((c) => {
-                aggregate.match(c);
-            });
-        }
+        // unwind->matchでは遅い
+        // match->unwind->matchにする(2026-05-08~)
+        conditions.forEach((c) => {
+            aggregate.match(c);
+        });
         // pipelineの順序に注意
         // @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
         /* istanbul ignore else */
@@ -64,32 +57,33 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
             && offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
         if (useReserveTransaction) {
             const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
-            debug('searchWithUnwoundAcceptedOffers:', reservationNumbers.length, 'reservationNumbers found.');
-            let subReservations = [];
+            let acceptedOffersByReserveTransaction = [];
             if (reservationNumbers.length > 0) {
-                subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
+                acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
             }
             return orders.map((order) => {
                 const acceptedOffer = order.acceptedOffers[0];
-                const subReservation = subReservations.find(((reservation) => reservation.id === acceptedOffer.itemOffered.id));
+                const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));
                 // 予約は必ず存在するはず
-                if (subReservation === undefined) {
-                    console.error('searchWithUnwoundAcceptedOffers: subReservation: undefined!!!', acceptedOffer.itemOffered.id);
+                if (acceptedOfferByReserveTransaction === undefined) {
+                    console.error('repo:acceptedOffer: searchWithUnwoundAcceptedOffers: acceptedOfferByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
                 }
-                const priceSpecByReserveTransaction = subReservation?.price;
+                const priceSpecByReserveTransaction = acceptedOfferByReserveTransaction?.priceSpecification;
                 // 予約の価格は必ず存在するはず
                 if (priceSpecByReserveTransaction === undefined) {
-                    console.error('searchWithUnwoundAcceptedOffers: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+                    console.error('repo:acceptedOffer: searchWithUnwoundAcceptedOffers: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
                 }
-                const { priceSpecification, ...acceptedOfferWithoutPrice } = acceptedOffer;
+                const { priceSpecification: _originalPriceSpec, // 注文ドキュメントのpriceSpecificationはもう採用しない(2026-05-21~)
+                ...acceptedOfferWithoutPrice } = acceptedOffer;
                 return {
                     ...order,
                     acceptedOffers: [
                         {
                             ...acceptedOfferWithoutPrice,
-                            ...(priceSpecByReserveTransaction !== undefined)
-                                ? { priceSpecification: priceSpecByReserveTransaction } // 予約取引参照の値で上書き
-                                : { priceSpecification } // 万が一予約取引に存在しなければ注文ドキュメントの値を採用
+                            ...((priceSpecByReserveTransaction !== undefined) && { priceSpecification: priceSpecByReserveTransaction }) // 予約取引参照の値で上書き
+                            // ...(priceSpecByReserveTransaction !== undefined)
+                            //     ? { priceSpecification: priceSpecByReserveTransaction } // 予約取引参照の値で上書き
+                            //     : { priceSpecification } // 万が一予約取引に存在しなければ注文ドキュメントの値を採用
                         }
                     ]
                 };

package/lib/chevre/repo/acceptedOfferInReserve.d.ts

@@ -1,7 +1,7 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { IModel } from './mongoose/schemas/assetTransaction';
-import { IItemOfferedByReserveTransaction } from './factory/acceptedOffer/reserveTransaction2itemOffered';
+import { IAcceptedOfferByReserveTransaction } from './factory/acceptedOffer/reserveTransaction2itemOffered';
 export type IAcceptedOffer = Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
     /**
      * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
@@ -15,14 +15,14 @@ export declare class AcceptedOfferInReserveRepo {
     protected readonly reserveTransactionModel: IModel;
     constructor(connection: Connection);
     /**
-     * 予約番号指定で予約取引からitemOfferedを生成する
+     * 予約番号指定で予約取引から注文オファーを生成する
      */
-    protected findSubReservationsByReservationNumbers(params: {
+    protected findAcceptedOffersByReservationNumbers(params: {
         /**
          * 予約番号リスト
          */
         reservationNumbers: string[];
-    }): Promise<IItemOfferedByReserveTransaction[]>;
+    }): Promise<IAcceptedOfferByReserveTransaction[]>;
     /**
      * 予約取引からオファー詳細情報を付加する
      */

package/lib/chevre/repo/acceptedOfferInReserve.js

@@ -18,9 +18,9 @@ class AcceptedOfferInReserveRepo {
         this.reserveTransactionModel = connection.model(assetTransaction_1.modelName, (0, assetTransaction_1.createSchema)());
     }
     /**
-     * 予約番号指定で予約取引からitemOfferedを生成する
+     * 予約番号指定で予約取引から注文オファーを生成する
      */
-    async findSubReservationsByReservationNumbers(params) {
+    async findAcceptedOffersByReservationNumbers(params) {
         const { reservationNumbers } = params;
         if (!Array.isArray(reservationNumbers) || reservationNumbers.length === 0) {
             throw new factory_1.factory.errors.ArgumentNull('reservationNumbers');
@@ -48,28 +48,29 @@ class AcceptedOfferInReserveRepo {
             return acceptedOffers;
         }
         const reservationNumbers = [...new Set(acceptedOffers.map((acceptedOffer) => String(acceptedOffer.serialNumber)))];
-        debug('addAcceptedOffersDetails:', reservationNumbers.length, 'reservationNumbers found.');
-        let subReservations = [];
+        let acceptedOffersByReserveTransaction = [];
         if (reservationNumbers.length > 0) {
-            subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
+            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
         }
         return acceptedOffers.map((acceptedOffer) => {
-            const subReservation = subReservations.find(((reservation) => reservation.id === acceptedOffer.itemOffered.id));
+            const acceptedOfferByReserveTransaction = acceptedOffersByReserveTransaction.find(((offer) => offer.itemOffered.id === acceptedOffer.itemOffered.id));
             // 予約は必ず存在するはず
-            if (subReservation === undefined) {
-                console.error('addAcceptedOffersDetails: subReservation: undefined!!!', acceptedOffer.itemOffered.id);
+            if (acceptedOfferByReserveTransaction === undefined) {
+                console.error('repo:acceptedOffer: addAcceptedOffersDetails: acceptedOfferByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
             }
-            const priceSpecByReserveTransaction = subReservation?.price;
+            const priceSpecByReserveTransaction = acceptedOfferByReserveTransaction?.priceSpecification;
             // 予約の価格は必ず存在するはず
             if (priceSpecByReserveTransaction === undefined) {
-                console.error('addAcceptedOffersDetails: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
+                console.error('repo:acceptedOffer: addAcceptedOffersDetails: priceSpecByReserveTransaction: undefined!!!', acceptedOffer.itemOffered.id);
             }
-            const { priceSpecification, ...acceptedOfferWithoutPrice } = acceptedOffer;
+            const { priceSpecification: _originalPriceSpec, // 注文ドキュメントのpriceSpecificationはもう採用しない(2026-05-21~)
+            ...acceptedOfferWithoutPrice } = acceptedOffer;
             return {
                 ...acceptedOfferWithoutPrice,
-                ...(priceSpecByReserveTransaction !== undefined)
-                    ? { priceSpecification: priceSpecByReserveTransaction } // 予約取引参照の値で上書き
-                    : { priceSpecification } // 万が一予約取引に存在しなければ注文ドキュメントの値を採用
+                ...((priceSpecByReserveTransaction !== undefined) && { priceSpecification: priceSpecByReserveTransaction }) // 予約取引参照の値で上書き
+                // ...(priceSpecByReserveTransaction !== undefined)
+                //     ? { priceSpecification: priceSpecByReserveTransaction } // 予約取引参照の値で上書き
+                //     : { priceSpecification } // 万が一予約取引に存在しなければ注文ドキュメントの値を採用
             };
         });
     }

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.d.ts

@@ -1,9 +1,7 @@
 import { factory } from '../../../factory';
-type IItemOfferedByReserveTransaction = factory.order.IEventReservation & {
-    price?: factory.assetTransaction.reserve.IPrice;
-};
+type IAcceptedOfferByReserveTransaction = Pick<factory.order.IOptimizedAcceptedOffer, 'itemOffered' | 'priceSpecification'>;
 /**
  * 予約取引を注文のitemOfferedへ変換する
  */
-declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'>): IItemOfferedByReserveTransaction[];
-export { IItemOfferedByReserveTransaction, reserveTransaction2itemOffered };
+declare function reserveTransaction2itemOffered(params: Pick<factory.assetTransaction.reserve.ITransaction, 'object'>): IAcceptedOfferByReserveTransaction[];
+export { IAcceptedOfferByReserveTransaction, reserveTransaction2itemOffered };

package/lib/chevre/repo/factory/acceptedOffer/reserveTransaction2itemOffered.js

@@ -65,8 +65,10 @@ function reserveTransaction2itemOffered(params) {
             reservationFor,
             ...((typeof additionalTicketText === 'string') && { additionalTicketText }),
             ...((typeof programMembershipUsed?.identifier === 'string') && { programMembershipUsed }),
-            ...((price !== undefined) && { price })
         };
-        return reservationByReserveTransaction;
+        return {
+            itemOffered: reservationByReserveTransaction,
+            ...((price !== undefined) && { priceSpecification: price })
+        };
     });
 }

package/lib/chevre/repo/order.d.ts

@@ -17,12 +17,6 @@ interface IAggregation {
     maxPrice: number;
     minPrice: number;
 }
-interface IGlobalAggregateOrder {
-    orderCount: number;
-    aggregateProject: {
-        projectCount: number;
-    };
-}
 interface IAggregateOrder {
     aggregation: IAggregation;
 }
@@ -172,81 +166,5 @@ export declare class OrderRepo {
             $lte: Date;
         };
     }): Promise<IAggregateOrder>;
-    aggregateOrderOfSeat(params: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-        orderDate: {
-            $gte: Date;
-            $lte: Date;
-        };
-        acceptedOffers: {
-            itemOffered: {
-                reservationFor: {
-                    location: {
-                        branchCode: string;
-                    };
-                    superEvent: {
-                        location: {
-                            branchCode: string;
-                        };
-                    };
-                };
-                reservedTicket: {
-                    ticketedSeat: {
-                        seatNumber: string;
-                    };
-                };
-            };
-        };
-        customer?: {
-            email?: {
-                $in?: string[];
-            };
-        };
-    }): Promise<{
-        aggregation: Pick<IAggregation, 'orderCount'> & {
-            sumGraceTime?: number;
-            emailCount?: number;
-        };
-    }>;
-    aggregateOrderOfCustomerByProject(params: {
-        project?: {
-            id: {
-                $eq: string;
-            };
-        };
-        orderDate: {
-            $gte: Date;
-            $lte: Date;
-        };
-        customer: {
-            email: {
-                $eq: string;
-            };
-        };
-    }): Promise<{
-        aggregation: Pick<IAggregation, 'orderCount'> & {
-            sumGraceTime?: number;
-            emailCount?: number;
-        };
-    }>;
-    aggregateOrderOfCustomerGlobally(params: {
-        orderDate: {
-            $gte: Date;
-            $lte: Date;
-        };
-        customer: {
-            email: {
-                $eq: string;
-            };
-        };
-    }): Promise<{
-        aggregation: IGlobalAggregateOrder & {
-            sumGraceTime?: never;
-        };
-    }>;
 }
 export {};

package/lib/chevre/repo/order.js

@@ -1072,199 +1072,5 @@ class OrderRepo {
         }
         return { aggregation: aggregations[0] };
     }
-    async aggregateOrderOfSeat(params) {
-        const seatNumber = params.acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber;
-        const screenCode = params.acceptedOffers.itemOffered.reservationFor.location.branchCode;
-        const movieTheaterCode = params.acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode;
-        const customerEmailIn = params.customer?.email?.$in;
-        const matchConditions = {
-            orderDate: {
-                $gte: params.orderDate.$gte,
-                $lte: params.orderDate.$lte
-            },
-            typeOf: { $eq: factory_1.factory.order.OrderType.Order },
-            'project.id': { $eq: params.project.id.$eq },
-            'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode': { $exists: true, $eq: movieTheaterCode },
-            'acceptedOffers.itemOffered.reservationFor.location.branchCode': { $exists: true, $eq: screenCode },
-            'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true, $eq: seatNumber },
-            ...(Array.isArray(customerEmailIn))
-                ? { 'customer.email': { $exists: true, $in: customerEmailIn } }
-                : undefined
-        };
-        const aggregations4email = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $group: {
-                    _id: '$customer.email'
-                }
-            },
-            {
-                $count: 'emailCount'
-            }
-        ])
-            .exec();
-        const emailCount = (aggregations4email.length > 0) ? aggregations4email[0].emailCount : 0;
-        const aggregations = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    typeOf: '$typeOf',
-                    graceTime: {
-                        $subtract: [
-                            { $first: '$acceptedOffers.itemOffered.reservationFor.startDate' },
-                            '$orderDate'
-                        ]
-                    }
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    orderCount: { $sum: 1 },
-                    sumGraceTime: { $sum: '$graceTime' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    orderCount: '$orderCount',
-                    sumGraceTime: '$sumGraceTime'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {
-                    orderCount: 0
-                }
-            };
-        }
-        return {
-            aggregation: {
-                ...aggregations[0],
-                emailCount
-            }
-        };
-    }
-    async aggregateOrderOfCustomerByProject(params) {
-        const matchConditions = {
-            orderDate: {
-                $gte: params.orderDate.$gte,
-                $lte: params.orderDate.$lte
-            },
-            typeOf: { $eq: factory_1.factory.order.OrderType.Order },
-            ...(typeof params.project?.id.$eq === 'string') ? { 'project.id': { $eq: params.project.id.$eq } } : undefined,
-            'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-        };
-        const aggregations = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    typeOf: '$typeOf',
-                    graceTime: {
-                        $subtract: [
-                            { $first: '$acceptedOffers.itemOffered.reservationFor.startDate' },
-                            '$orderDate'
-                        ]
-                    }
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    orderCount: { $sum: 1 },
-                    sumGraceTime: { $sum: '$graceTime' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    orderCount: '$orderCount',
-                    sumGraceTime: '$sumGraceTime'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {
-                    orderCount: 0
-                }
-            };
-        }
-        return {
-            aggregation: {
-                ...aggregations[0]
-            }
-        };
-    }
-    async aggregateOrderOfCustomerGlobally(params) {
-        const matchConditions = {
-            orderDate: {
-                $gte: params.orderDate.$gte,
-                $lte: params.orderDate.$lte
-            },
-            typeOf: { $eq: factory_1.factory.order.OrderType.Order },
-            'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-        };
-        const aggregations = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    typeOf: '$typeOf'
-                }
-            },
-            {
-                $group: {
-                    _id: '$typeOf',
-                    orderCount: { $sum: 1 }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    orderCount: '$orderCount'
-                }
-            }
-        ])
-            .exec();
-        if (aggregations.length === 0) {
-            return {
-                aggregation: {
-                    orderCount: 0,
-                    aggregateProject: { projectCount: 0 }
-                }
-            };
-        }
-        const aggregations2 = await this.orderModel.aggregate([
-            { $match: matchConditions },
-            {
-                $project: {
-                    project: '$project'
-                }
-            },
-            {
-                $group: {
-                    _id: '$project.id'
-                }
-            },
-            {
-                $count: 'projectCount'
-            },
-            {
-                $project: {
-                    aggregateProject: { projectCount: '$projectCount' }
-                }
-            }
-        ])
-            .exec();
-        return {
-            aggregation: {
-                ...aggregations[0],
-                ...aggregations2[0]
-            }
-        };
-    }
 }
 exports.OrderRepo = OrderRepo;

package/lib/chevre/repo/orderInTransaction.js

@@ -35,20 +35,20 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             return doc.acceptedOffers;
         }
         // priceSpecificationを予約取引から補完する(2026-05-12~)
-        let subReservations = [];
+        let acceptedOffersByReserveTransaction = [];
         const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
         if (reservationNumbers.length > 0) {
-            subReservations = await this.findSubReservationsByReservationNumbers({ reservationNumbers });
+            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
         }
         return doc.acceptedOffers.map((acceptedOffer) => {
-            const priceBySubReservation = subReservations.find((subReservation) => subReservation.id === acceptedOffer.itemOffered.id)?.price;
+            const priceSpecification = acceptedOffersByReserveTransaction.find((acceptedOfferByReserveTransaction) => acceptedOfferByReserveTransaction.itemOffered.id === acceptedOffer.itemOffered.id)?.priceSpecification;
             // COA予約でなければ、予約取引の価格は必ず存在するはず(2026-05-20~)
-            if (priceBySubReservation === undefined) {
-                throw new factory_1.factory.errors.Internal(`findAcceptedOffersWithPriceByOrderNumber: priceBySubReservation undefined. ${acceptedOffer.itemOffered.id}`);
+            if (priceSpecification === undefined) {
+                throw new factory_1.factory.errors.Internal(`findAcceptedOffersWithPriceByOrderNumber: priceSpecification undefined. ${acceptedOffer.itemOffered.id}`);
             }
             return {
                 ...acceptedOffer,
-                priceSpecification: priceBySubReservation
+                priceSpecification
             };
         });
     }

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts

@@ -9,7 +9,7 @@ declare function notifyAbortedTasksByEmail(params: {
     dateAbortedGte: Date;
 }): (repos: {
     task: TaskRepo;
-}, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
+}, settings: Settings, credentials: {
     sendGrid: SendGridCredentials;
 }) => Promise<void>;
 export { notifyAbortedTasksByEmail };

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js

@@ -15,7 +15,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:notification');
  */
 function notifyAbortedTasksByEmail(params) {
     return async (repos, settings, credentials) => {
-        const { abortedTasksWithoutReport } = settings;
+        const abortedTasksWithoutReport = await settings.getByKey('abortedTasksWithoutReport');
         const abortedTasks = await repos.task.projectFields({
             status: { $eq: factory_1.factory.taskStatus.Aborted },
             dateAborted: { $gte: params.dateAbortedGte },

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

@@ -48,7 +48,7 @@ function createSendOrderTaskIfNotExist(params) {
         const sendOrderObject = {
             ...simpleOrder,
             acceptedOffers: {
-                limit: settings.deliverOrderLimit,
+                limit: (await settings.getByKey('deliverOrderLimit')),
                 page: 1 // page1から配送
             }
         };

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

@@ -18,7 +18,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return async (repos, settings) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
-        const { numTryConfirmReserveTransaction } = settings;
+        // const { numTryConfirmReserveTransaction } = settings;
+        const numTryConfirmReserveTransaction = await settings.getByKey('numTryConfirmReserveTransaction');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         let creatingCheckResourceTask;

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

@@ -48,9 +48,9 @@ payTransaction, paymentServiceId, options) {
             // タスクによって実行されているかどうか
             const executedByTask = typeof options.executor?.id === 'string' && options.executor.id !== '';
             // 非同期承認時に長時間対応(2024-05-18~)
-            const timeout = (executedByTask && typeof settings.gmo.timeoutBackground === 'number')
-                ? settings.gmo.timeoutBackground
-                : settings.gmo.timeout;
+            const timeout = (executedByTask && typeof (await settings.getByKey('gmo')).timeoutBackground === 'number')
+                ? (await settings.getByKey('gmo')).timeoutBackground
+                : (await settings.getByKey('gmo')).timeout;
             debug('processAuthorizeCreditCard processing... executor:', options.executor?.id, 'timeout:', timeout);
             const creditCardService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)

package/lib/chevre/service/payment/creditCard/payCreditCard.js

@@ -39,7 +39,7 @@ function payCreditCard(params) {
         try {
             const creditService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)
-            }, { timeout: settings.gmo.timeout });
+            }, { timeout: (await settings.getByKey('gmo')).timeout });
             await Promise.all(payObject.map(async (paymentMethod) => {
                 const processAlterTranResult = await processAlterTran({
                     shopId, shopPass, availableChannel, paymentMethod

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -59,7 +59,7 @@ function refundCreditCard(params
         try {
             const creditService = new gmo_service_1.GMO.service.Credit({
                 endpoint: String(availableChannel.serviceUrl)
-            }, { timeout: settings.gmo.timeout });
+            }, { timeout: (await settings.getByKey('gmo')).timeout });
             processAlterTranResult = await processAlterTran({
                 availableChannel,
                 alterTranResultByPayAction,

package/lib/chevre/service/payment/creditCard/searchGMOTrade.js

@@ -11,7 +11,7 @@ const gmoError_1 = require("./gmoError");
 async function searchGMOTrade(params, settings) {
     const creditCardService = new gmo_service_1.GMO.service.Credit({
         endpoint: String(params.availableChannel.serviceUrl)
-    }, { timeout: settings.gmo.timeout });
+    }, { timeout: (await settings.getByKey('gmo')).timeout });
     // 取引状態参照
     let searchTradeResult;
     try {

package/lib/chevre/service/payment/creditCard/voidTransaction.js

@@ -59,7 +59,7 @@ function voidTransaction(params) {
         }
         const creditCardService = new gmo_service_1.GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl)
-        }, { timeout: settings.gmo.timeout });
+        }, { timeout: (await settings.getByKey('gmo')).timeout });
         let searchTradeResult;
         try {
             searchTradeResult = await creditCardService.searchTrade({

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

@@ -12,5 +12,12 @@ declare function createPayObjectServiceOutput(params: {
         purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
     };
 }): factory.invoice.IPaymentServiceOutput | undefined;
-type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>;
+/**
+ * 決済カードの適用された注文オファー
+ */
+type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer, 'priceSpecification'> & {
+    itemOffered: Pick<factory.order.IReservation, 'reservationFor' | 'reservationNumber'> & {
+        reservedTicket: Pick<factory.order.IReservedTicket, 'identifier' | 'ticketedSeat' | 'ticketToken'> | Pick<factory.order.ICOAReservedTicket, 'identifier' | 'ticketedSeat' | 'ticketToken'>;
+    };
+};
 export { createPayObjectServiceOutput, IAcceptedOfferMovieTicketUsed };

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

@@ -131,7 +131,7 @@ function reservationPriceComponent2invoicePriceComponent(component) {
  * 決済カードの対象予約情報を作成する
  */
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType, payTransactionNumber) {
-    // Orderから対象予約を取得
+    // Orderから決済カードの対象予約を取得
     const reservationOffer = order.acceptedOffersMovieTicketUsed.find(({ itemOffered, priceSpecification }) => {
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -53,7 +53,7 @@ function payMovieTicket(params, options) {
                     state: '',
                     credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
                 });
-                const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
+                const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeout });
                 processSeatInfoSyncResult = await (0, processSeatInfoSync_1.processSeatInfoSync)({ seatInfoSyncIn })({ seatService });
             }
             // add recipe(2024-06-03~)

package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.js

@@ -73,7 +73,7 @@ function processPurchaseNumberAuth(params) {
         const authService = new sdk_1.Surfrock.service.auth.AuthService({
             endpoint: String(availableChannel.serviceUrl),
             auth: mvtkReserveAuthClient
-        }, { timeout: settings.movieticketReserve.timeoutCheck });
+        }, { timeout: (await settings.getByKey('movieticketReserve')).timeoutCheck });
         const purchaseNumberAuthResult = await authService.purchaseNumberAuth(purchaseNumberAuthIn);
         return { purchaseNumberAuthIn, purchaseNumberAuthResult };
     };

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -17,7 +17,7 @@ const processSeatInfoSyncCancel_1 = require("./refundMovieTicket/processSeatInfo
 function wait4payActionDelayIfNeeded(params) {
     return async (settings) => {
         const { payAction } = params;
-        const minIntervalBetweenPayAndRefund = settings.movieticketReserve.minIntervalBetweenPayAndRefund;
+        const minIntervalBetweenPayAndRefund = (await settings.getByKey('movieticketReserve')).minIntervalBetweenPayAndRefund;
         let waitingNecessary = false;
         if (typeof minIntervalBetweenPayAndRefund === 'number' && minIntervalBetweenPayAndRefund > 0) {
             if (payAction.actionStatus !== factory_1.factory.actionStatusType.CompletedActionStatus) {
@@ -74,7 +74,7 @@ function refundMovieTicket(params, options) {
             state: '',
             credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
         });
-        const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
+        const seatService = new sdk_1.Surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: (await settings.getByKey('movieticketReserve')).timeout });
         let seatInfoSyncCancelIn;
         let seatInfoSyncIn;
         const useSeatInfoSyncCancel = availableChannel.credentials?.useSeatInfoSyncCancel === true;

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')).timeout });
             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')).timeout });
             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')).timeout });
             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')).timeout });
         await confirmReserveTransaction({
             ...params.data,
             project: params.project,

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')).timeout });
         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')).timeout });
         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')).timeout });
         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/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')).timeout });
         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')).timeout });
             const { agent, object } = params.data;
             if (object.typeOf === factory_1.factory.eventType.ScreeningEventSeries) {
                 await syncEventSeries({

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')).timeout });
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, voidTransaction_1.voidTransaction)({

package/lib/chevre/settings.d.ts

@@ -1,3 +1,4 @@
+import type { Connection } from 'mongoose';
 interface ISurfrockSettings {
     /**
      * 着券時タイムアウト
@@ -31,26 +32,19 @@ interface IOptions {
     movieticketReserve: ISurfrockSettings;
     useExperimentalFeature: boolean;
 }
+interface IDBOptions {
+    connection: Connection;
+}
 /**
  * domain settings
  */
 declare class Settings {
-    readonly abortedTasksWithoutReport: string[];
-    readonly numTryConfirmReserveTransaction: number;
-    readonly deliverOrderLimit: number;
-    readonly coa: {
-        timeout: number;
-    };
-    readonly gmo: {
-        timeout: number;
-        timeoutBackground: number;
-    };
-    readonly movieticketReserve: ISurfrockSettings;
-    readonly useExperimentalFeature: boolean;
+    private readonly options;
+    constructor(options: IOptions & IDBOptions);
     /**
-     * 通知設定
+     * 設定名称から設定を参照する
      */
-    constructor(options: IOptions);
+    getByKey<T extends keyof IOptions>(key: T): Promise<IOptions[T]>;
 }
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;

package/lib/chevre/settings.js

@@ -5,27 +5,58 @@ exports.Settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = ex
  * domain settings
  */
 class Settings {
-    abortedTasksWithoutReport;
-    numTryConfirmReserveTransaction;
-    deliverOrderLimit;
-    coa;
-    gmo;
-    movieticketReserve;
-    useExperimentalFeature;
+    // private readonly settingModel: IModel;
+    options;
+    // private readonly abortedTasksWithoutReport: string[];
+    // private readonly numTryConfirmReserveTransaction: number;
+    // private readonly deliverOrderLimit: number;
+    // private readonly coa: {
+    //     timeout: number;
+    // };
+    // private readonly gmo: {
+    //     timeout: number;
+    //     timeoutBackground: number;
+    // };
+    // private readonly movieticketReserve: ISurfrockSettings;
+    // private readonly useExperimentalFeature: boolean;
+    constructor(options) {
+        const { connection: _connection, // ひとまず使用しない
+        ...restOptions
+        // abortedTasksWithoutReport,
+        // numTryConfirmReserveTransaction,
+        // deliverOrderLimit,
+        // coa,
+        // gmo,
+        // movieticketReserve,
+        // useExperimentalFeature
+         } = options;
+        // this.settingModel = connection.model<IDocType, IModel>(modelName, createSchema());
+        this.options = restOptions;
+        // this.abortedTasksWithoutReport = abortedTasksWithoutReport;
+        // this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
+        // this.deliverOrderLimit = deliverOrderLimit;
+        // this.coa = coa;
+        // this.gmo = gmo;
+        // this.movieticketReserve = movieticketReserve;
+        // this.useExperimentalFeature = useExperimentalFeature;
+    }
     /**
-     * 通知設定
+     * 設定名称から設定を参照する
      */
-    // public readonly notification: IWebhookSettings; // migrate to SettingRepo(2024-12-11~)
-    constructor(options) {
-        const { abortedTasksWithoutReport, numTryConfirmReserveTransaction, deliverOrderLimit, coa, gmo, movieticketReserve, useExperimentalFeature } = options;
-        this.abortedTasksWithoutReport = abortedTasksWithoutReport;
-        this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
-        this.deliverOrderLimit = deliverOrderLimit;
-        this.coa = coa;
-        this.gmo = gmo;
-        this.movieticketReserve = movieticketReserve;
-        this.useExperimentalFeature = useExperimentalFeature;
-        // this.notification = notification;
+    async getByKey(key) {
+        // const projection: Record<string, AnyExpression> = {
+        //     _id: 0,
+        //     [key]: 1
+        //     // id: { $toString: '$_id' },
+        // };
+        // // とりあえず設定コレクションを参照するが、値を使用しない(2026-05-21~)
+        // await this.settingModel.findOne(
+        //     { 'project.id': { $eq: '*' } },
+        //     projection
+        // )
+        //     .lean()
+        //     .exec();
+        return this.options[key];
     }
 }
 exports.Settings = Settings;

package/package.json

@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.1.0-alpha.27"
+  "version": "24.1.0-alpha.29"
 }