@chevre/domain 24.1.0-alpha.4 → 24.1.0-alpha.41

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/onResourceUpdated/onHasPOSUpdated.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformHasPOSTasks = createInformHasPOSTasks;
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 function createInformHasPOSTasks(params) {
     return async (repos
     // settings: Settings

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/invalidatePaymentUrlByTask.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';

package/lib/chevre/service/task/payment/payByTask.d.ts

@@ -14,7 +14,7 @@ import type { ProjectRepo } from '../../../repo/project';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPayTask2payActionAttributesRepos {
     checkMovieTicketAction: CheckMovieTicketActionRepo;
     acceptedOffer: AcceptedOfferRepo;

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

@@ -71,13 +71,16 @@ 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']);
+            }, {
+                useItemOfferedByReserve: true // 2026-05-25~
+            } // 予約取引参照(2026-05-18~)
+            );
         }
         return {
             ...orderWithoutAcceptedOffers,

package/lib/chevre/service/task/payment/refundByTask.d.ts

@@ -11,7 +11,7 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function refundByTask(params: factory.task.refund.IData & {
     sameAs?: {
         id: string;

package/lib/chevre/service/task/payment/voidPaymentByTask.d.ts

@@ -11,7 +11,7 @@ import type { ProjectRepo } from '../../../repo/project';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function voidPaymentByTask(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     actions: {

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/sendEmailMessage.js

@@ -4,19 +4,21 @@ exports.call = call;
 const action_1 = require("../../repo/action");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
+const integration_1 = require("../../repo/setting/integration");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, credentials }) => {
+    return async ({ connection }) => {
         await (0, notification_1.sendEmailMessage)({
             ...params.data.actionAttributes,
             sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
         })({
             action: new action_1.ActionRepo(connection),
             message: new message_1.MessageRepo(connection),
-            project: new project_1.ProjectRepo(connection)
-        }, credentials);
+            project: new project_1.ProjectRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
+        });
     };
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const factory_1 = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
@@ -13,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 {
-            throw new factory_1.factory.errors.NotImplemented('instrument as object discontinued');
-            // 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.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),

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/task.d.ts

@@ -1,14 +1,7 @@
-import { SendGridCredentials } from '../credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import { factory } from '../factory';
-import { Settings } from '../settings';
 import type { AggregationSettings } from '../taskSettings';
-interface ICredentialSettings {
-    sendGrid: SendGridCredentials;
-}
 interface IExecuteSettings extends IMinimumExecuteSettings {
-    credentials: ICredentialSettings;
-    settings: Settings;
     aggregationSettings?: AggregationSettings;
 }
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;

package/lib/chevre/service/task.js

@@ -17,6 +17,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 function executeById(params, next) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         const { id, status, executor, expires } = params;
         let task = null;
         try {
@@ -34,7 +35,10 @@ function executeById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
+            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)({
+                ...settings,
+                settings: integrationSettingRepo
+            }, {
                 executeById: true,
                 executeByName: false
             });
@@ -44,6 +48,7 @@ function executeById(params, next) {
 function executeOneIfExists(params) {
     return async (settings) => {
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         // 未実行のタスクを取得
         let task = null;
         try {
@@ -61,7 +66,10 @@ function executeOneIfExists(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task)(settings, {
+            await (0, taskHandler_1.executeTask)(task)({
+                ...settings,
+                settings: integrationSettingRepo
+            }, {
                 executeById: false,
                 executeByName: (typeof params.name?.$eq === 'string')
             });

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/potentialActions/sendEmailMessage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
 const factory_1 = require("../../../../../factory");
-// import { Settings } from '../../../../../settings';
 async function createSendEmailMessageActions(params, 
 // settings: Settings
 setting) {

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
-// import { Settings } from '../../../../settings';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する

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 };

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

@@ -18,4 +18,4 @@ authorizedMovieTickets: IMovieTicket4validate[],
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[]): void;

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

@@ -5,7 +5,7 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証
@@ -14,7 +14,7 @@ export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: Pick<factory.order.IOrder, 'orderedItem'>;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -8,7 +8,6 @@ const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
@@ -99,7 +98,10 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+            orderNumber,
+            project: { id: transaction.project.id }
+        }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
@@ -288,7 +290,7 @@ function createResult(params, options) {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
-                eventReservationAcceptedOffers.push(acceptedOffer);
+                eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
             // case factory.permit.PermitType.Permit:
             //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = exportTasksById;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./exportTasks/factory");
 /**
  * 取引のタスクを出力します

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -4,7 +4,6 @@ exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
 const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
-// import { Settings } from '../settings';
 // export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
 function fixCustomer(params) {
     return async (repos) => {

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTasks = createTasks;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../../factory");
-// import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-// import { Settings } from '../../../../settings';
 async function createReturnInvoicePotentialActions(params, 
 // settings: Settings
 setting) {

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 async function createPotentialActions(params, 

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

@@ -141,13 +141,13 @@ function fixOrders(params) {
         const eventIds = await repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         }, 'acceptedOffers.itemOffered.reservationFor.id');
-        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
-        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
-        // });
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, {
+            useItemOfferedByReserve: true // 2026-05-25~
+        } // 予約取引参照(2026-05-18~)
+        );
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

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

@@ -10,47 +10,6 @@ const factory_1 = require("../../factory");
 const factory_2 = require("../offer/event/authorize/factory");
 // import { acceptedOffers2amount as acceptedOffers2amount4product } from '../offer/product/factory';
 const validateMovieTicket_1 = require("../transaction/placeOrder/confirm/validation/validateMovieTicket");
-// const debug = createDebug('chevre-domain:service:validation');
-// type ICreatingCheckEventTask = Pick<
-//     factory.task.checkResource.IAttributes,
-//     'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'description'
-// > & {
-//     description: string;
-// };
-// function createCheckEventTasks(params: {
-//     order: Pick<factory.order.IOrder, 'orderNumber' | 'typeOf'>;
-//     project: { id: string };
-//     reservationForIds: string[];
-// }): ICreatingCheckEventTask[] {
-//     const { order, project, reservationForIds } = params;
-//     const runsAt = new Date();
-//     return reservationForIds.map((reservationForId) => {
-//         const object: factory.task.checkResource.IResourceAsEvent = { id: reservationForId, typeOf: factory.eventType.ScreeningEvent };
-//         const data: factory.task.checkResource.IData = {
-//             object,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             typeOf: factory.actionType.CheckAction
-//         };
-//         const description: string = util.format(
-//             '%s:%s:%s:%s',
-//             order.typeOf,
-//             order.orderNumber,
-//             factory.eventType.ScreeningEvent,
-//             reservationForId
-//         );
-//         return {
-//             description,
-//             project: { id: project.id, typeOf: factory.organizationType.Project },
-//             name: factory.taskName.CheckResource,
-//             status: factory.taskStatus.Ready,
-//             runsAt,
-//             remainingNumberOfTries: 3,
-//             numberOfTried: 0,
-//             executionResults: [],
-//             data
-//         };
-//     });
-// }
 function validateOrder(params) {
     return async (repos) => {
         const order = await repos.order.projectFieldsByOrderNumber({
@@ -63,7 +22,10 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        });
+        }, {
+            useItemOfferedByReserve: true // 2026-05-25~
+        } // 予約取引参照(2026-05-18~)
+        );
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({
@@ -101,14 +63,8 @@ function validateOrder(params) {
                     throw new Error(`invalid acceptedOffer.priceSpecification.priceComponent [${typeof priceSpecification.priceComponent}]`);
                 }
             }
-            // 旧メンバーシップ&ペイメントカードを例外として除外(互換性維持対応をしていないため)
-            if ((0, moment_1.default)(order.orderDate)
-                .isAfter((0, moment_1.default)('2023-09-30T15:00:00Z'))
-            // || typeOf !== factory.permit.PermitType.Permit
-            ) {
-                if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
-                    throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
-                }
+            if (typeof serialNumber !== 'string' || serialNumber.length === 0) {
+                throw new Error(`invalid acceptedOffer.serialNumber [${typeof serialNumber}]`);
             }
         });
         let reservationForIds = [];
@@ -176,21 +132,8 @@ function validateOrder(params) {
                 }
                 break;
             }
-            // case factory.permit.PermitType.Permit: {
-            //     numOrderedItemExpected = acceptedOffers.length;
-            //     const permitAcceptedOffers = acceptedOffers as factory.order.IAcceptedOffer<factory.order.IPermit>[];
-            //     priceExpected = acceptedOffers2amount4product({
-            //         acceptedOffers: permitAcceptedOffers
-            //     });
-            //     break;
-            // }
-            // case factory.actionType.MoneyTransfer:
-            //     break;
             default:
-                if ((0, moment_1.default)(order.orderDate)
-                    .isAfter((0, moment_1.default)('2024-02-01T15:00:00Z'))) {
-                    throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
-                }
+                throw new Error(`invalid itemOfferedTypeOf [${itemOfferedTypeOf}]`);
         }
         // orderedItem検証
         if (order.orderedItem.length !== numOrderedItemExpected) {
@@ -225,20 +168,5 @@ function validateOrder(params) {
                 throw new Error(`invalid ticketIdentifiers.length:${reservationReservedTicketIdentifiers.length} [expected:${acceptedOffers.length}]`);
             }
         }
-        // useMongoAsStockHolderProjectsの場合のイベント検証タスク作成を廃止(もう十分検証したので)(2025-07-11~)
-        // add check event task(2025-05-01~)
-        // const setting = <Pick<ISetting, 'useMongoAsStockHolderProjects'> | null>
-        //     await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useMongoAsStockHolderProjects']);
-        // const useMongoAsStockHolderProjects = setting?.useMongoAsStockHolderProjects;
-        // if (Array.isArray(useMongoAsStockHolderProjects) && useMongoAsStockHolderProjects.includes(params.project.id)) {
-        //     const creatingCheckResourceTask = createCheckEventTasks({
-        //         order: { orderNumber: order.orderNumber, typeOf: factory.order.OrderType.Order },
-        //         project: { id: params.project.id },
-        //         reservationForIds
-        //     });
-        //     if (creatingCheckResourceTask.length > 0) {
-        //         await repos.task.saveMany(creatingCheckResourceTask, { emitImmediately: true });
-        //     }
-        // }
     };
 }