@chevre/domain 26.0.0-alpha.9 → 26.1.0-alpha.0

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

@@ -78,19 +78,6 @@ function reserveTransaction2action(params) {
     // if (typeof transaction.object.underName?.typeOf === 'string') {
     //     underName = transaction.object.underName;
     // }
-    // const moneyTransferActions: factory.action.transfer.moneyTransfer.IAttributes[] = [];
-    // const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    // pendingReservations.forEach((reservation) => {
-    //     const acceptedOffer4reservation = transaction.object.acceptedOffer?.find(
-    //         (o) => o.itemOffered?.serviceOutput?.id === reservation.id
-    //     );
-    //     moneyTransferActions.push(...createMoneyTransferActions({
-    //         acceptedOffer: acceptedOffer4reservation,
-    //         reservation,
-    //         transaction: params.transaction,
-    //         underName
-    //     }));
-    // });
     const reservationPackage = {
         reservationFor: {
             id: String(reservationFor.id),
@@ -135,12 +122,10 @@ function createReservationUnderName(params) {
         ...((typeof telephone === 'string') && { telephone })
     };
 }
-function reserveIfNotYet(
-// params: factory.action.reserve.IAttributes,
-params, options) {
+function reserveIfNotYet(params, options) {
     return async (repos) => {
         const reservationPackage = params.object;
-        const reserveTransaction = (await repos.assetTransaction.search({
+        const reserveTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -152,23 +137,12 @@ params, options) {
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: actionAttributes.typeOf },
-            object: {
-                typeOf: { $eq: actionAttributes.object.typeOf }
-                // reservationNumber: { $eq: params.object.reservationNumber }
-            },
-            purpose: {
-                id: { $in: [actionAttributes.purpose.id] },
-                typeOf: { $in: [actionAttributes.purpose.typeOf] }
-            }
-        }, ['id']);
-        debug(completedActions.length, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        if (completedActions.length === 0) {
-            const action = await repos.action.start(actionAttributes);
+        const completedAction = await repos.actions.reserve.findCompletedReserveAction({
+            purpose: { id: actionAttributes.purpose.id }
+        });
+        debug(completedAction?.id, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        if (completedAction === null) {
+            const action = await repos.actions.reserve.start(actionAttributes);
             try {
                 let underName;
                 const underNameByTransaction = reserveTransaction.object.underName;
@@ -217,7 +191,7 @@ params, options) {
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    await repos.actions.reserve.giveUp({ typeOf: action.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -225,7 +199,7 @@ params, options) {
                 throw error;
             }
             const actionResult = {};
-            await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            await repos.actions.reserve.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { actionAttributes, reserveTransaction };
     };

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

@@ -42,7 +42,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     // );
                     const taskIdentifier = `${project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
                     onAuthorizationCreatedTask = {
-                        alternateName: taskIdentifier,
+                        // alternateName: taskIdentifier,
                         identifier: taskIdentifier,
                         name: factory_1.factory.taskName.OnAuthorizationCreated,
                         status: factory_1.factory.taskStatus.Ready,

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

@@ -1,5 +1,6 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
+import type { UseActionRepo } from '../../repo/action/use';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
@@ -25,7 +26,10 @@ export declare function useReservation(params: {
         identifier?: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        use: UseActionRepo;
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     order: OrderRepo;

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

@@ -23,8 +23,6 @@ function useReservation(params) {
                     break;
                 }
             }
-            // } else {
-            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -33,29 +31,15 @@ function useReservation(params) {
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
             inclusion: [
-                // 'issuedThrough',
-                // 'reservedTicket',
                 'project', 'reservationFor', 'reservationNumber', 'typeOf'
             ]
         });
-        // 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,
-            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            // 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
-            // }
+            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
@@ -79,7 +63,7 @@ function useReservation(params) {
                 ? { location: { typeOf: factory_1.factory.placeType.Place, identifier: params.location.identifier } }
                 : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.use.startUseAction(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory_1.factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -91,14 +75,14 @@ function useReservation(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.use.giveUpUseAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        await repos.actions.use.completeUseAction({ typeOf: action.typeOf, id: action.id });
         await (0, onReservationUsed_1.onReservationUsed)(attendedReservation, {
             ...actionAttributes,
             id: action.id,
@@ -107,12 +91,10 @@ function useReservation(params) {
     };
 }
 function reserveIfNotYet(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         let reserveTransactions = [];
         if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: [params.object.id] } }

package/lib/chevre/service/reserveCOA/cancelReservation.d.ts

@@ -1,12 +1,14 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../factory';
-import { ActionRepo } from '../../repo/action';
+import { CancelActionRepo } from '../../repo/action/cancel';
 declare function cancelPendingReservation(params: factory.task.cancelPendingReservation.IPotentialCancelCOAReserveAction & {
     project: {
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     reserveService: COA.service.Reserve;
 }) => Promise<void>;
 export { cancelPendingReservation };

package/lib/chevre/service/reserveCOA/cancelReservation.js

@@ -23,7 +23,7 @@ function cancelPendingReservation(params) {
             processCancelPendingCOAReserveResult: { delTmpReserveArgs },
             project: { id: params.project.id }
         });
-        const action = await repos.action.start(actionAttributes, { recipe });
+        const action = await repos.actions.cancel.start(actionAttributes, { recipe });
         try {
             try {
                 await repos.reserveService.delTmpReserve(delTmpReserveArgs);
@@ -51,7 +51,7 @@ function cancelPendingReservation(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.cancel.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -59,6 +59,6 @@ function cancelPendingReservation(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.actions.cancel.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
     };
 }

package/lib/chevre/service/scheduledTask.d.ts

@@ -1,8 +1,5 @@
 import type { IExecuteSettings as IMinimumExecuteSettings, IRunningTask } from '../eventEmitter/task';
-import type { AggregationSettings } from '../taskSettings';
-interface IExecuteSettings extends IMinimumExecuteSettings {
-    aggregationSettings?: AggregationSettings;
-}
+type IExecuteSettings = IMinimumExecuteSettings;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * Runningの予定タスクを実行する

package/lib/chevre/service/scheduledTask.js

@@ -19,22 +19,15 @@ function executeScheduledTaskById(params) {
         const { id } = params;
         let task = null;
         try {
-            task = await scheduledTaskRepo.findRunningScheduledTaskById({
-                id,
-                // status,
-                // executor: { name: executor.name }
-            });
+            task = await scheduledTaskRepo.findRunningScheduledTaskById({ id });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('scheduledTaskRepo.findRunningScheduledTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {
-                executeById: true,
-                executeByName: false
-            });
+            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {});
         }
     };
 }

package/lib/chevre/service/scheduledTaskHandler/onOperationFailed.js

@@ -13,7 +13,7 @@ function onOperationFailed(params) {
             error = { message: String(error) };
         }
         const endDate = new Date();
-        // remainingNumberOfTries<=0ならAborted(2025-08-04~)
+        // remainingNumberOfTries<=0ならAborted
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
             const result = {
@@ -35,7 +35,6 @@ function onOperationFailed(params) {
         }
         else {
             // 予定タスクは分析連携不要
-            // await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
                 endDate,

package/lib/chevre/service/scheduledTaskHandler.js

@@ -1,14 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeScheduledTask = executeScheduledTask;
-const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./scheduledTaskHandler/onOperationFailed");
-const debug = (0, debug_1.default)('chevre-domain:service:scheduledTaskHandler');
 exports.taskLoader = {
     load: (taskName) => {
         return import(`./task/${taskName}.js`);
@@ -19,18 +14,10 @@ exports.taskLoader = {
  */
 function executeScheduledTask(task) {
     const now = new Date();
-    debug('executing an executableTask...', task, now);
     return async (settings, options) => {
         const scheduledTaskRepo = new (await import('../repo/scheduledTask.js')).ScheduledTaskRepo(settings.connection);
         try {
             // 予定タスクのexpiresはDBのttl基準なので期限検証はしない
-            // if (task.expires instanceof Date) {
-            //     const taskExpired: boolean = moment(now)
-            //         .isAfter(task.expires);
-            //     if (taskExpired) {
-            //         throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
-            //     }
-            // }
             // remainingNumberOfTries<0ならcallを実行しない(2025-08-04~)
             // リトライを繰り返した後、不明の原因でRunningのまま残ってしまったタスクがリトライされたケース
             const { remainingNumberOfTries } = task;

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

@@ -7,9 +7,6 @@ const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
-// import { OrderNumberRepo } from '../../repo/orderNumber';
-// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -19,14 +16,10 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
@@ -57,7 +50,6 @@ 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({
@@ -86,8 +78,6 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -104,9 +94,6 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    // orderInTransaction: new OrderInTransactionRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -116,11 +103,10 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
-                sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } },
-                typeOf: { $eq: factory_1.factory.actionType.AcceptAction }
-            })).shift();
+            const action = (await actionRepo.findActionBySameAs({
+                sameAs: { id: params.id },
+                purpose: { id: params.data.purpose.id }
+            }));
             if (typeof action?.id === 'string') {
                 throwsError = false;
             }

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

@@ -34,19 +34,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         let callResult;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        // const actionRepo = new ActionRepo(connection);
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
@@ -63,8 +57,8 @@ function call(params) {
                 actions: {
                     pay: new pay_1.PayActionRepo(connection),
                     refund: new refund_1.RefundActionRepo(connection),
+                    checkMovieTicket: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 },
-                checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
                 authorizePaymentMethodAction: authorizePaymentMethodActionRepo,
@@ -95,11 +89,10 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await authorizePaymentMethodActionRepo.searchBySameAs({
-                sameAs: { id: { $eq: params.id } },
-                purpose: { id: { $eq: params.data.purpose.id } },
-                typeOf: { $eq: factory_1.factory.actionType.AuthorizeAction }
-            })).shift();
+            const action = (await authorizePaymentMethodActionRepo.findActionBySameAs({
+                sameAs: { id: params.id },
+                purpose: { id: params.data.purpose.id }
+            }));
             if (typeof action?.id === 'string') {
                 throwsError = false;
             }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const cancel_1 = require("../../repo/action/cancel");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
@@ -18,7 +18,6 @@ let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    // useFetch: true
 });
 /**
  * タスク実行関数
@@ -33,7 +32,7 @@ function call(params) {
         // support COAReserve(2025-03-01~)
         if (data.purpose?.typeOf === factory_1.factory.assetTransactionType.Reserve) {
             await (0, cancelReservation_1.cancelPendingReservation)({ purpose: data.purpose })({
-                action: new action_1.ActionRepo(connection),
+                actions: { cancel: new cancel_1.CancelActionRepo(connection) },
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
@@ -63,7 +62,7 @@ function call(params) {
                 instrument,
                 project: { id: params.project.id }
             })({
-                action: new action_1.ActionRepo(connection),
+                actions: { cancel: new cancel_1.CancelActionRepo(connection) },
                 reserveService
             });
         }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const cancel_1 = require("../../repo/action/cancel");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
@@ -20,15 +20,13 @@ function call(params) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         await (0, cancelReservation_1.cancelReservation)(data.actionAttributes)({
-            action: new action_1.ActionRepo(connection),
+            actions: { cancel: new cancel_1.CancelActionRepo(connection) },
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
             stockHolder: new stockHolder_1.StockHolderRepo({ connection })
-        }
-        // settings
-        );
+        });
     };
 }

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

@@ -9,23 +9,17 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
@@ -35,7 +29,9 @@ function call(params) {
                 ...params.data,
                 sameAs: { id: params.id, typeOf: 'Task' }
             })({
-                checkMovieTicketAction: actionRepo,
+                actions: {
+                    checkMovieTicket: actionRepo,
+                },
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
@@ -49,13 +45,12 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
-                sameAs: { id: { $eq: params.id } },
-                typeOf: { $eq: factory_1.factory.actionType.CheckAction },
+            const action = (await actionRepo.findActionBySameAs({
+                sameAs: { id: params.id },
                 ...(typeof params.data.purpose?.id === 'string')
-                    ? { purpose: { id: { $eq: params.data.purpose.id } } }
+                    ? { purpose: { id: params.data.purpose.id } }
                     : undefined
-            })).shift();
+            }));
             if (typeof action?.id === 'string') {
                 throwsError = false;
             }

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

@@ -3,72 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const checkThing_1 = require("../../repo/action/checkThing");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
-const setting_1 = require("../../repo/setting");
-const stockHolder_1 = require("../../repo/stockHolder");
-const task_1 = require("../../repo/task");
-const validateEvent_1 = require("../validation/validateEvent");
 const validateOrder_1 = require("../validation/validateOrder");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }) => {
-        if (redisClient === undefined) {
-            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new checkThing_1.CheckThingActionRepo(connection);
+    return async ({ connection }) => {
         const { data } = params;
-        const actionAttributes = {
-            agent: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            object: data.object,
-            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            typeOf: factory_1.factory.actionType.CheckAction,
-            sameAs: { id: params.id, typeOf: 'Task' } // add sameAs(2025-09-22~)
-        };
-        const action = await actionRepo.start(actionAttributes);
         const objectTypeOf = data.object.typeOf;
-        try {
-            switch (objectTypeOf) {
-                case factory_1.factory.order.OrderType.Order:
-                    await (0, validateOrder_1.validateOrder)({
-                        orderNumber: data.object.orderNumber,
-                        project: { id: params.project.id }
-                    })({
-                        acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-                        assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
-                        order: new order_1.OrderRepo(connection),
-                        setting: new setting_1.SettingRepo(connection),
-                        task: new task_1.TaskRepo(connection)
-                    });
-                    break;
-                // support ScreeningEvent(2025-05-01~)
-                case factory_1.factory.eventType.ScreeningEvent:
-                    await (0, validateEvent_1.validateEvent)({
-                        id: data.object.id,
-                        project: { id: params.project.id }
-                    })({
-                        event: new event_1.EventRepo(connection),
-                        stockHolder: new stockHolder_1.StockHolderRepo({ connection })
-                    });
-                    break;
-                default:
-                    throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
-            }
-        }
-        catch (error) {
-            try {
-                await actionRepo.giveUp({ typeOf: action.typeOf, id: action.id, error });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
+        switch (objectTypeOf) {
+            case factory_1.factory.order.OrderType.Order:
+                await (0, validateOrder_1.validateOrder)({
+                    orderNumber: data.object.orderNumber,
+                    project: { id: params.project.id }
+                })({
+                    acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+                    assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                    order: new order_1.OrderRepo(connection),
+                });
+                break;
+            default:
+                throw new factory_1.factory.errors.NotImplemented(`${objectTypeOf} not implemented`);
         }
-        const actionResult = {}; // eslint-disable-line @typescript-eslint/no-explicit-any
-        await actionRepo.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     };
 }