@chevre/domain 23.2.0-alpha.8 → 23.2.0

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

@@ -1,27 +1,52 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ABORT_REPORT_SUBJECT = void 0;
 exports.task2lineNotify = task2lineNotify;
 exports.tasks2lineNotify = tasks2lineNotify;
 exports.createSendEmailMessageRecipe = createSendEmailMessageRecipe;
-const moment = require("moment");
-const factory = require("../../factory");
+const moment_1 = __importDefault(require("moment"));
+const factory = __importStar(require("../../factory"));
 exports.ABORT_REPORT_SUBJECT = 'tasks aborted';
 function task2lineNotify(params) {
-    var _a;
     const task = params.task;
     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-    let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
+    let lastError = lastExecutionResult?.error;
     if (typeof lastError === 'string') {
         lastError = { message: lastError, name: 'Error' };
     }
-    const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
-    const content = `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}
+    const lastMessage = `${String(lastError?.name)} ${String(lastError?.message)}`;
+    const content = `project:${task.project?.id}
 id:${task.id}
 name:${task.name}
-runsAt:${moment(task.runsAt)
+runsAt:${(0, moment_1.default)(task.runsAt)
         .toISOString()}
-lastTriedAt:${moment(task.lastTriedAt)
+lastTriedAt:${(0, moment_1.default)(task.lastTriedAt)
         .toISOString()}
 numberOfTried:${task.numberOfTried}
 lastMessage:${lastMessage}`;
@@ -35,7 +60,6 @@ function tasks2lineNotify(params) {
     const subject = `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`;
     let content = subject;
     // あまりに通知タスク数が多いケースに対応
-    // tslint:disable-next-line:no-magic-numbers
     if (params.tasks.length > 10) {
         content = params.tasks.map((task) => {
             return `* project:${task.project.id}
@@ -45,16 +69,15 @@ function tasks2lineNotify(params) {
             .join('\n');
     }
     else {
-        // tslint:disable-next-line:no-magic-numbers
         const maxLastMessageLength = (params.tasks.length <= 5) ? 150 : MAX_LAST_MESSAGE_LENGTH; // 通知タスク数に応じてメッセージ長を調整
         content = params.tasks.map((task) => {
             const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-            let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
+            let lastError = lastExecutionResult?.error;
             if (typeof lastError === 'string') {
                 lastError = { message: lastError, name: 'Error' };
             }
-            let lastMessage = String(lastError === null || lastError === void 0 ? void 0 : lastError.name);
-            if (typeof (lastError === null || lastError === void 0 ? void 0 : lastError.message) === 'string' && lastError.message.length > 0) {
+            let lastMessage = String(lastError?.name);
+            if (typeof lastError?.message === 'string' && lastError.message.length > 0) {
                 lastMessage = lastError.message;
             }
             const abbreviatedMessage = (lastMessage.length > maxLastMessageLength)
@@ -63,7 +86,7 @@ function tasks2lineNotify(params) {
             return `* project:${task.project.id}
   ${task.id}
   ${task.name}
-  ${moment(task.runsAt)
+  ${(0, moment_1.default)(task.runsAt)
                 .toISOString()}
   ${abbreviatedMessage}`;
         })
@@ -88,7 +111,11 @@ function createSendEmailMessageRecipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.sendMultiple,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (beforeMedia !== undefined) ? { beforeMedia } : undefined), (afterMedia !== undefined) ? { afterMedia } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(beforeMedia !== undefined) ? { beforeMedia } : undefined,
+                                ...(afterMedia !== undefined) ? { afterMedia } : undefined
+                            }]
                     }
                 ]
             }]

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

@@ -1,38 +1,60 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
-const createDebug = require("debug");
-const factory = require("../../factory");
+const debug_1 = __importDefault(require("debug"));
+const factory = __importStar(require("../../factory"));
 const factory_1 = require("./factory");
 const notifyByEmail_1 = require("./notifyByEmail");
-const debug = createDebug('chevre-domain:service:notification');
+const debug = (0, debug_1.default)('chevre-domain:service:notification');
 /**
  * 中止されたタスクリストをEメールで通知する
  * add(2025-03-13~)
  */
 function notifyAbortedTasksByEmail(params) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings, credentials) => {
         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), []);
+        const abortedTasks = await repos.task.projectFields({
+            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)({
+            const notifyResult = await (0, notifyByEmail_1.notifyByEmail)({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
             })({}, credentials);
             debug('notifyResult:', notifyResult);
         }
-    });
+    };
 }

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

@@ -1,30 +1,41 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyByEmail = notifyByEmail;
 const client_1 = require("@sendgrid/client");
 const http_status_1 = require("http-status");
-const util = require("util");
-const factory = require("../../factory");
+const util = __importStar(require("util"));
+const factory = __importStar(require("../../factory"));
 // type ILineNotifyOperation<T> = (
 //     repos: undefined,
 //     credentials: {
 //         lineNotify: LINENotifyCredentials;
 //     }
 // ) => Promise<T>;
-// tslint:disable-next-line:max-func-body-length
 function notifyByEmail(params) {
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+    return async (__, credentials) => {
         const { logLevel } = params;
         const shortSubject = params.subject;
         const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
@@ -36,10 +47,10 @@ function notifyByEmail(params) {
             if (typeof apiKey !== 'string') {
                 throw new factory.errors.Internal('API Key not found');
             }
-            const senderName = (_b = (_a = credentials.sendGrid.alert) === null || _a === void 0 ? void 0 : _a.sender) === null || _b === void 0 ? void 0 : _b.name;
-            const senderEmail = (_d = (_c = credentials.sendGrid.alert) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
-            const toRecipientEmail = (Array.isArray((_e = credentials.sendGrid.alert) === null || _e === void 0 ? void 0 : _e.toRecipient))
-                ? (_g = (_f = credentials.sendGrid.alert) === null || _f === void 0 ? void 0 : _f.toRecipient.at(0)) === null || _g === void 0 ? void 0 : _g.email
+            const senderName = credentials.sendGrid.alert?.sender?.name;
+            const senderEmail = credentials.sendGrid.alert?.sender?.email;
+            const toRecipientEmail = (Array.isArray(credentials.sendGrid.alert?.toRecipient))
+                ? credentials.sendGrid.alert?.toRecipient.at(0)?.email
                 : undefined;
             if (typeof senderName !== 'string') {
                 throw new factory.errors.Internal('senderName not found');
@@ -62,7 +73,7 @@ function notifyByEmail(params) {
             const sgClient = new client_1.Client();
             sgClient.setApiKey(apiKey);
             // const response = await sgMail.sendMultiple(msg);
-            const response = yield sgClient.request({
+            const response = await sgClient.request({
                 body: {
                     content: [{ type: 'text/plain', value: message }],
                     from: emailMessageFrom,
@@ -89,5 +100,5 @@ function notifyByEmail(params) {
             throw error;
         }
         return { result };
-    });
+    };
 }

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

@@ -1,37 +1,52 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendEmailMessage = sendEmailMessage;
 const client_1 = require("@sendgrid/client");
 // import * as sgMail from '@sendgrid/mail';
 const http_status_1 = require("http-status");
-const util = require("util");
-const factory = require("../../factory");
+const util = __importStar(require("util"));
+const factory = __importStar(require("../../factory"));
 const factory_1 = require("./factory");
 function createSendEmailMessageActionAttributes(params) {
-    var _a;
     const { agent, object, project, purpose, recipient, typeOf } = params;
-    return Object.assign({ agent, object, project, purpose, recipient, typeOf }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
+    return {
+        agent, object, project, purpose, recipient, typeOf,
+        ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+    };
 }
 function createMailData(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const project = yield repos.project.findById({
+    return async (repos, credentials) => {
+        const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['settings']
         });
         let mailData;
         let apiKey = credentials.sendGrid.apiKey;
         // プロジェクト固有のSendGrid設定があれば、そちらを使用
-        if (typeof ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string' && project.settings.sendgridApiKey.length > 0) {
+        if (typeof project.settings?.sendgridApiKey === 'string' && project.settings.sendgridApiKey.length > 0) {
             apiKey = project.settings.sendgridApiKey;
         }
         if (typeof apiKey !== 'string') {
@@ -44,7 +59,7 @@ function createMailData(params) {
         }
         else {
             // メッセージリポジトリに対応(2024-04-29~)
-            emailMessage = yield repos.message.findByIdentifier({
+            emailMessage = await repos.message.findByIdentifier({
                 identifier: params.object.identifier,
                 project: { id: project.id }
             });
@@ -54,7 +69,7 @@ function createMailData(params) {
             email: emailMessage.sender.email
         };
         // プロジェクト設定対応(2023-08-21~)
-        const senderEmailByProjectSettings = (_d = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email;
+        const senderEmailByProjectSettings = project.settings?.sendEmailMessage?.sender?.email;
         if (typeof senderEmailByProjectSettings === 'string' && senderEmailByProjectSettings.length > 0) {
             emailMessageFrom.email = senderEmailByProjectSettings;
         }
@@ -67,23 +82,28 @@ function createMailData(params) {
                 };
             })
             : [];
-        mailData = Object.assign({ to: emailDatas, from: emailMessageFrom, subject }, (String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined);
+        mailData = {
+            to: emailDatas,
+            from: emailMessageFrom,
+            subject,
+            ...(String(emailMessage.text).length > 0) ? { text: String(emailMessage.text) } : undefined
+        };
         return { mailData, emailMessage, apiKey };
-    });
+    };
 }
 /**
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
  */
 function sendEmailMessage(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { mailData, emailMessage, apiKey } = yield createMailData(params)(repos, credentials);
+    return async (repos, credentials) => {
+        const { mailData, emailMessage, apiKey } = await createMailData(params)(repos, credentials);
         // add recipe(2025-03-12~)
         let recipe = (0, factory_1.createSendEmailMessageRecipe)({
             mailData,
             project: { id: params.project.id }
         });
         const startingAction = createSendEmailMessageActionAttributes(params);
-        const action = yield repos.action.start(startingAction, { recipe });
+        const action = await repos.action.start(startingAction, { recipe });
         let result = {};
         try {
             mailData.customArgs = {
@@ -95,7 +115,7 @@ function sendEmailMessage(params) {
             // const response = await sgMail.sendMultiple(mailData);
             const sgClient = new client_1.Client();
             sgClient.setApiKey(apiKey);
-            const response = yield sgClient.request({
+            const response = await sgClient.request({
                 body: {
                     content: [{ type: 'text/plain', value: mailData.text }],
                     from: mailData.from,
@@ -124,13 +144,13 @@ function sendEmailMessage(params) {
                     mailData,
                     project: { id: params.project.id }
                 });
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result, recipe });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result, recipe });
+    };
 }