@chevre/domain 22.11.0-alpha.12 → 22.11.0-alpha.13

package/example/src/regex.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+const projectIdMustBe = /^[0-9a-z-]+$/; // 記号はhyphenのみ許可
+
+let projectId: string;
+
+projectId = 'projectId';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'projectid';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'abcd1234-test';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'a-z';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '0-9';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '---';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '-';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = '&';
+console.log(projectId, ':', projectIdMustBe.test(projectId));
+
+projectId = 'A';
+console.log(projectId, ':', projectIdMustBe.test(projectId));

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

@@ -13,25 +13,34 @@ interface IExecuteSettings {
     redisClient?: RedisClientType;
 }
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id'>) => IOperationExecute<void>;
+type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id' | 'remainingNumberOfTries'>) => IOperationExecute<void>;
 interface IReadyTask {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready;
+    remainingNumberOfTries?: never;
     expires?: Date;
     executionResult?: never;
 }
 interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
+    remainingNumberOfTries?: never;
     name?: never;
     expires?: never;
     executionResult?: never;
 }
+/**
+ * 実行されたタスクイベント
+ */
 interface IExecutedTask {
     id: string;
     status: factory.taskStatus;
     executionResult: factory.task.IExecutionResult;
+    /**
+     * 実行されたタスクの残り試行回数
+     */
+    remainingNumberOfTries: number;
     name?: never;
     expires?: never;
 }

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

@@ -106,6 +106,9 @@ export declare class TaskRepo {
     }): Promise<{
         count: number;
     }>;
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
+     */
     emitRunningIfExists(params: {
         name?: {
             $eq?: factory.taskName;
@@ -121,7 +124,7 @@ export declare class TaskRepo {
             numberOfTried?: factory.sortType;
             runsAt: factory.sortType;
         };
-    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
+    }, next: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     findExecutableOne(params: {
         name?: {
             $eq?: factory.taskName;
@@ -169,6 +172,7 @@ export declare class TaskRepo {
          */
         id: string;
         status: factory.taskStatus;
+        remainingNumberOfTries: number;
     }, executionResult: factory.task.IExecutionResult, next?: INextFunction): Promise<void>;
     /**
      * 特定タスク検索
@@ -213,6 +217,7 @@ export declare class TaskRepo {
         count: number;
     }>;
     getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
+        remainingNumberOfTries: number;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -220,7 +225,6 @@ export declare class TaskRepo {
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
@@ -229,6 +233,7 @@ export declare class TaskRepo {
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
+        remainingNumberOfTries: number;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -236,7 +241,6 @@ export declare class TaskRepo {
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
@@ -247,6 +251,7 @@ export declare class TaskRepo {
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
+        remainingNumberOfTries: number;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -254,7 +259,6 @@ export declare class TaskRepo {
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
@@ -263,6 +267,7 @@ export declare class TaskRepo {
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
+        remainingNumberOfTries: number;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
@@ -270,7 +275,6 @@ export declare class TaskRepo {
         name: factory.taskName;
         status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];

package/lib/chevre/repo/task.js

@@ -552,7 +552,11 @@ class TaskRepo {
             return { count };
         });
     }
-    emitRunningIfExists(params) {
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
+     */
+    emitRunningIfExists(params, next // support next function(2025-08-02~)
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!(params.runsAt.$lt instanceof Date)) {
@@ -591,7 +595,7 @@ class TaskRepo {
             task_1.taskEventEmitter.emitTaskStatusChanged({
                 id: doc.id,
                 status: factory.taskStatus.Running
-            });
+            }, next);
             return doc;
         });
     }
@@ -800,7 +804,7 @@ class TaskRepo {
     // support customr function(2025-05-25~)
     next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { id, status } = params;
+            const { id, status, remainingNumberOfTries } = params;
             yield this.taskModel.updateOne({ _id: { $eq: id } }, {
                 $set: { status },
                 $push: { executionResults: executionResult }
@@ -808,7 +812,8 @@ class TaskRepo {
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                task_1.taskEventEmitter.emitTaskStatusChanged({ id, status, executionResult }, next);
+                const changedTask = { id, status, remainingNumberOfTries, executionResult };
+                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
             }
         });
     }

package/lib/chevre/service/assetTransaction/cancelReservation/start.d.ts

@@ -18,7 +18,7 @@ export declare function validateStartParams(params: IStartParams): (repos: {
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     reserveTransaction: import("@chevre/factory/lib/assetTransaction/reserve").ITransaction | undefined;
-    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "reservationNumber" | "issuedThrough"> & {
+    reservations: (Pick<import("@chevre/factory/lib/reservation/event").IReservation, "id" | "typeOf" | "issuedThrough" | "reservationNumber"> & {
         reservationFor: Pick<factory.reservation.IReservationFor<factory.reservationType.EventReservation>, "id" | "typeOf">;
     })[] | undefined;
 }>;

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.d.ts

@@ -0,0 +1,15 @@
+import { SendGridCredentials } from '../../credentials/sendGrid';
+import type { TaskRepo } from '../../repo/task';
+import { Settings } from '../../settings';
+/**
+ * 中止されたタスクリストをEメールで通知する
+ * add(2025-03-13~)
+ */
+declare function notifyAbortedTasksByEmail(params: {
+    dateAbortedGte: Date;
+}): (repos: {
+    task: TaskRepo;
+}, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
+    sendGrid: SendGridCredentials;
+}) => Promise<void>;
+export { notifyAbortedTasksByEmail };

package/lib/chevre/service/notification/notifyAbortedTasksByEmail.js

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
+const createDebug = require("debug");
+const factory = require("../../factory");
+const factory_1 = require("./factory");
+const notifyByEmail_1 = require("./notifyByEmail");
+const debug = createDebug('chevre-domain:service:notification');
+/**
+ * 中止されたタスクリストをEメールで通知する
+ * add(2025-03-13~)
+ */
+function notifyAbortedTasksByEmail(params) {
+    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+        const { abortedTasksWithoutReport } = settings;
+        const abortedTasks = yield repos.task.projectFields(Object.assign({ status: { $eq: factory.taskStatus.Aborted }, dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
+            ? { name: { $nin: abortedTasksWithoutReport } }
+            : undefined), []);
+        if (abortedTasks.length > 0) {
+            // 開発者へ報告
+            const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
+            const notifyResult = yield (0, notifyByEmail_1.notifyByEmail)({
+                subject: message.subject, content: message.content,
+                logLevel: 'error'
+            })({}, credentials);
+            debug('notifyResult:', notifyResult);
+        }
+    });
+}

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

@@ -1,4 +1,5 @@
+import { notifyAbortedTasksByEmail } from './notification/notifyAbortedTasksByEmail';
 import { notifyByEmail } from './notification/notifyByEmail';
 import { sendEmailMessage } from './notification/sendEmailMessage';
 import { triggerWebhook } from './notification/triggerWebhook';
-export { notifyByEmail, sendEmailMessage, triggerWebhook };
+export { notifyAbortedTasksByEmail, notifyByEmail, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.triggerWebhook = exports.sendEmailMessage = exports.notifyByEmail = void 0;
+exports.triggerWebhook = exports.sendEmailMessage = exports.notifyByEmail = exports.notifyAbortedTasksByEmail = void 0;
+const notifyAbortedTasksByEmail_1 = require("./notification/notifyAbortedTasksByEmail");
+Object.defineProperty(exports, "notifyAbortedTasksByEmail", { enumerable: true, get: function () { return notifyAbortedTasksByEmail_1.notifyAbortedTasksByEmail; } });
 const notifyByEmail_1 = require("./notification/notifyByEmail");
 Object.defineProperty(exports, "notifyByEmail", { enumerable: true, get: function () { return notifyByEmail_1.notifyByEmail; } });
 const sendEmailMessage_1 = require("./notification/sendEmailMessage");

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,3 +1,3 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 import { ActionRepo } from '../../repo/action';
 import { AssetTransactionRepo } from '../../repo/assetTransaction';

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

@@ -1,7 +1,7 @@
 import * as COA from '@motionpicture/coa-service';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import { ActionRepo } from '../../repo/action';
 import { AssetTransactionRepo } from '../../repo/assetTransaction';

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,3 +1,3 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 export declare function call(params: Pick<factory.task.handleNotification.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IOperationExecute } from '../task';
+import type { ICallResult, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IOperationExecute } from '../task';
+import type { ICallResult, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IOperationExecute } from '../task';
+import type { ICallResult, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,3 +1,3 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 export declare function call(params: Pick<factory.task.invalidatePaymentUrl.ITask, IExecutableTaskKeys>): IOperationExecute<void>;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,4 +1,4 @@
-import type { IOperationExecute } from '../task';
+import type { IOperationExecute } from '../taskHandler';
 import * as factory from '../../factory';
 /**
  * タスク実行関数

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */

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

@@ -1,7 +1,6 @@
 import { SendGridCredentials } from '../credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import * as factory from '../factory';
-import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
 import { AggregationSettings } from '../settings/aggregation';
 interface ICredentialSettings {
@@ -12,14 +11,7 @@ interface IExecuteSettings extends IMinimumExecuteSettings {
     settings: Settings;
     aggregationSettings?: AggregationSettings;
 }
-interface IExecuteOptions {
-    executeById: boolean;
-    executeByName: boolean;
-}
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
-type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
-type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
-export type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
 /**
  * タスク変更イベントを受けて実行する
  */
@@ -49,18 +41,4 @@ declare function executeOneIfExists(params: {
         $lt: Date;
     };
 }): IOperation<void>;
-/**
- * タスクを実行する
- */
-declare function execute(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
-/**
- * add(2025-03-13~)
- */
-declare function notifyAbortedTasksByEmail(params: {
-    dateAbortedGte: Date;
-}): (repos: {
-    task: TaskRepo;
-}, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
-    sendGrid: SendGridCredentials;
-}) => Promise<void>;
-export { ICallResult, IExecutableTaskKeys, IOperationExecute, executeById, executeOneIfExists, execute, notifyAbortedTasksByEmail };
+export { executeById, executeOneIfExists };

package/lib/chevre/service/task.js

@@ -11,15 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeById = executeById;
 exports.executeOneIfExists = executeOneIfExists;
-exports.execute = execute;
-exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
 /**
  * タスクサービス
  */
 const createDebug = require("debug");
-const moment = require("moment");
-const factory = require("../factory");
-const factory_1 = require("./notification/factory");
+const taskHandler_1 = require("./taskHandler");
 const debug = createDebug('chevre-domain:service:task');
 /**
  * タスク変更イベントを受けて実行する
@@ -42,7 +38,7 @@ function executeById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            yield execute(task, (typeof next === 'function') ? next : undefined)(settings, {
+            yield (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
                 executeById: true,
                 executeByName: false
             });
@@ -70,113 +66,10 @@ function executeOneIfExists(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            yield execute(task)(settings, {
+            yield (0, taskHandler_1.executeTask)(task)(settings, {
                 executeById: false,
                 executeByName: (typeof ((_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq) === 'string')
             });
         }
     });
 }
-/**
- * タスクを実行する
- */
-function execute(task, next) {
-    const now = new Date();
-    debug('executing an executableTask...', task, now);
-    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
-        const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
-        try {
-            // 期限検証(2024-04-23~)
-            if (task.expires instanceof Date) {
-                const taskExpired = moment(now)
-                    .isAfter(task.expires);
-                if (taskExpired) {
-                    throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
-                }
-            }
-            // タスク名の関数が定義されていなければ、TypeErrorとなる
-            let callResult;
-            const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
-            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.DeletePerson:
-                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.Pay:
-                case factory.taskName.PublishPaymentUrl:
-                case factory.taskName.Refund:
-                case factory.taskName.VoidPayTransaction:
-                case factory.taskName.VoidReserveTransaction:
-                case factory.taskName.ConfirmReserveTransaction:
-                case factory.taskName.ReturnPayTransaction:
-                case factory.taskName.ReturnReserveTransaction:
-                case factory.taskName.SendEmailMessage:
-                case factory.taskName.TriggerWebhook:
-                    callResult = yield call(task)(settings, options);
-                    break;
-                default:
-                    yield call(task.data)(settings);
-            }
-            const result = {
-                executedAt: now,
-                endDate: new Date(),
-                // enable overwriting task.executionResults.error on Executed(2024-05-29~)
-                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
-                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
-            };
-            yield taskRepo.pushExecutionResultById({
-                id: task.id,
-                status: factory.taskStatus.Executed
-            }, result, (typeof next === 'function') ? next : undefined);
-        }
-        catch (error) {
-            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
-            if (typeof error !== 'object') {
-                error = { message: String(error) };
-            }
-            // 実行結果追加
-            const result = {
-                executedAt: now,
-                endDate: new Date(),
-                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
-            };
-            // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            yield taskRepo.pushExecutionResultById({
-                id: task.id,
-                status: task.status
-            }, result, (typeof next === 'function') ? next : undefined);
-        }
-    });
-}
-let notification;
-/**
- * add(2025-03-13~)
- */
-function notifyAbortedTasksByEmail(params) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { abortedTasksWithoutReport } = settings;
-        const abortedTasks = yield repos.task.projectFields(Object.assign({ status: { $eq: factory.taskStatus.Aborted }, dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
-            ? { name: { $nin: abortedTasksWithoutReport } }
-            : undefined), []);
-        if (abortedTasks.length > 0) {
-            if (notification === undefined) {
-                notification = yield Promise.resolve().then(() => require('./notification'));
-            }
-            // 開発者へ報告
-            const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            const notifyResult = yield notification.notifyByEmail({
-                subject: message.subject, content: message.content,
-                logLevel: 'error'
-            })({}, credentials);
-            debug('notifyResult:', notifyResult);
-        }
-    });
-}

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

@@ -0,0 +1,26 @@
+import { SendGridCredentials } from '../credentials/sendGrid';
+import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction } from '../eventEmitter/task';
+import * as factory from '../factory';
+import type { IExecutableTask, IExecutableTaskKeys } from '../repo/task';
+import { Settings } from '../settings';
+import { AggregationSettings } from '../settings/aggregation';
+interface ICredentialSettings {
+    sendGrid: SendGridCredentials;
+}
+interface IExecuteSettings extends IMinimumExecuteSettings {
+    credentials: ICredentialSettings;
+    settings: Settings;
+    aggregationSettings?: AggregationSettings;
+}
+interface IExecuteOptions {
+    executeById: boolean;
+    executeByName: boolean;
+}
+type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
+type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
+type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
+/**
+ * タスクを実行する
+ */
+declare function executeTask(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
+export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeTask };

package/lib/chevre/service/taskHandler.js

@@ -0,0 +1,98 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeTask = executeTask;
+const createDebug = require("debug");
+const moment = require("moment");
+const factory = require("../factory");
+const debug = createDebug('chevre-domain:service:task');
+/**
+ * タスクを実行する
+ */
+// tslint:disable-next-line:max-func-body-length
+function executeTask(task, next) {
+    const now = new Date();
+    debug('executing an executableTask...', task, now);
+    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
+        const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
+        try {
+            // 期限検証(2024-04-23~)
+            if (task.expires instanceof Date) {
+                const taskExpired = moment(now)
+                    .isAfter(task.expires);
+                if (taskExpired) {
+                    throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
+                }
+            }
+            // タスク名の関数が定義されていなければ、TypeErrorとなる
+            let callResult;
+            const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
+            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.DeletePerson:
+                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.Pay:
+                case factory.taskName.PublishPaymentUrl:
+                case factory.taskName.Refund:
+                case factory.taskName.VoidPayTransaction:
+                case factory.taskName.VoidReserveTransaction:
+                case factory.taskName.ConfirmReserveTransaction:
+                case factory.taskName.ReturnPayTransaction:
+                case factory.taskName.ReturnReserveTransaction:
+                case factory.taskName.SendEmailMessage:
+                case factory.taskName.TriggerWebhook:
+                    callResult = yield call(task)(settings, options);
+                    break;
+                default:
+                    yield call(task.data)(settings);
+            }
+            const result = {
+                executedAt: now,
+                endDate: new Date(),
+                // enable overwriting task.executionResults.error on Executed(2024-05-29~)
+                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
+                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
+            };
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: factory.taskStatus.Executed,
+                remainingNumberOfTries: task.remainingNumberOfTries
+            }, result, (typeof next === 'function') ? next : undefined);
+        }
+        catch (error) {
+            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
+            if (typeof error !== 'object') {
+                error = { message: String(error) };
+            }
+            // 実行結果追加
+            const result = {
+                executedAt: now,
+                endDate: new Date(),
+                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
+            };
+            // 失敗してもここではステータスを戻さない(Runningのまま待機)
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: task.status,
+                remainingNumberOfTries: task.remainingNumberOfTries
+            }, result, (typeof next === 'function') ? next : undefined);
+        }
+    });
+}

package/lib/chevre/settings/aggregation.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../factory';
-import type { ICallableTaskOperation, ICallResult, IOperationExecute } from '../service/task';
+import type { ICallableTaskOperation, ICallResult, IOperationExecute } from '../service/taskHandler';
 interface IOnOrderStatusChanged {
     informOrder2hub?: factory.project.IInformParams[];
 }

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.12"
+  "version": "22.11.0-alpha.13"
 }