@chevre/domain 25.2.0-alpha.36 → 25.2.0-alpha.39

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

@@ -5,11 +5,9 @@ export interface ILineNotifyMessage {
     subject: string;
     content: string;
 }
-export declare function task2lineNotify(params: {
-    task: factory.task.ITask<factory.taskName>;
-}): ILineNotifyMessage;
 export declare function tasks2lineNotify(params: {
-    tasks: factory.task.ITask<factory.taskName>[];
+    tasks: Pick<factory.task.ITask<factory.taskName>, 'id' | 'executionResults' | 'project' | 'name' | 'runsAt'>[];
+    limit: number;
 }): ILineNotifyMessage;
 export declare function createSendEmailMessageRecipe(params: {
     mailData?: MailData;

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

@@ -4,37 +4,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ABORT_REPORT_SUBJECT = void 0;
-exports.task2lineNotify = task2lineNotify;
 exports.tasks2lineNotify = tasks2lineNotify;
 exports.createSendEmailMessageRecipe = createSendEmailMessageRecipe;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../factory");
 exports.ABORT_REPORT_SUBJECT = 'tasks aborted';
-function task2lineNotify(params) {
-    const task = params.task;
-    const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-    let lastError = lastExecutionResult?.error;
-    if (typeof lastError === 'string') {
-        lastError = { message: lastError, name: 'Error' };
-    }
-    const lastMessage = `${String(lastError?.name)} ${String(lastError?.message)}`;
-    const content = `project:${task.project?.id}
-id:${task.id}
-name:${task.name}
-runsAt:${(0, moment_1.default)(task.runsAt)
-        .toISOString()}
-lastTriedAt:${(0, moment_1.default)(task.lastTriedAt)
-        .toISOString()}
-numberOfTried:${task.numberOfTried}
-lastMessage:${lastMessage}`;
-    return {
-        subject: exports.ABORT_REPORT_SUBJECT,
-        content: content
-    };
-}
+// function task2lineNotify(params: {
+//     task: factory.task.ITask<factory.taskName>;
+// }): ILineNotifyMessage {
+//     const task = params.task;
+//     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
+//     let lastError = lastExecutionResult?.error;
+//     if (typeof lastError === 'string') {
+//         lastError = { message: lastError, name: 'Error' };
+//     }
+//     const lastMessage = `${String(lastError?.name)} ${String(lastError?.message)}`;
+//     const content = `project:${task.project?.id}
+// id:${task.id}
+// name:${task.name}
+// runsAt:${moment(task.runsAt)
+//             .toISOString()}
+// lastTriedAt:${moment((task.lastTriedAt as Date))
+//             .toISOString()}
+// numberOfTried:${task.numberOfTried}
+// lastMessage:${lastMessage}`;
+//     return {
+//         subject: ABORT_REPORT_SUBJECT,
+//         content: content
+//     };
+// }
 const MAX_LAST_MESSAGE_LENGTH = 60;
 function tasks2lineNotify(params) {
-    const subject = `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`;
+    const abortedTasksCount = (params.tasks.length >= params.limit) ? `over ${params.tasks.length}` : params.tasks.length;
+    const subject = `${abortedTasksCount} ${exports.ABORT_REPORT_SUBJECT}`;
     let content;
     // あまりに通知タスク数が多いケースに対応
     if (params.tasks.length > 10) {

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

@@ -1,13 +1,19 @@
 import type { TaskRepo } from '../../repo/task';
 import type { IntegrationSettingRepo } from '../../repo/setting/integration';
+interface INotifyAbortedTasksRepos {
+    task: TaskRepo;
+    integrationSetting: IntegrationSettingRepo;
+}
 /**
  * 中止されたタスクリストをEメールで通知する
  * add(2025-03-13~)
  */
 declare function notifyAbortedTasksByEmail(params: {
     dateAbortedGte: Date;
-}): (repos: {
-    task: TaskRepo;
-    integrationSetting: IntegrationSettingRepo;
-}) => Promise<void>;
-export { notifyAbortedTasksByEmail };
+    dateAbortedLte: Date;
+    /**
+     * 中止タスクがあまりに多いと性能に影響するので、現実的にタスク数を制限する
+     */
+    limit: number;
+}): (repos: INotifyAbortedTasksRepos) => Promise<void>;
+export { notifyAbortedTasksByEmail, INotifyAbortedTasksRepos };

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

@@ -17,16 +17,24 @@ function notifyAbortedTasksByEmail(params) {
     return async (repos) => {
         const abortedTasksWithoutReport = await repos.integrationSetting.getByKey('abortedTasksWithoutReport');
         const abortedTasks = await repos.task.projectFields({
+            limit: params.limit,
+            page: 1,
             status: { $eq: factory_1.factory.taskStatus.Aborted },
-            dateAborted: { $gte: params.dateAbortedGte },
+            dateAborted: {
+                $gte: params.dateAbortedGte,
+                $lte: params.dateAbortedLte,
+            },
             // 中止を報告しないタスク以外にフィルター
             ...(abortedTasksWithoutReport.length > 0)
                 ? { name: { $nin: abortedTasksWithoutReport } }
                 : undefined
-        }, []);
+        }, ['executionResults', 'name', 'project', 'runsAt']);
         if (abortedTasks.length > 0) {
             // 開発者へ報告
-            const message = (0, factory_2.tasks2lineNotify)({ tasks: abortedTasks });
+            const message = (0, factory_2.tasks2lineNotify)({
+                tasks: abortedTasks,
+                limit: params.limit
+            });
             const notifyResult = await (0, notifyByEmail_1.notifyByEmail)({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.0.0-alpha.0",
+    "@chevre/factory": "10.0.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.36"
+  "version": "25.2.0-alpha.39"
 }