@chevre/domain 22.7.0-alpha.5 → 22.7.0-alpha.6

package/example/src/chevre/findSetting.ts

@@ -25,7 +25,7 @@ async function main() {
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const result = await settingRepo.findOne({}, ['quota']);
+    const result = await settingRepo.findOne({}, ['triggerWebhook']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -53,11 +53,13 @@ async function main() {
         const updateResult = await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
-                quota: {
-                    codeExpiresInSecondsDefault: 600,
-                    codeExpiresInSecondsMax: 8035200,
-                    placeOrderExpiresInSecondsMax: 3600,
-                    placeOrderExpiresInSecondsMin: 60
+                triggerWebhook: {
+                    timeout: 15000,
+                    useFetchAPI: true,
+                    secretKey: String(process.env.TRIGGER_WEBHOOK_SECRET_KEY),
+                    headerIdentifier: String(process.env.TRIGGER_WEBHOOK_HEADER_IDENTIFIER),
+                    retryCountMax: 2,
+                    retryIntervalInMS: 1000
                 }
             }
         );

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

@@ -5,7 +5,9 @@ import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
 import type { ProjectRepo } from '../repo/project';
 import type { SettingRepo } from '../repo/setting';
-type ILineNotifyOperation<T> = (repos: {}, credentials: {
+type ILineNotifyOperation<T> = (repos: {
+    setting: SettingRepo;
+}, credentials: {
     lineNotify: LINENotifyCredentials;
 }) => Promise<T>;
 /**
@@ -30,9 +32,6 @@ declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, l
     imageThumbnail?: string;
     imageFullsize?: string;
     logLevel: LineNotifyLogLevel;
-}, options: {
-    timeout: number;
-    useFetchAPI: boolean;
 }): ILineNotifyOperation<void>;
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {

package/lib/chevre/service/notification.js

@@ -122,9 +122,21 @@ function sendEmailMessage(params) {
 }
 exports.sendEmailMessage = sendEmailMessage;
 const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
-function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }, options) {
-    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { timeout, useFetchAPI } = options;
+function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }
+// options: {
+//     timeout: number;
+//     useFetchAPI: boolean;
+// }
+) {
+    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        // const { timeout, useFetchAPI } = options;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
+        const timeout = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
+        const useFetchAPI = ((_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
+        if (typeof timeout !== 'number') {
+            throw new factory.errors.NotFound('setting.triggerWebhook.timeout');
+        }
         const LINE_NOTIFY_URL = credentials.lineNotify.url;
         if (typeof LINE_NOTIFY_URL !== 'string') {
             throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');

package/lib/chevre/service/task.js

@@ -152,13 +152,6 @@ let notification;
  */
 function abort(params) {
     return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        const timeout = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
-        const useFetchAPI = ((_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
-        if (typeof timeout !== 'number') {
-            throw new factory.errors.NotFound('setting.triggerWebhook.timeout');
-        }
         const { abortedTasksWithoutReport } = settings;
         const abortedTask = yield repos.task.abortOne(params);
         // tslint:disable-next-line:no-single-line-block-comment
@@ -179,20 +172,15 @@ function abort(params) {
             yield notification.lineNotify({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            }, { timeout, useFetchAPI })({}, credentials);
+            }
+            // { timeout, useFetchAPI }
+            )(repos, credentials);
         }
     });
 }
 exports.abort = abort;
 function notifyAbortedTasks(params) {
     return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['triggerWebhook']);
-        const timeout = (_a = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _a === void 0 ? void 0 : _a.timeout;
-        const useFetchAPI = ((_b = setting === null || setting === void 0 ? void 0 : setting.triggerWebhook) === null || _b === void 0 ? void 0 : _b.useFetchAPI) === true;
-        if (typeof timeout !== 'number') {
-            throw new factory.errors.NotFound('setting.triggerWebhook.timeout');
-        }
         const { abortedTasksWithoutReport } = settings;
         const abortedTasks = yield repos.task.projectFields(Object.assign({ statuses: [factory.taskStatus.Aborted], dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
             ? { name: { $nin: abortedTasksWithoutReport } }
@@ -206,7 +194,9 @@ function notifyAbortedTasks(params) {
             yield notification.lineNotify({
                 subject: message.subject, content: message.content,
                 logLevel: 'error'
-            }, { timeout, useFetchAPI })({}, credentials);
+            }
+            // { timeout, useFetchAPI }
+            )(repos, credentials);
         }
     });
 }

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.5"
+  "version": "22.7.0-alpha.6"
 }