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

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

@@ -213,14 +213,14 @@ function createRefundPurpose(params, order) {
 }
 function refundTransactionAlreadyExists(params) {
     return async (repos) => {
-        const refundTransactions = await repos.assetTransaction.search({
+        const refundTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
             typeOf: factory_1.factory.assetTransactionType.Refund,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
             object: { paymentMethodId: { $eq: params.object.paymentMethodId } }
-        }, ['_id'], []);
+        }, ['_id']);
         return refundTransactions.length > 0;
     };
 }
@@ -293,8 +293,6 @@ function onRefund(params) {
             const simpleOrder = {
                 typeOf: order.typeOf,
                 orderNumber: order.orderNumber,
-                // price: order.price,
-                // priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
             sendEmailMessageByPotentialActions.forEach((s) => {
@@ -303,7 +301,6 @@ function onRefund(params) {
                     typeOf: factory_1.factory.actionType.SendAction,
                     object: s.object,
                     agent: refundActionAttributes.project,
-                    recipient: { typeOf: order.customer.typeOf, id: order.customer.id },
                     purpose: simpleOrder
                 };
                 const sendEmailMessageTask = {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const action_1 = require("../../repo/action");
+const sendEmailMessage_1 = require("../../repo/action/sendEmailMessage");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
 const integration_1 = require("../../repo/setting/integration");
@@ -15,7 +15,7 @@ function call(params) {
             ...params.data.actionAttributes,
             sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
         })({
-            action: new action_1.ActionRepo(connection),
+            actions: { sendEmailMessage: new sendEmailMessage_1.SendEmailMessageActionRepo(connection) },
             message: new message_1.MessageRepo(connection),
             project: new project_1.ProjectRepo(connection),
             integrationSetting: new integration_1.IntegrationSettingRepo({ connection })

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

@@ -3,20 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const sendOrder_1 = require("../../repo/action/sendOrder");
 const order_1 = require("../../repo/order");
-const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const placeOrder_1 = require("../../repo/transaction/placeOrder");
-const sendOrder_1 = require("../order/sendOrder");
+const sendOrder_2 = require("../order/sendOrder");
 /**
  * タスク実行関数
  */
 function call(params) {
     return async ({ connection }) => {
         const { data } = params;
-        await (0, sendOrder_1.sendOrder)({
+        await (0, sendOrder_2.sendOrder)({
             ...data,
             object: {
                 ...data.object,
@@ -30,12 +28,10 @@ function call(params) {
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            actions: { sendOrder: new sendOrder_1.SendOrderActionRepo(connection) },
             order: new order_1.OrderRepo(connection),
-            ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         });
     };
 }

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

@@ -7,7 +7,7 @@ exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const update_1 = require("../../repo/action/update");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
 const credentials_1 = require("../../repo/credentials");
@@ -24,14 +24,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,21 +53,22 @@ function call(params) {
                 ...(credentialsRepo !== undefined) ? { credentialsRepo } : undefined
             });
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const updateActionRepo = new update_1.UpdateActionRepo(connection);
         try {
             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 });
-            const { agent, object } = params.data;
+            const { object } = params.data;
             if (object.typeOf === factory_1.factory.eventType.ScreeningEventSeries) {
                 await syncEventSeries({
                     project: { id: params.project.id },
-                    agent,
                     object,
                     sameAs: { id: params.id }
                 })({
-                    action: actionRepo,
+                    actions: {
+                        update: updateActionRepo
+                    },
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
                     eventSeries: new eventSeries_1.EventSeriesRepo(connection),
@@ -82,11 +79,12 @@ function call(params) {
             else if (object.typeOf === factory_1.factory.eventType.ScreeningEvent) {
                 await syncEvents({
                     project: { id: params.project.id },
-                    agent,
                     object,
                     sameAs: { id: params.id }
                 })({
-                    action: actionRepo,
+                    actions: {
+                        update: updateActionRepo
+                    },
                     categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
                     creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
                     event: new event_1.EventRepo(connection),
@@ -100,7 +98,7 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
+            const action = (await updateActionRepo.findUpdateActionsBySameAs({
                 sameAs: { id: { $eq: params.id } },
                 typeOf: { $eq: factory_1.factory.actionType.ReplaceAction }
             })).shift();
@@ -119,21 +117,26 @@ function call(params) {
 function syncEventSeries(params) {
     return async (repos) => {
         const { locationBranchCode, titleBranchNum, titleCode } = params.object;
+        const instrument = {
+            theaterCode: params.object.locationBranchCode,
+            typeOf: 'WebAPI',
+            identifier: factory_1.factory.service.webAPI.Identifier.COA
+        };
         const actionAttributes = {
             project: { typeOf: factory_1.factory.organizationType.Project, id: params.project.id },
             typeOf: factory_1.factory.actionType.ReplaceAction,
-            agent: params.agent,
+            agent: { typeOf: factory_1.factory.organizationType.Project, id: params.project.id },
             // eslint-disable-next-line no-warning-comments
             // TODO define object
             object: {
                 ...params.object,
                 typeOf: factory_1.factory.eventType.ScreeningEventSeries
             }, // eslint-disable-line @typescript-eslint/no-explicit-any
-            // instrument,
+            instrument,
             targetCollection: { typeOf: factory_1.factory.eventType.ScreeningEventSeries },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.update.startUpdateAction(actionAttributes);
         let saveResult;
         try {
             const movieTheater = (await repos.movieTheater.projectFields({
@@ -169,7 +172,7 @@ function syncEventSeries(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.update.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -182,27 +185,32 @@ function syncEventSeries(params) {
                 typeOf: eventSeries.typeOf
             };
         });
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.update.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result });
     };
 }
 function syncEvents(params) {
     return async (repos) => {
         const { locationBranchCode, titleBranchNum, titleCode, roomCode, startDate } = params.object;
+        const instrument = {
+            theaterCode: params.object.locationBranchCode,
+            typeOf: 'WebAPI',
+            identifier: factory_1.factory.service.webAPI.Identifier.COA
+        };
         const actionAttributes = {
             project: { typeOf: factory_1.factory.organizationType.Project, id: params.project.id },
             typeOf: factory_1.factory.actionType.ReplaceAction,
-            agent: params.agent,
+            agent: { typeOf: factory_1.factory.organizationType.Project, id: params.project.id },
             // eslint-disable-next-line no-warning-comments
             // TODO define object
             object: {
                 ...params.object,
                 typeOf: factory_1.factory.eventType.ScreeningEvent
             }, // eslint-disable-line @typescript-eslint/no-explicit-any
-            // instrument,
+            instrument,
             targetCollection: { typeOf: factory_1.factory.eventType.ScreeningEvent },
             sameAs: { id: params.sameAs.id, typeOf: 'Task' }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.update.startUpdateAction(actionAttributes);
         let saveResult;
         try {
             const movieTheater = (await repos.movieTheater.projectFields({
@@ -284,7 +292,7 @@ function syncEvents(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.update.giveUpUpdateAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -297,6 +305,6 @@ function syncEvents(params) {
                 typeOf: event.typeOf
             };
         });
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.update.completeUpdateAction({ typeOf: action.typeOf, id: action.id, result });
     };
 }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const action_1 = require("../../repo/action");
+const inform_1 = require("../../repo/action/inform");
 const potentialAction_1 = require("../../repo/potentialAction");
 const setting_1 = require("../../repo/setting");
 const notification_1 = require("../notification");
@@ -14,7 +14,9 @@ function call(params) {
             ...params.data,
             project: { id: params.project.id }
         })({
-            action: new action_1.ActionRepo(connection),
+            actions: {
+                inform: new inform_1.InformActionRepo(connection)
+            },
             potentialAction: new potentialAction_1.PotentialActionRepo(connection),
             setting: new setting_1.SettingRepo(connection)
         });

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const action_1 = require("../../repo/action");
+const use_1 = require("../../repo/action/use");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const order_1 = require("../../repo/order");
@@ -23,6 +24,9 @@ function call(params) {
             ...(typeof data.location?.identifier === 'string') ? { location: data.location } : undefined
         })({
             action: new action_1.ActionRepo(connection),
+            actions: {
+                use: new use_1.UseActionRepo(connection)
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(connection),
             order: new order_1.OrderRepo(connection),

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

@@ -16,7 +16,6 @@ const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
@@ -28,16 +27,16 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
  * タスク実行関数
  */
 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');
         }
         const voidByActionId = typeof params.data.id === 'string';
         if (voidByActionId) {
-            // 遅延実行(executeByName)には対応しない
-            if (!options.executeById) {
-                return;
-            }
+            // // 遅延実行(executeByName)には対応しない
+            // if (!options.executeById) {
+            //     return;
+            // }
         }
         if (!coaAuthClientCreated) {
             const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
@@ -53,7 +52,6 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, voidTransaction_1.voidTransaction)({
                 ...params.data,
@@ -71,7 +69,6 @@ function call(params) {
                 setting: new setting_1.SettingRepo(connection),
                 task: new task_1.TaskRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                // transaction: new TransactionRepo(connection),
                 reserveService
             }, settings);
         }

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

@@ -1,5 +1,4 @@
-import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
-import { factory } from '../factory';
+import type { IExecuteSettings as IMinimumExecuteSettings, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import type { AggregationSettings } from '../taskSettings';
 interface IExecuteSettings extends IMinimumExecuteSettings {
     aggregationSettings?: AggregationSettings;
@@ -8,30 +7,12 @@ type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * タスク変更イベントを受けて実行する
  */
-declare function executeById(params: (IReadyTask | IRunningTask) & {
+declare function executeTaskById(params: (Pick<IReadyTask, 'id' | 'status'> | Pick<IRunningTask, 'id' | 'status'>) & {
     executor: {
         /**
          * タスク実行者名称
          */
         name: string;
     };
-}, next?: INextFunction): IOperation<void>;
-declare function executeOneIfExists(params: {
-    name: {
-        $eq: factory.taskName;
-    };
-    executor: {
-        /**
-         * タスク実行者名称
-         */
-        name: string;
-    };
-    runsAt: {
-        $lt: Date;
-    };
-    sort: {
-        numberOfTried?: factory.sortType;
-        runsAt?: factory.sortType;
-    };
 }): IOperation<void>;
-export { executeById, executeOneIfExists };
+export { executeTaskById };

package/lib/chevre/service/task.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeById = executeById;
-exports.executeOneIfExists = executeOneIfExists;
+exports.executeTaskById = executeTaskById;
 /**
  * タスクサービス
  */
@@ -14,57 +13,26 @@ const debug = (0, debug_1.default)('chevre-domain:service:task');
 /**
  * タスク変更イベントを受けて実行する
  */
-function executeById(params, next) {
+function executeTaskById(params) {
     return async (settings) => {
-        const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
-        const { id, status, executor, expires } = params;
+        const taskRunningRepo = new (await import('../repo/taskRunning.js')).TaskRunningRepo(settings.connection);
+        const { id, status, executor } = params;
         let task = null;
         try {
             // support status: Running(2025-03-05~)
-            task = await taskRepo.executeOneById({
+            task = await taskRunningRepo.executeOneById({
                 id,
                 status,
-                executor: { name: executor.name },
-                ...(expires instanceof Date) ? { expires } : undefined
+                executor: { name: executor.name }
             });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('service.task.executeTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
-                executeById: true,
-                executeByName: false
-            });
-        }
-    };
-}
-function executeOneIfExists(params) {
-    return async (settings) => {
-        const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
-        // 未実行のタスクを取得
-        let task = null;
-        try {
-            task = await taskRepo.executeOneIfExists({
-                executor: { name: params.executor.name },
-                runsAt: { $lt: params.runsAt.$lt },
-                name: params.name,
-                sort: params.sort
-            });
-            debug('executable task found.', task, params.runsAt.$lt);
-        }
-        catch (error) {
-            /* istanbul ignore next */
-            debug('executeOne error:', error);
-        }
-        // タスクがなければ終了
-        if (task !== null) {
-            await (0, taskHandler_1.executeTask)(task)(settings, {
-                executeById: false,
-                executeByName: (typeof params.name?.$eq === 'string')
-            });
+            await (0, taskHandler_1.executeTask)(task)(settings, {});
         }
     };
 }

package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.js

@@ -46,7 +46,6 @@ function createInformTasks(params) {
                             const informActionAttributes = {
                                 object: task4inform,
                                 recipient: {
-                                    id: '',
                                     name: String(informTaskParams.recipient?.name),
                                     typeOf: factory_1.factory.creativeWorkType.WebApplication
                                 },

package/lib/chevre/service/taskHandler/onOperationFailed.d.ts

@@ -1,7 +1,7 @@
-import type { INextFunction } from '../../eventEmitter/task';
 import { factory } from '../../factory';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
+import type { TaskRunningRepo } from '../../repo/taskRunning';
 import type { IExecutableTask } from '../../taskSettings';
 /**
  * タスク実行失敗時処理
@@ -10,9 +10,10 @@ declare function onOperationFailed(params: {
     task: IExecutableTask<factory.taskName>;
     now: Date;
     error: any;
-    next?: INextFunction;
+    next?: never;
 }): (repos: {
     setting: SettingRepo;
     task: TaskRepo;
+    taskRunning: TaskRunningRepo;
 }) => Promise<void>;
 export { onOperationFailed };

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

@@ -9,7 +9,7 @@ const informTaskIfNeeded_1 = require("./onOperationFailed/informTaskIfNeeded");
 function onOperationFailed(params) {
     return async (repos) => {
         let error = params.error;
-        const { task, now, next } = params;
+        const { task, now } = params;
         if (error === null || typeof error !== 'object') {
             error = { message: String(error) };
         }
@@ -18,9 +18,6 @@ function onOperationFailed(params) {
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
             // 実験的に実行中タスク連携をしてみたが、ひとまず廃止(2026-07-01~)
-            // if (USE_INFORM_TASK_RUNNING) {
-            //     await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
-            // }
             const result = {
                 executedAt: now,
                 endDate,
@@ -33,14 +30,10 @@ function onOperationFailed(params) {
                 }
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            await repos.task.setExecutionResultAndStatus({
-                id: task.id,
-                remainingNumberOfTries: task.remainingNumberOfTries,
-                name: task.name
-            }, {
+            await repos.taskRunning.setExecutionResultAndStatus({ id: task.id }, {
                 status: task.status,
                 executionResult: result
-            }, (typeof next === 'function') ? next : undefined);
+            });
         }
         else {
             // 分析連携(2025-08-05~)
@@ -59,14 +52,10 @@ function onOperationFailed(params) {
                     stack: error.stack
                 }
             };
-            await repos.task.setExecutionResultAndStatus({
-                id: task.id,
-                remainingNumberOfTries: task.remainingNumberOfTries,
-                name: task.name
-            }, {
+            await repos.taskRunning.setExecutionResultAndStatus({ id: task.id }, {
                 status: factory_1.factory.taskStatus.Aborted,
                 executionResult: result
-            }, (typeof next === 'function') ? next : undefined);
+            });
         }
     };
 }

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

@@ -1,4 +1,3 @@
-import type { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
 import type { ICallResult, ICallableTaskOperation, IExecutableTask, IExecutableTaskKeys, IOperationExecute } from '../taskSettings';
 export declare const taskLoader: {
@@ -9,5 +8,5 @@ export declare const taskLoader: {
 /**
  * タスクを実行する
  */
-declare function executeTask(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
+declare function executeTask(task: IExecutableTask<factory.taskName>): IOperationExecute<void>;
 export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeTask };

package/lib/chevre/service/taskHandler.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeTask = executeTask;
 const debug_1 = __importDefault(require("debug"));
-const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./taskHandler/onOperationFailed");
 const debug = (0, debug_1.default)('chevre-domain:service:taskHandler');
@@ -18,21 +17,15 @@ exports.taskLoader = {
 /**
  * タスクを実行する
  */
-function executeTask(task, next) {
+function executeTask(task) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
     return async (settings, options) => {
         const settingRepo = new (await import('../repo/setting.js')).SettingRepo(settings.connection);
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
+        const taskRunningRepo = new (await import('../repo/taskRunning.js')).TaskRunningRepo(settings.connection);
         try {
-            // 期限検証(2024-04-23~)
-            if (task.expires instanceof Date) {
-                const taskExpired = (0, moment_1.default)(now)
-                    .isAfter(task.expires);
-                if (taskExpired) {
-                    throw new factory_1.factory.errors.Internal(`task expired [expires:${task.expires}]`);
-                }
-            }
+            // タスクのexpiresは廃止済なので期限検証はなし(2026-08-07~)
             // remainingNumberOfTries<0ならcallを実行しない(2025-08-04~)
             // リトライを繰り返した後、不明の原因でRunningのまま残ってしまったタスクがリトライされたケース
             const { remainingNumberOfTries } = task;
@@ -55,20 +48,15 @@ function executeTask(task, next) {
                     }
                     : ''
             };
-            await taskRepo.setExecutionResultAndStatus({
-                id: task.id,
-                remainingNumberOfTries,
-                name: task.name
-            }, {
+            await taskRunningRepo.setExecutionResultAndStatus({ id: task.id }, {
                 status: factory_1.factory.taskStatus.Executed,
                 executionResult: result
-            }, (typeof next === 'function') ? next : undefined);
+            });
         }
         catch (error) {
             await (0, onOperationFailed_1.onOperationFailed)({
-                task, now, error,
-                ...(typeof next === 'function') ? { next } : undefined
-            })({ setting: settingRepo, task: taskRepo });
+                task, now, error
+            })({ setting: settingRepo, task: taskRepo, taskRunning: taskRunningRepo });
         }
     };
 }

package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.js

@@ -29,10 +29,10 @@ function deletePayTransactionsByPlaceOrder(params) {
                 deletedCount: deleteAssetTransactionsResult?.deletedCount
             };
             // 返金取引も削除(2023-05-19~)
-            const refundTransactions = await repos.assetTransaction.search({
+            const refundTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Refund,
                 object: { paymentMethodId: { $in: payTransactionNumbers } }
-            }, ['transactionNumber'], []);
+            }, ['transactionNumber']);
             if (refundTransactions.length > 0) {
                 const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
                     project: { id: params.transaction.project.id },

package/lib/chevre/service/transaction/deleteTransaction/deleteReservationsByPlaceOrder.js

@@ -40,11 +40,11 @@ function deleteReservationsByPlaceOrder(params) {
                 deletedCount: deleteAssetTransactionsResult?.deletedCount
             };
             // 予約番号で予約取消取引を検索
-            const deletingCancelReservationTransactions = await repos.assetTransaction.search({
+            const deletingCancelReservationTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 project: { id: { $eq: params.transaction.project.id } },
                 object: { reservationNumber: { $in: reserveTransactionNumbers } },
                 typeOf: factory_1.factory.assetTransactionType.CancelReservation
-            }, ['transactionNumber'], []);
+            }, ['transactionNumber']);
             if (deletingCancelReservationTransactions.length > 0) {
                 // 予約取消取引も削除(2024-04-18~)
                 const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({