@chevre/domain 24.1.0-alpha.32 → 24.1.0-alpha.33

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

@@ -18,8 +18,8 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
-        useReserveTransaction: boolean;
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, _options: {
+        useItemOfferedByReserve?: boolean;
     }): Promise<(factory.order.IOrder & {
         acceptedOffers: [IAcceptedOffer];
         _id?: never;
@@ -67,8 +67,8 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
                 };
             };
         };
-    }, options: {
-        useReserveTransaction: boolean;
+    }, _options: {
+        useItemOfferedByReserve?: boolean;
     }): Promise<IAcceptedOffer[]>;
     /**
      * 注文オファーをsliceして検索する(2024-01-10~)
@@ -83,8 +83,8 @@ export declare class AcceptedOfferRepo extends AcceptedOfferInReserveRepo {
                 $eq: string;
             };
         };
-    }, options: {
-        useReserveTransaction: boolean;
+    }, _options: {
+        useItemOfferedByReserve?: boolean;
     }): Promise<ISearchSlicedAcceptedOffersResult>;
     countByOrderNumber(filter: {
         orderNumber: {

package/lib/chevre/repo/acceptedOffer.js

@@ -19,7 +19,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
     /**
      * オファー展開の注文検索
      */
-    async searchWithUnwoundAcceptedOffers(params, projection, options) {
+    async searchWithUnwoundAcceptedOffers(params, projection, _options) {
         const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
         const aggregate = this.orderModel.aggregate();
         // unwind->matchでは遅い
@@ -53,8 +53,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
             .exec();
         // 予約取引を参照(2026-05-17~)
         const offeredThroughIdentifier = orders.at(0)?.acceptedOffers[0].offeredThrough?.identifier;
-        const useReserveTransaction = options.useReserveTransaction === true
-            && offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
+        const useReserveTransaction = offeredThroughIdentifier !== factory_1.factory.service.webAPI.Identifier.COA; // COAでは予約取引を参照しない
         if (useReserveTransaction) {
             const reservationNumbers = [...new Set(orders.map((order) => String(order.acceptedOffers[0].serialNumber)))];
             let acceptedOffersByReserveTransaction = [];
@@ -125,7 +124,7 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
      */
     async searchAcceptedOffersByOrderNumber(filter, 
     // inclusion?: (keyof IAcceptedOffer)[], // 分かりにくいので廃止(2026-05-17~)
-    options) {
+    _options) {
         /**
          * unwind前に1ドキュメントを特定するためのstage
          */
@@ -220,18 +219,12 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
         // 予約取引を参照(2026-05-18~)
-        const useReserveTransaction = options?.useReserveTransaction === true;
-        if (useReserveTransaction) {
-            return this.addAcceptedOffersDetails(acceptedOffers);
-        }
-        else {
-            return acceptedOffers;
-        }
+        return this.addAcceptedOffersDetails(acceptedOffers);
     }
     /**
      * 注文オファーをsliceして検索する(2024-01-10~)
      */
-    async searchSlicedAcceptedOffersByOrderNumber(filter, options) {
+    async searchSlicedAcceptedOffersByOrderNumber(filter, _options) {
         const aggregate = this.orderModel.aggregate([
             { $match: { orderNumber: { $eq: filter.orderNumber.$eq } } },
             { $match: { 'project.id': { $eq: filter.project.id.$eq } } },
@@ -252,16 +245,10 @@ class AcceptedOfferRepo extends acceptedOfferInReserve_1.AcceptedOfferInReserveR
         }
         const { acceptedOffers, numAcceptedOffers } = result;
         // 予約取引を参照(2026-05-18~)
-        const useReserveTransaction = options?.useReserveTransaction === true;
-        if (useReserveTransaction) {
-            return {
-                acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers),
-                numAcceptedOffers
-            };
-        }
-        else {
-            return result;
-        }
+        return {
+            acceptedOffers: await this.addAcceptedOffersDetails(acceptedOffers),
+            numAcceptedOffers
+        };
     }
     async countByOrderNumber(filter) {
         const aggregate = this.orderModel.aggregate([

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -147,6 +147,14 @@ export interface IServiceOutputIdentifierSetting {
      */
     version: string;
 }
+interface ICOAIntegrationSettings {
+    timeoutReserve: number;
+    timeoutMaster: number;
+}
+interface IGMOIntegrationSettings {
+    timeout: number;
+    timeoutBackground: number;
+}
 interface ISurfrockSettings {
     /**
      * 着券時タイムアウト
@@ -174,14 +182,8 @@ export interface IIntegrationSettings {
     abortedTasksWithoutReport: string[];
     numTryConfirmReserveTransaction: number;
     deliverOrderLimit: number;
-    coa: {
-        timeoutReserve: number;
-        timeoutMaster: number;
-    };
-    gmo: {
-        timeout: number;
-        timeoutBackground: number;
-    };
+    coa: ICOAIntegrationSettings;
+    gmo: IGMOIntegrationSettings;
     movieticketReserve: ISurfrockSettings;
     useExperimentalFeature: boolean;
 }

package/lib/chevre/service/order/deleteOrder.js

@@ -96,7 +96,7 @@ function deleteReservationsByOrder(order) {
             acceptedOffers: {
             // itemOffered: { typeOf: { $in: [factory.reservationType.EventReservation] } }
             }
-        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        }, {} // 予約取引参照(2026-05-18~)
         );
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {

package/lib/chevre/service/order/sendOrder.js

@@ -101,7 +101,7 @@ function sendOrder(params) {
                     $slice: [offerIndexBase, limit],
                     orderNumber: { $eq: order.orderNumber },
                     project: { id: { $eq: order.project.id } }
-                }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+                }, {} // 予約取引参照(2026-05-18~)
                 );
                 acceptedOffers = searchSlicedAcceptedOffersResult.acceptedOffers;
                 debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), // eslint-disable-line @typescript-eslint/no-explicit-any

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

@@ -47,10 +47,11 @@ payTransaction, paymentServiceId, options) {
         try {
             // タスクによって実行されているかどうか
             const executedByTask = typeof options.executor?.id === 'string' && options.executor.id !== '';
+            const gmoIntegrationSettings = await settings.getByKey('gmo');
             // 非同期承認時に長時間対応(2024-05-18~)
-            const timeout = (executedByTask && typeof (await settings.getByKey('gmo')).timeoutBackground === 'number')
-                ? (await settings.getByKey('gmo')).timeoutBackground
-                : (await settings.getByKey('gmo')).timeout;
+            const timeout = (executedByTask && typeof gmoIntegrationSettings.timeoutBackground === 'number')
+                ? gmoIntegrationSettings.timeoutBackground
+                : gmoIntegrationSettings.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/reserve/findByCode.js

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

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

@@ -16,7 +16,7 @@ function searchByOrder(params) {
                 // typeOf: { $in: [reservationType] }
                 }
             }
-        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        }, {} // 予約取引参照(2026-05-18~)
         );
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {

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

@@ -58,14 +58,15 @@ function call(params) {
         const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
+            const coaIntegrationSettings = await settings.getByKey('coa');
             const reserveService = new coa_service_1.COA.service.Reserve({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
+            }, { timeout: coaIntegrationSettings.timeoutReserve });
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
+            }, { timeout: coaIntegrationSettings.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/confirmReserveTransaction.js

@@ -137,7 +137,7 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        }, {} // 予約取引参照(2026-05-18~)
         );
         return {
             ...order,

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

@@ -77,7 +77,7 @@ function fixOrderAsPurpose(params, transaction) {
                         reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
                     }
                 }
-            }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+            }, {} // 予約取引参照(2026-05-18~)
             );
         }
         return {

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -144,7 +144,7 @@ function fixOrders(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        }, {} // 予約取引参照(2026-05-18~)
         );
         return { acceptedOffers, eventIds, offerIds, orders };
     };

package/lib/chevre/service/validation/validateOrder.js

@@ -22,7 +22,7 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { useReserveTransaction: true } // 予約取引参照(2026-05-18~)
+        }, {} // 予約取引参照(2026-05-18~)
         );
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {

package/package.json

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