@chevre/domain 22.11.0-alpha.27 → 22.11.0-alpha.29

package/example/src/chevre/aggregation/aggregateTasks.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// 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);
+
+    const aggregateDate = new Date();
+    const runsFrom: Date = moment(aggregateDate)
+        .utc()
+        // .tz('Asia/Tokyo')
+        .add(-1, 'days')
+        .startOf('days')
+        .toDate();
+    const runsThrough: Date = moment(aggregateDate)
+        .utc()
+        // .tz('Asia/Tokyo')
+        .add(-1, 'days')
+        .endOf('days')
+        .toDate();
+
+    const result = await taskRepo.aggregateTask({
+        project: {
+            id: { $ne: 'sskts-development' }
+        },
+        runsFrom,
+        runsThrough
+    });
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/settings/addSettings.ts

@@ -25,7 +25,15 @@ async function main() {
                     }
                 }],
                 informTaskNames: [
-                    chevre.factory.taskName.Pay
+                    chevre.factory.taskName.Pay,
+                    chevre.factory.taskName.InvalidatePaymentUrl,
+                    chevre.factory.taskName.Refund,
+                    chevre.factory.taskName.VoidPayment
+                    // chevre.factory.taskName.ConfirmReserveTransaction
+                ],
+                informTaskStatuses: [
+                    chevre.factory.taskStatus.Aborted
+                    // chevre.factory.taskStatus.Running
                 ]
             }
         }

package/lib/chevre/eventEmitter/task.d.ts

@@ -20,29 +20,43 @@ interface IReadyTask {
     expires?: Date;
     executionResult?: never;
 }
+/**
+ * タスク名不明の遅延実行中タスク
+ */
 interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
-    remainingNumberOfTries?: never;
     name?: never;
+    remainingNumberOfTries?: never;
     expires?: never;
     executionResult?: never;
 }
 /**
- * 実行されたタスクイベント
+ * タスク名指定での遅延実行中タスク
+ */
+interface IRunningTaskByName {
+    id: string;
+    status: factory.taskStatus.Running;
+    name: factory.taskName;
+    remainingNumberOfTries?: never;
+    expires?: never;
+    executionResult?: never;
+}
+/**
+ * 実行後失敗したタスクイベント
  */
 interface IExecutedTask {
     id: string;
-    status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
+    status: factory.taskStatus.Running | factory.taskStatus.Aborted;
+    name: factory.taskName;
     executionResult: factory.task.IExecutionResult;
     /**
      * 実行されたタスクの残り試行回数
      */
     remainingNumberOfTries: number;
-    name: factory.taskName;
     expires?: never;
 }
-type IChangedTask = IReadyTask | IRunningTask | IExecutedTask;
+type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTask;
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
 type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
 type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
@@ -54,4 +68,4 @@ declare class TaskEventEmitter extends EventEmitter {
     emitTaskStatusChanged(task: IChangedTask, next?: INextFunction): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IChangedTask, IReadyTask, IRunningTask, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };
+export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, INextFunction, IOnTaskStatusChangedListener, taskEventEmitter };

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -22,6 +22,10 @@ interface IOnTaskStatusChanged {
      * 分析連携するtaskNameリスト
      */
     informTaskNames?: factory.taskName[];
+    /**
+     * 分析連携するtaskStatusリスト
+     */
+    informTaskStatuses?: factory.taskStatus[];
 }
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];

package/lib/chevre/repo/task.js

@@ -496,10 +496,21 @@ class TaskRepo {
                 // tslint:disable-next-line:no-null-keyword
                 return null;
             }
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id: doc.id,
-                status: factory.taskStatus.Running
-            }, (typeof next === 'function') ? next : undefined);
+            let changedTask;
+            if (typeof nameEq === 'string') {
+                changedTask = {
+                    id: doc.id,
+                    status: factory.taskStatus.Running,
+                    name: nameEq
+                };
+            }
+            else {
+                changedTask = {
+                    id: doc.id,
+                    status: factory.taskStatus.Running
+                };
+            }
+            task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, (typeof next === 'function') ? next : undefined);
             return doc;
         });
     }
@@ -639,8 +650,10 @@ class TaskRepo {
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
-                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
+                if (status !== factory.taskStatus.Executed) {
+                    const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
+                    task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
+                }
             }
         });
     }
@@ -762,10 +775,10 @@ class TaskRepo {
                 factory.taskStatus.Aborted
             ].map((taskStatus) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
-                const matchConditions = Object.assign({ runsAt: {
+                const matchConditions = Object.assign({ status: { $eq: taskStatus }, runsAt: {
                         $gte: params.runsFrom,
                         $lte: params.runsThrough
-                    }, status: { $eq: taskStatus } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
+                    } }, (typeof ((_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$ne) === 'string')
                     ? { 'project.id': { $ne: params.project.id.$ne } }
                     : undefined);
                 return this.agggregateByStatus({ matchConditions, status: taskStatus });
@@ -778,7 +791,7 @@ class TaskRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const matchConditions = params.matchConditions;
             const taskStatus = params.status;
-            const aggregations = yield this.taskModel.aggregate([
+            const aggregate1 = this.taskModel.aggregate([
                 {
                     $match: matchConditions
                 },
@@ -808,8 +821,11 @@ class TaskRepo {
                         minLatency: '$minLatency'
                     }
                 }
-            ])
-                .exec();
+            ]);
+            // const explainResult = await aggregate1.explain();
+            // console.dir(explainResult, { depth: null });
+            // return;
+            const aggregations = yield aggregate1.exec();
             // tslint:disable-next-line:no-magic-numbers
             const percents = [50, 95, 99];
             if (aggregations.length === 0) {
@@ -836,7 +852,7 @@ class TaskRepo {
                     rank: Math.floor(aggregations[0].taskCount * percentile / 100)
                 };
             });
-            const aggregations2 = yield this.taskModel.aggregate([
+            const aggregate2 = this.taskModel.aggregate([
                 {
                     $match: matchConditions
                 },
@@ -866,8 +882,8 @@ class TaskRepo {
                         })
                     }
                 }
-            ])
-                .exec();
+            ]);
+            const aggregations2 = yield aggregate2.exec();
             return {
                 status: taskStatus,
                 aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])

package/lib/chevre/repo/transaction.js

@@ -323,7 +323,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} not found`);
             }
             return doc;
         });
@@ -371,7 +371,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc;
         });
@@ -389,7 +389,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc.object.paymentMethods;
         });
@@ -407,7 +407,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${factory.transactionStatusType.InProgress} not found`);
             }
             return doc.object.orderNumber;
         });
@@ -425,7 +425,7 @@ class TransactionRepo {
                 .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${factory.transactionType.PlaceOrder} ${params.status.$in.join(' or ')} not found`);
             }
             return doc.object.confirmationNumber;
         });
@@ -448,7 +448,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -471,7 +471,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -494,7 +494,7 @@ class TransactionRepo {
                 .lean()
                 .exec();
             if (doc === null) {
-                throw new factory.errors.NotFound(this.transactionModel.modelName);
+                throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
             }
         });
     }
@@ -538,7 +538,7 @@ class TransactionRepo {
                         .isSameOrBefore(moment(endDate))) {
                         throw new factory.errors.Argument('Transaction id', 'potentially expired');
                     }
-                    throw new factory.errors.NotFound(this.transactionModel.modelName);
+                    throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
                 }
             }
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
@@ -914,7 +914,7 @@ class TransactionRepo {
                     throw new factory.errors.Argument('Transaction id', 'Confirmed transaction unable to cancel');
                 }
                 else {
-                    throw new factory.errors.NotFound(this.transactionModel.modelName);
+                    throw new factory.errors.NotFound(this.transactionModel.modelName, `${params.typeOf} ${factory.transactionStatusType.InProgress} not found`);
                 }
             }
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({

package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.d.ts

@@ -1,7 +1,10 @@
 import * as factory from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { IExecutableTask, TaskRepo } from '../../../repo/task';
-declare function informTaskIfNeeded(task: IExecutableTask<factory.taskName>): (repos: {
+declare function informTaskIfNeeded(params: {
+    task: IExecutableTask<factory.taskName>;
+    executionEndDate: Date;
+}): (repos: {
     setting: SettingRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.js

@@ -13,66 +13,89 @@ exports.informTaskIfNeeded = informTaskIfNeeded;
 const createDebug = require("debug");
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service:taskHandler:onOperationFailed');
-function createInformTasks(task, setting) {
-    var _a, _b;
-    const taskRunsAt = new Date();
+function createInformTasks(params) {
+    var _a, _b, _c;
+    const { task, setting, executionEndDate } = params;
     const informTask = (_a = setting === null || setting === void 0 ? void 0 : setting.onTaskStatusChanged) === null || _a === void 0 ? void 0 : _a.informTask;
     const informTaskNames = (_b = setting === null || setting === void 0 ? void 0 : setting.onTaskStatusChanged) === null || _b === void 0 ? void 0 : _b.informTaskNames;
+    const informTaskStatuses = (_c = setting === null || setting === void 0 ? void 0 : setting.onTaskStatusChanged) === null || _c === void 0 ? void 0 : _c.informTaskStatuses;
     const informTasks = [];
     if (Array.isArray(informTaskNames) && informTaskNames.includes(task.name)) {
-        const { id, name, data, project, runsAt } = task;
-        const task4inform = {
-            id, name, data, project, runsAt,
-            status: factory.taskStatus.Aborted,
-            typeOf: 'Task'
-        };
-        const informIdentifier = `Task:${name}:${id}:${task4inform.status}`;
-        if (Array.isArray(informTask) && informTask.length > 0) {
-            informTask.forEach((informTaskParams) => {
-                var _a, _b;
-                if (typeof ((_a = informTaskParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
-                    const informActionAttributes = {
-                        object: task4inform,
-                        recipient: {
-                            id: '',
-                            name: String((_b = informTaskParams.recipient) === null || _b === void 0 ? void 0 : _b.name),
-                            typeOf: factory.creativeWorkType.WebApplication
-                        },
-                        target: {
-                            httpMethod: 'POST',
-                            encodingType: factory.encodingFormat.Application.json,
-                            typeOf: 'EntryPoint',
-                            urlTemplate: informTaskParams.recipient.url
-                        },
-                        identifier: informIdentifier
+        if (Array.isArray(informTaskStatuses)) {
+            const { id, name, data, project, runsAt, remainingNumberOfTries } = task;
+            let task4inform;
+            if (remainingNumberOfTries <= 0) {
+                if (informTaskStatuses.includes(factory.taskStatus.Aborted)) {
+                    const abortingTask = {
+                        id, name, data, project, runsAt,
+                        status: factory.taskStatus.Aborted,
+                        typeOf: 'Task',
+                        dateAborted: executionEndDate
                     };
-                    const description = `inform aborting tasks to agg service: ${name} ${id}`;
-                    informTasks.push({
-                        project,
-                        name: factory.taskName.TriggerWebhook,
-                        status: factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: informActionAttributes,
-                        description
+                    task4inform = abortingTask;
+                }
+            }
+            else {
+                if (informTaskStatuses.includes(factory.taskStatus.Running)) {
+                    const runningTask = {
+                        id, name, data, project, runsAt,
+                        status: factory.taskStatus.Running,
+                        typeOf: 'Task'
+                    };
+                    task4inform = runningTask;
+                }
+            }
+            if (task4inform !== undefined) {
+                const informIdentifier = `Task:${name}:${id}:${task4inform.status}`;
+                if (Array.isArray(informTask) && informTask.length > 0) {
+                    informTask.forEach((informTaskParams) => {
+                        var _a, _b;
+                        if (typeof ((_a = informTaskParams.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
+                            const informActionAttributes = {
+                                object: task4inform,
+                                recipient: {
+                                    id: '',
+                                    name: String((_b = informTaskParams.recipient) === null || _b === void 0 ? void 0 : _b.name),
+                                    typeOf: factory.creativeWorkType.WebApplication
+                                },
+                                target: {
+                                    httpMethod: 'POST',
+                                    encodingType: factory.encodingFormat.Application.json,
+                                    typeOf: 'EntryPoint',
+                                    urlTemplate: informTaskParams.recipient.url
+                                },
+                                identifier: informIdentifier
+                            };
+                            const description = `inform aborting tasks to agg service: ${name} ${id} ${task4inform.status}`;
+                            informTasks.push({
+                                project,
+                                name: factory.taskName.TriggerWebhook,
+                                status: factory.taskStatus.Ready,
+                                runsAt: executionEndDate,
+                                remainingNumberOfTries: 10,
+                                numberOfTried: 0,
+                                executionResults: [],
+                                data: informActionAttributes,
+                                description
+                            });
+                        }
                     });
                 }
-            });
+            }
         }
     }
     return informTasks;
 }
-function informTaskIfNeeded(task) {
+function informTaskIfNeeded(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const isAborting = task.status === factory.taskStatus.Running && task.remainingNumberOfTries <= 0;
+        const { executionEndDate, task } = params;
+        const isAborting = task.status === factory.taskStatus.Running;
         const useInform = isAborting
             && task.name !== factory.taskName.HandleNotification // nameで絞る
             && task.name !== factory.taskName.TriggerWebhook;
         if (useInform) {
             const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTaskStatusChanged']);
-            const informTasks = createInformTasks(task, setting);
+            const informTasks = createInformTasks({ task, setting, executionEndDate });
             debug('informTaskIfNeeded: creating inform tasks...', JSON.stringify(informTasks));
             if (informTasks.length > 0) {
                 yield repos.task.saveMany(informTasks, { emitImmediately: true });

package/lib/chevre/service/taskHandler/onOperationFailed.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOperationFailed = onOperationFailed;
 const factory = require("../../factory");
 const informTaskIfNeeded_1 = require("./onOperationFailed/informTaskIfNeeded");
+const USE_INFORM_TASK_RUNNING = process.env.USE_INFORM_TASK_RUNNING === '1';
 /**
  * タスク実行失敗時処理
  */
@@ -22,12 +23,17 @@ function onOperationFailed(params) {
         if (typeof error !== 'object') {
             error = { message: String(error) };
         }
+        const endDate = new Date();
         // remainingNumberOfTries<=0ならAborted(2025-08-04~)
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
+            // 実験的に実行中タスク連携
+            if (USE_INFORM_TASK_RUNNING) {
+                yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
+            }
             const result = {
                 executedAt: now,
-                endDate: new Date(),
+                endDate,
                 error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
             };
             // 失敗してもここではステータスを戻さない(Runningのまま待機)
@@ -45,10 +51,10 @@ function onOperationFailed(params) {
             // 設定されたnameの場合連携する
             // もしここで連携タスク作成に失敗したとしても、再度Readyタスクとなりリトライされて、処理は冪等となる想定
             // 最終的に、連携タスクが作成され、実行中タスクがAbortedとなればよい
-            yield (0, informTaskIfNeeded_1.informTaskIfNeeded)(task)(repos);
+            yield (0, informTaskIfNeeded_1.informTaskIfNeeded)({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
-                endDate: new Date(),
+                endDate,
                 error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
             };
             yield repos.task.setExecutionResultAndStatus({

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.396.0-alpha.3",
+    "@chevre/factory": "4.396.0-alpha.4",
     "@cinerino/sdk": "11.1.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.27"
+  "version": "22.11.0-alpha.29"
 }