@chevre/domain 26.0.0-alpha.2 → 26.0.0-alpha.21

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

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 !== ''

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 !== ''

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

@@ -247,7 +247,9 @@ function onConfirmed(params, options) {
                 },
                 useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
             };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
             const onAssetTransactionStatusChangedTask = {
+                identifier: taskIdentifier,
                 project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
                 status: factory_1.factory.taskStatus.Ready,
@@ -257,7 +259,7 @@ function onConfirmed(params, options) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+            await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
         }
     };
 }

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

@@ -60,7 +60,10 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
-        await EventAggregationService.importFromCOA(params.data)({
+        await EventAggregationService.importFromCOA({
+            ...params.data,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project }
+        })({
             event: new event_1.EventRepo(connection),
             reserveService
         });

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

@@ -67,7 +67,10 @@ function call(params) {
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
         }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
-        await EventService.importFromCOA(params.data)({
+        await EventService.importFromCOA({
+            ...params.data,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project }
+        })({
             action: new action_1.ActionRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),

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

@@ -65,22 +65,22 @@ function call(params) {
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const aggregateOfferRepo = new aggregateOffer_1.AggregateOfferRepo(connection);
         const categoryCodeRepo = new categoryCode_1.CategoryCodeRepo(connection);
-        // const taskRepo = new TaskRepo(connection);
         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 });
         await OfferService.event.importFromCOA({
-            project: { id: params.data.project.id },
+            project: { id: params.project.id },
             theaterCode: params.data.theaterCode,
             paymentMethodType4membershipCoupon
         })({
-            // categoryCode: categoryCodeRepo,
             aggregateOffer: aggregateOfferRepo,
-            // task: taskRepo,
             masterService
         });
-        await OfferService.event.importCategoryCodesFromCOA(params.data)({
+        await OfferService.event.importCategoryCodesFromCOA({
+            ...params.data,
+            project: { id: params.project.id }
+        })({
             categoryCode: categoryCodeRepo,
             masterService
         });

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

@@ -10,10 +10,8 @@ const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
-// import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-// import { ProjectRepo } from '../../repo/project';
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
@@ -24,26 +22,19 @@ 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;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            const { savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
+            const { savePaymentMethodIdInTransaction: _savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
             await (0, any_1.publishPaymentUrl)({
                 ...publishPaymentUrlParams,
                 project: { id: params.project.id },
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id }
-            }, {
-                savePaymentMethodIdInTransaction: savePaymentMethodIdInTransaction === true
             })({
                 acceptPayAction: actionRepo,
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
@@ -53,11 +44,9 @@ function call(params) {
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
                 orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
-                // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
-                // project: new ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })

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

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

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.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;
@@ -44,40 +37,6 @@ function executeTask(task, next) {
             const { call } = await exports.taskLoader.load(task.name); // testが書きづらいのでtaskLoader経由で呼ぶ
             const callResult = await call(task)(settings, options);
             // ICallableTaskOperationSimpleを廃止(2026-07-22~)
-            // let callResult: ICallResult | undefined;
-            // switch (task.name) {
-            //     case factory.taskName.AcceptCOAOffer:
-            //     case factory.taskName.AggregateOnSystem:
-            //     case factory.taskName.AuthorizePayment:
-            //     case factory.taskName.CancelPendingReservation:
-            //     case factory.taskName.CheckMovieTicket:
-            //     case factory.taskName.CheckResource:
-            //     case factory.taskName.CreateAccountingReport:
-            //     case factory.taskName.HandleNotification:
-            //     case factory.taskName.ImportEventCapacitiesFromCOA:
-            //     case factory.taskName.ImportEventsFromCOA:
-            //     case factory.taskName.ImportOffersFromCOA:
-            //     case factory.taskName.InvalidatePaymentUrl:
-            //     case factory.taskName.OnAuthorizationCreated:
-            //     case factory.taskName.OnResourceDeleted:
-            //     case factory.taskName.Pay:
-            //     case factory.taskName.PublishPaymentUrl:
-            //     case factory.taskName.Refund:
-            //     case factory.taskName.VoidPayTransaction:
-            //     case factory.taskName.VoidReserveTransaction:
-            //     case factory.taskName.ConfirmPayTransaction:
-            //     case factory.taskName.ConfirmReserveTransaction:
-            //     case factory.taskName.ReturnPayTransaction:
-            //     case factory.taskName.ReturnReserveTransaction:
-            //     case factory.taskName.SendEmailMessage:
-            //     case factory.taskName.SyncResourcesFromCOA:
-            //     case factory.taskName.TriggerWebhook:
-            //     case factory.taskName.UseReservation:
-            //         callResult = await (call as ICallableTaskOperation)(task)(settings, options);
-            //         break;
-            //     default:
-            //         await (call as ICallableTaskOperationSimple)(task.data)(settings); // TODO discontinue
-            // }
             const result = {
                 executedAt: now,
                 endDate: new Date(),
@@ -89,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 });
         }
     };
 }