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

package/example/src/chevre/notifyAbortedTasksByEmail.ts

@@ -30,7 +30,7 @@ async function main() {
         ]
     });
 
-    const result = await (await chevre.service.task.createService()).notifyAbortedTasksByEmail({
+    const result = await (await chevre.service.notification.createService()).notifyAbortedTasksByEmail({
         dateAbortedGte: moment()
             // tslint:disable-next-line:no-magic-numbers
             .add(-10, 'days')

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,26 +13,36 @@ 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' | 'name' | 'status' | 'data'>) => 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;
+    status: factory.taskStatus.Executed | factory.taskStatus.Running;
     executionResult: factory.task.IExecutionResult;
-    name?: never;
+    /**
+     * 実行されたタスクの残り試行回数
+     */
+    remainingNumberOfTries: number;
+    name: factory.taskName;
+    data: factory.task.IData<factory.taskName>;
     expires?: never;
 }
 type IChangedTask = IReadyTask | IRunningTask | IExecutedTask;

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

@@ -77,8 +77,8 @@ export declare class SellerRepo {
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
@@ -89,8 +89,8 @@ export declare class SellerRepo {
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     }> & {
         url?: string | undefined;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
@@ -103,8 +103,8 @@ export declare class SellerRepo {
         _id: Types.ObjectId;
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
@@ -115,8 +115,8 @@ export declare class SellerRepo {
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     }> & {
         url?: string | undefined;
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;

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

@@ -23,7 +23,9 @@ interface IOptionOnCreate {
     emitImmediately: boolean;
 }
 export type IExecutableTaskKeys = 'data' | 'id' | 'name' | 'status' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'expires';
-export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys>;
+export type IExecutableTask<T extends factory.taskName> = Pick<factory.task.ITask<T>, IExecutableTaskKeys> & {
+    status: factory.taskStatus.Running;
+};
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 type ICreatingTask = Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status' | 'identifier' | 'description'>;
 /**
@@ -106,6 +108,9 @@ export declare class TaskRepo {
     }): Promise<{
         count: number;
     }>;
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
+     */
     emitRunningIfExists(params: {
         name?: {
             $eq?: factory.taskName;
@@ -121,16 +126,7 @@ export declare class TaskRepo {
             numberOfTried?: factory.sortType;
             runsAt: factory.sortType;
         };
-    }): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
-    findExecutableOne(params: {
-        name?: {
-            $eq?: factory.taskName;
-            $nin?: factory.taskName[];
-        };
-        runsAt: {
-            $lt: Date;
-        };
-    }): Promise<IExecutableTask<factory.taskName> | null>;
+    }, next: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;
     /**
      * emit OnTaskStatusChanged on delayed tasks
      */
@@ -168,11 +164,11 @@ export declare class TaskRepo {
          * タスクID
          */
         id: string;
-        status: factory.taskStatus;
+        status: factory.taskStatus.Executed | factory.taskStatus.Running;
+        remainingNumberOfTries: number;
+        name: factory.taskName;
+        data: factory.task.IData<factory.taskName>;
     }, executionResult: factory.task.IExecutionResult, next?: INextFunction): Promise<void>;
-    /**
-     * 特定タスク検索
-     */
     count(params: factory.task.ISearchConditions): Promise<{
         count: number;
     }>;
@@ -213,69 +209,69 @@ 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;
+        name: factory.taskName;
+        status: factory.taskStatus;
+        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: factory.taskName;
-        status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
+        remainingNumberOfTries: number;
+        name: factory.taskName;
+        status: factory.taskStatus;
+        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: factory.taskName;
-        status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
+        remainingNumberOfTries: number;
+        name: factory.taskName;
+        status: factory.taskStatus;
+        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: factory.taskName;
-        status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
+        remainingNumberOfTries: number;
+        name: factory.taskName;
+        status: factory.taskStatus;
+        data: import("@chevre/factory/lib/task").IData;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        name: factory.taskName;
-        status: factory.taskStatus;
         runsAt: Date;
-        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     } & {

package/lib/chevre/repo/task.js

@@ -242,48 +242,6 @@ class TaskRepo {
             return { id, status };
         });
     }
-    // public async createIfNotExistByIdentifier(
-    //     params: factory.task.IAttributes<factory.taskName> & {
-    //         // resolve uniqueness of identifier(2025-03-27~)
-    //         identifier: string;
-    //     },
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
-    //         throw new factory.errors.ArgumentNull('identifier');
-    //     }
-    //     try {
-    //         const createdTask = await this.taskModel.findOneAndUpdate(
-    //             {
-    //                 'project.id': { $eq: params.project.id },
-    //                 name: { $eq: params.name },
-    //                 identifier: { $exists: true, $eq: params.identifier }
-    //             },
-    //             { $setOnInsert: params },
-    //             { new: true, upsert: true }
-    //         )
-    //             .select({ _id: 1 })
-    //             .exec();
-    //         if (options.emitImmediately) {
-    //             taskEventEmitter.emitTaskStatusChanged({
-    //                 id: createdTask.id,
-    //                 name: params.name,
-    //                 status: factory.taskStatus.Ready
-    //             });
-    //         }
-    //     } catch (error) {
-    //         let throwsError = true;
-    //         if (await isMongoError(error)) {
-    //             // すでにidentifierが存在する場合ok
-    //             if (error.code === MongoErrorCode.DuplicateKey) {
-    //                 throwsError = false;
-    //             }
-    //         }
-    //         if (throwsError) {
-    //             throw error;
-    //         }
-    //     }
-    // }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
@@ -341,40 +299,6 @@ class TaskRepo {
             }
         });
     }
-    // public async createInformTaskIfNotExist(
-    //     // resolve uniqueness of identifier(2025-03-27~)
-    //     params: Pick<
-    //         factory.task.IAttributes<factory.taskName.TriggerWebhook>,
-    //         'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'
-    //     > & {
-    //         data: factory.task.triggerWebhook.IInformAnyResourceAction & {
-    //             object: factory.notification.person.IPersonAsNotification;
-    //         };
-    //     },
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: params.name,
-    //             'data.object.id': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.id)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     /**
      * 取引削除タスク冪等作成
      */
@@ -552,7 +476,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,40 +519,55 @@ class TaskRepo {
             task_1.taskEventEmitter.emitTaskStatusChanged({
                 id: doc.id,
                 status: factory.taskStatus.Running
-            });
-            return doc;
-        });
-    }
-    findExecutableOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!(params.runsAt.$lt instanceof Date)) {
-                throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
-            }
-            const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            const nameNin = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$nin;
-            const query = this.taskModel.findOne(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
-                ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
-                }
-                : undefined), executableTaskProjection)
-                .sort({
-                runsAt: factory.sortType.Ascending
-            });
-            // .hint('executeOneByName');
-            // const explainResult = await query.explain();
-            // console.dir(explainResult, { depth: null });
-            // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            const doc = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
+            }, next);
             return doc;
         });
     }
+    // public async findExecutableOne(params: {
+    //     name?: {
+    //         $eq?: factory.taskName;
+    //         $nin?: factory.taskName[];
+    //     };
+    //     runsAt: {
+    //         $lt: Date;
+    //     };
+    // }): Promise<IExecutableTask<factory.taskName> | null> {
+    //     if (!(params.runsAt.$lt instanceof Date)) {
+    //         throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
+    //     }
+    //     const nameEq = params.name?.$eq;
+    //     const nameNin = params.name?.$nin;
+    //     const query = this.taskModel.findOne(
+    //         {
+    //             status: { $eq: factory.taskStatus.Ready },
+    //             runsAt: { $lt: params.runsAt.$lt },
+    //             ...(typeof nameEq === 'string' || Array.isArray(nameNin))
+    //                 ? {
+    //                     name: {
+    //                         ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
+    //                         ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
+    //                     }
+    //                 }
+    //                 : undefined
+    //         },
+    //         executableTaskProjection
+    //     )
+    //         .sort({
+    //             runsAt: factory.sortType.Ascending
+    //         });
+    //     // .hint('executeOneByName');
+    //     // const explainResult = await query.explain();
+    //     // console.dir(explainResult, { depth: null });
+    //     // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
+    //     const doc = await query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .lean<IExecutableTask<factory.taskName>>()
+    //         .exec();
+    //     if (doc === null) {
+    //         // tslint:disable-next-line:no-null-keyword
+    //         return null;
+    //     }
+    //     return doc;
+    // }
     // discontinue(2025-05-26~)
     /**
      * emit OnTaskStatusChanged on delayed tasks
@@ -800,7 +743,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, name, data } = params;
             yield this.taskModel.updateOne({ _id: { $eq: id } }, {
                 $set: { status },
                 $push: { executionResults: executionResult }
@@ -808,34 +751,11 @@ class TaskRepo {
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                task_1.taskEventEmitter.emitTaskStatusChanged({ id, status, executionResult }, next);
+                const changedTask = { id, name, status, data, remainingNumberOfTries, executionResult };
+                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
             }
         });
     }
-    /**
-     * 特定タスク検索
-     */
-    // public async findById<T extends factory.taskName>(params: {
-    //     name: T;
-    //     id: string;
-    // }): Promise<factory.task.ITask<T>> {
-    //     const doc = await this.taskModel.findOne(
-    //         {
-    //             name: { $eq: params.name },
-    //             _id: { $eq: params.id }
-    //         },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound('Task');
-    //     }
-    //     return doc.toObject();
-    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { limit } = params;

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,5 @@
 import * as factory from '../../factory';
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
-export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+export declare function call(params: Pick<factory.task.aggregateOnSystem.ITask, IExecutableTaskKeys> & {
+    status: factory.taskStatus.Running;
+}): 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';
 /**
  * タスク実行関数