@chevre/domain 21.2.0-alpha.24 → 21.2.0-alpha.26

package/example/src/chevre/searchAbortedTasks.ts

@@ -0,0 +1,30 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.Pay>[]>await taskRepo.search({
+        // limit: 100,
+        // page: 1,
+        name: chevre.factory.taskName.Pay,
+        statuses: [chevre.factory.taskStatus.Aborted],
+        runsFrom: moment('2023-04-27T00:00:00Z')
+            .toDate(),
+        sort: { runsAt: chevre.factory.sortType.Ascending }
+    });
+    console.log(tasks.map((task) => `${task.project.id},${task.id},${moment(task.runsAt)
+        .tz('Asia/Tokyo')
+        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0].paymentMethod.paymentMethodId}"`)
+        .join('\n'));
+    console.log(tasks.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/credentials.d.ts

@@ -27,6 +27,7 @@ export declare const credentials: {
     lineNotify: {
         url: string;
         accessToken: string;
+        accessTokenAlert: string;
     };
     movieticketReserve: {
         timeout: number;

package/lib/chevre/credentials.js

@@ -31,7 +31,8 @@ exports.credentials = {
     },
     lineNotify: {
         url: process.env.LINE_NOTIFY_URL,
-        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN
+        accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
+        accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT
     },
     movieticketReserve: {
         // tslint:disable-next-line:no-magic-numbers

package/lib/chevre/repo/transaction.js

@@ -534,12 +534,14 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const endDate = new Date();
             yield this.transactionModel.updateOne({
                 _id: { $eq: params.id },
                 tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
             }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-                tasksExportedAt: new Date()
+                tasksExportedAt: endDate,
+                'tasksExportAction.endDate': endDate
             })
                 .exec();
         });

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

@@ -1,7 +1,9 @@
 import * as factory from '../factory';
 import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as ProjectRepo } from '../repo/project';
-export type Operation<T> = () => Promise<T>;
+export type Operation<T> = (repos: {
+    accessToken: string;
+}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html

package/lib/chevre/service/notification.js

@@ -111,15 +111,11 @@ exports.sendEmailMessage = sendEmailMessage;
  * https://notify-bot.line.me/doc/ja/
  */
 function report2developers(subject, content, imageThumbnail, imageFullsize) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
-        const LINE_NOTIFY_ACCESS_TOKEN = credentials_1.credentials.lineNotify.accessToken;
         if (LINE_NOTIFY_URL === undefined) {
             throw new Error('Environment variable LINE_NOTIFY_URL not set');
         }
-        if (LINE_NOTIFY_ACCESS_TOKEN === undefined) {
-            throw new Error('Environment variable LINE_NOTIFY_ACCESS_TOKEN not set');
-        }
         const message = `--------
 ${subject}
 --------
@@ -130,7 +126,7 @@ ${content}`;
             var _a;
             request.post({
                 url: LINE_NOTIFY_URL,
-                auth: { bearer: LINE_NOTIFY_ACCESS_TOKEN },
+                auth: { bearer: repos.accessToken },
                 form: formData,
                 json: true,
                 timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout

package/lib/chevre/service/task.js

@@ -18,6 +18,7 @@ const factory = require("../factory");
 const task_1 = require("../repo/task");
 const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
+const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
 const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
@@ -140,7 +141,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }
@@ -157,7 +160,9 @@ function notifyAbortedTasks(params) {
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.24"
+  "version": "21.2.0-alpha.26"
 }