@chevre/domain 21.26.0-alpha.4 → 21.26.0-alpha.6

package/example/src/chevre/notifyAbortedTasks.ts

@@ -0,0 +1,25 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const PROJECT_ID = String(process.env.PROJECT_ID);
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    await (await chevre.service.task.createService()).notifyAbortedTasks({
+        dateAbortedGte: moment()
+            // tslint:disable-next-line:no-magic-numbers
+            .add(-30, 'day')
+            .toDate()
+    })({ task: taskRepo });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/validateOrder.ts

@@ -22,7 +22,11 @@ async function main() {
             orderDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-365, 'days')
+                    .add(-275, 'days')
+                    .toDate(),
+                $lte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-270, 'days')
                     .toDate()
             }
         },

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

@@ -30,7 +30,7 @@ lastMessage:${lastMessage}`;
     };
 }
 exports.task2lineNotify = task2lineNotify;
-const MAX_LAST_MESSAGE_LENGTH = 20;
+const MAX_LAST_MESSAGE_LENGTH = 60;
 function tasks2lineNotify(params) {
     const subject = `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`;
     let content = subject;
@@ -38,28 +38,34 @@ function tasks2lineNotify(params) {
     // tslint:disable-next-line:no-magic-numbers
     if (params.tasks.length > 10) {
         content = params.tasks.map((task) => {
-            return `project:${task.project.id}
-id:${task.id}
-name:${task.name}`;
+            return `* project:${task.project.id}
+  ${task.id}
+  ${task.name}`;
         })
             .join('\n');
     }
     else {
         // tslint:disable-next-line:no-magic-numbers
-        const maxLastMessageLength = (params.tasks.length <= 5) ? 80 : MAX_LAST_MESSAGE_LENGTH; // 通知タスク数に応じてメッセージ長を調整
+        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;
             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)}`;
-            return `project:${task.project.id}
-id:${task.id}
-name:${task.name}
-runsAt:${moment(task.runsAt)
+            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) {
+                lastMessage = lastError.message;
+            }
+            const abbreviatedMessage = (lastMessage.length > maxLastMessageLength)
+                ? `${lastMessage.slice(0, maxLastMessageLength)}...`
+                : lastMessage;
+            return `* project:${task.project.id}
+  ${task.id}
+  ${task.name}
+  ${moment(task.runsAt)
                 .toISOString()}
-lastMessage:${lastMessage.slice(0, maxLastMessageLength)}...`;
+  ${abbreviatedMessage}`;
         })
             .join('\n');
     }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -95,13 +95,14 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                 typeOf: factory.actionType.ConfirmAction,
                 object: confirmObject,
                 agent: order.project,
-                purpose: simpleOrder,
-                instrument: {
-                    typeOf: 'WebAPI',
-                    identifier: (confirmObject.typeOf === 'COAReserveTransaction')
-                        ? factory.service.webAPI.Identifier.COA
-                        : factory.service.webAPI.Identifier.Chevre
-                }
+                purpose: simpleOrder
+                // instrument廃止(2024-03-13~)
+                // instrument: {
+                //     typeOf: 'WebAPI',
+                //     identifier: (confirmObject.typeOf === 'COAReserveTransaction')
+                //         ? factory.service.webAPI.Identifier.COA
+                //         : factory.service.webAPI.Identifier.Chevre
+                // }
             };
             const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.362.0-alpha.3",
+    "@chevre/factory": "4.362.0-alpha.4",
     "@cinerino/sdk": "5.14.0-alpha.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.26.0-alpha.4"
+  "version": "21.26.0-alpha.6"
 }