@chevre/domain 22.11.0-alpha.3 → 22.11.0-alpha.30

package/lib/chevre/repo/task.js

@@ -30,10 +30,10 @@ const task_2 = require("./mongoose/schemas/task");
 /**
  * タスク実行時のソート条件
  */
-const sortOrder4executionOfTasks = {
-    numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先
-    runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
-};
+// const sortOrder4executionOfTasks: { [key in keyof factory.task.IAttributes<factory.taskName>]?: factory.sortType } = {
+//     numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先
+//     runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
+// };
 const executableTaskProjection = {
     _id: 0,
     id: { $toString: '$_id' },
@@ -242,48 +242,6 @@ class TaskRepo {
             return { id, status };
         });
     }
-    // public async createIfNotExistByIdentifier(
-    //     params: factory.task.IAttributes<factory.taskName> & {
-    //         // resolve uniqueness of identifier(2025-03-27~)
-    //         identifier: string;
-    //     },
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
-    //         throw new factory.errors.ArgumentNull('identifier');
-    //     }
-    //     try {
-    //         const createdTask = await this.taskModel.findOneAndUpdate(
-    //             {
-    //                 'project.id': { $eq: params.project.id },
-    //                 name: { $eq: params.name },
-    //                 identifier: { $exists: true, $eq: params.identifier }
-    //             },
-    //             { $setOnInsert: params },
-    //             { new: true, upsert: true }
-    //         )
-    //             .select({ _id: 1 })
-    //             .exec();
-    //         if (options.emitImmediately) {
-    //             taskEventEmitter.emitTaskStatusChanged({
-    //                 id: createdTask.id,
-    //                 name: params.name,
-    //                 status: factory.taskStatus.Ready
-    //             });
-    //         }
-    //     } catch (error) {
-    //         let throwsError = true;
-    //         if (await isMongoError(error)) {
-    //             // すでにidentifierが存在する場合ok
-    //             if (error.code === MongoErrorCode.DuplicateKey) {
-    //                 throwsError = false;
-    //             }
-    //         }
-    //         if (throwsError) {
-    //             throw error;
-    //         }
-    //     }
-    // }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
@@ -341,40 +299,6 @@ class TaskRepo {
             }
         });
     }
-    // public async createInformTaskIfNotExist(
-    //     // resolve uniqueness of identifier(2025-03-27~)
-    //     params: Pick<
-    //         factory.task.IAttributes<factory.taskName.TriggerWebhook>,
-    //         'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'
-    //     > & {
-    //         data: factory.task.triggerWebhook.IInformAnyResourceAction & {
-    //             object: factory.notification.person.IPersonAsNotification;
-    //         };
-    //     },
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: params.name,
-    //             'data.object.id': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.id)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     /**
      * 取引削除タスク冪等作成
      */
@@ -401,36 +325,6 @@ class TaskRepo {
             }
         });
     }
-    // public async createConfirmReserveTransactionTaskIfNotExist(
-    //     params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>,
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: { $eq: params.name },
-    //             'data.object.transactionNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.transactionNumber)
-    //             },
-    //             'data.purpose.orderNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.purpose.orderNumber)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     createOnAssetTransactionStatusChangedTaskIfNotExist(
     // resolve uniqueness of identifier(2025-03-27~)
     params, options) {
@@ -458,6 +352,10 @@ class TaskRepo {
             }
         });
     }
+    /**
+     * Ready -> remainingNumberOfTriesが1減る
+     * Running -> findOneするだけ
+     */
     executeOneById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
@@ -492,19 +390,21 @@ class TaskRepo {
         });
     }
     /**
-     * support no name(2025-03-04~)
+     * Readyのタスクをname指定でひとつRunningに変更する
      */
     executeOneIfExists(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             if (!(params.runsAt.$lt instanceof Date)) {
                 throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
             }
             const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            const nameNin = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$nin;
-            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
+            // const nameNin = params.name?.$nin;
+            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string')
                 ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
+                    name: Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined
+                    // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
+                    )
                 }
                 : undefined), {
                 $set: {
@@ -516,8 +416,9 @@ class TaskRepo {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, { new: true, projection: executableTaskProjection })
-                .sort(sortOrder4executionOfTasks)
+            }, Object.assign({ new: true, projection: executableTaskProjection }, (typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
+                ? { sort: params.sort }
+                : undefined))
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean() // lean(2024-09-26~)
                 .exec();
@@ -535,13 +436,14 @@ class TaskRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const { runsAt, limit, name } = params;
             const nameEq = name === null || name === void 0 ? void 0 : name.$eq;
-            const nameNin = name === null || name === void 0 ? void 0 : name.$nin;
+            // const nameNin = name?.$nin;
+            const nameIn = name === null || name === void 0 ? void 0 : name.$in;
             if (!(runsAt.$lt instanceof Date)) {
                 throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
             }
-            const query = this.taskModel.countDocuments(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
+            const query = this.taskModel.countDocuments(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameIn))
                 ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
+                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameIn)) ? { $in: nameIn } : undefined)
                 }
                 : undefined));
             if (typeof limit === 'number' && limit >= 0) {
@@ -552,7 +454,11 @@ class TaskRepo {
             return { count };
         });
     }
-    emitRunningIfExists(params) {
+    /**
+     * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
+     */
+    emitRunningIfExists(params, next // support next function(2025-08-02~)
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             if (!(params.runsAt.$lt instanceof Date)) {
@@ -564,10 +470,11 @@ class TaskRepo {
                 name: 1
             };
             const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            const nameNin = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$nin;
-            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
+            // const nameNin = params.name?.$nin;
+            const nameIn = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$in;
+            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameIn))
                 ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
+                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameIn)) ? { $in: nameIn } : undefined)
                 }
                 : undefined), {
                 $set: {
@@ -579,8 +486,9 @@ class TaskRepo {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, { new: true, projection })
-                .sort(params.sort)
+            }, Object.assign({ new: true, projection }, (typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
+                ? { sort: params.sort }
+                : undefined))
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean()
                 .exec();
@@ -588,101 +496,26 @@ class TaskRepo {
                 // tslint:disable-next-line:no-null-keyword
                 return null;
             }
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id: doc.id,
-                status: factory.taskStatus.Running
-            });
-            return doc;
-        });
-    }
-    findExecutableOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!(params.runsAt.$lt instanceof Date)) {
-                throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
+            let changedTask;
+            if (typeof nameEq === 'string') {
+                changedTask = {
+                    id: doc.id,
+                    status: factory.taskStatus.Running,
+                    name: nameEq
+                };
             }
-            const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            const nameNin = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$nin;
-            const query = this.taskModel.findOne(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: params.runsAt.$lt } }, (typeof nameEq === 'string' || Array.isArray(nameNin))
-                ? {
-                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameNin)) ? { $nin: nameNin } : undefined)
-                }
-                : undefined), executableTaskProjection)
-                .sort({
-                runsAt: factory.sortType.Ascending
-            });
-            // .hint('executeOneByName');
-            // const explainResult = await query.explain();
-            // console.dir(explainResult, { depth: null });
-            // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            const doc = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean()
-                .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
+            else {
+                changedTask = {
+                    id: doc.id,
+                    status: factory.taskStatus.Running
+                };
             }
+            task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, (typeof next === 'function') ? next : undefined);
             return doc;
         });
     }
-    // discontinue(2025-05-26~)
-    /**
-     * emit OnTaskStatusChanged on delayed tasks
-     */
-    // public async emitDelayedTasksEvent(params: {
-    //     now: Date;
-    //     /**
-    //      * 指定期間遅延しているタスクを実行する
-    //      */
-    //     delayInSeconds: number;
-    //     limit: number;
-    //     name: {
-    //         /**
-    //          * 指定タスクのみ実行する
-    //          */
-    //         $in?: factory.taskName[];
-    //         /**
-    //          * 指定タスク以外のみ実行する
-    //          */
-    //         $nin?: factory.taskName[];
-    //     };
-    // }) {
-    //     const runsAtLt = moment(params.now)
-    //         .add(-params.delayInSeconds, 'seconds')
-    //         .toDate();
-    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
-    //         _id: 0,
-    //         id: { $toString: '$_id' },
-    //         name: 1,
-    //         status: 1
-    //     };
-    //     const delayedTasks = await this.taskModel.find(
-    //         {
-    //             status: { $eq: factory.taskStatus.Ready },
-    //             runsAt: { $lt: runsAtLt },
-    //             ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined,
-    //             ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
-    //         },
-    //         projection
-    //     )
-    //         .limit(params.limit)
-    //         .sort(sortOrder4executionOfTasks) // sort(2025-03-03~)
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .lean<IDelayedTask[]>() // lean(2024-09-26~)
-    //         .exec();
-    //     if (delayedTasks.length > 0) {
-    //         delayedTasks.forEach((delayedTask) => {
-    //             taskEventEmitter.emitTaskStatusChanged({
-    //                 id: delayedTask.id,
-    //                 name: delayedTask.name,
-    //                 status: factory.taskStatus.Ready
-    //             });
-    //         });
-    //     }
-    //     return delayedTasks;
-    // }
     /**
-     * make tasks expired
+     * Readyのままで期限切れのタスクをExpiredに変更する
      */
     makeExpiredMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -702,21 +535,23 @@ class TaskRepo {
         });
     }
     /**
-     * 実行中ステータスのままになっているタスクをリトライする
+     * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
      */
-    retry(params) {
+    retryMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()
                 .add(-params.intervalInMinutes, 'minutes')
                 .toDate();
-            return this.taskModel.updateMany({
-                status: { $eq: factory.taskStatus.Running },
-                lastTriedAt: {
+            const remainingNumberOfTriesGte = params.remainingNumberOfTries.$gte;
+            const remainingNumberOfTriesLte = params.remainingNumberOfTries.$lte;
+            return this.taskModel.updateMany(Object.assign(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Running }, lastTriedAt: {
                     $type: 'date',
                     $lt: lastTriedAtShoudBeLessThan
-                },
-                remainingNumberOfTries: { $gt: 0 }
-            }, {
+                } }, (typeof remainingNumberOfTriesGte === 'number')
+                ? { remainingNumberOfTries: { $gte: remainingNumberOfTriesGte } }
+                : undefined), (typeof remainingNumberOfTriesLte === 'number')
+                ? { remainingNumberOfTries: { $lte: remainingNumberOfTriesLte } }
+                : undefined), (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), {
                 $set: {
                     status: factory.taskStatus.Ready // 実行前に変更
                 }
@@ -744,47 +579,51 @@ class TaskRepo {
                 .exec();
         });
     }
-    abortOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastTriedAtShoudBeLessThan = moment()
-                .add(-params.intervalInMinutes, 'minutes')
-                .toDate();
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));
-            const doc = yield this.taskModel.findOneAndUpdate({
-                status: { $eq: factory.taskStatus.Running },
-                lastTriedAt: {
-                    $type: 'date',
-                    $lt: lastTriedAtShoudBeLessThan
-                },
-                remainingNumberOfTries: { $eq: 0 }
-            }, {
-                $set: {
-                    status: factory.taskStatus.Aborted,
-                    dateAborted: new Date()
-                }
-            }, { new: true, projection })
-                .lean() // lean(2024-09-26~)
-                .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
-            return doc;
-        });
-    }
+    // public async abortOne(params: {
+    //     intervalInMinutes: number;
+    // }): Promise<factory.task.ITask<factory.taskName> | null> {
+    //     const lastTriedAtShoudBeLessThan = moment()
+    //         .add(-params.intervalInMinutes, 'minutes')
+    //         .toDate();
+    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1])))
+    //     };
+    //     const doc = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             status: { $eq: factory.taskStatus.Running },
+    //             lastTriedAt: {
+    //                 $type: 'date',
+    //                 $lt: lastTriedAtShoudBeLessThan
+    //             },
+    //             remainingNumberOfTries: { $eq: 0 }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Aborted,
+    //                 dateAborted: new Date()
+    //             }
+    //         },
+    //         { new: true, projection }
+    //     )
+    //         .lean<factory.task.ITask<factory.taskName>>()  // lean(2024-09-26~)
+    //         .exec();
+    //     if (doc === null) {
+    //         // tslint:disable-next-line:no-null-keyword
+    //         return null;
+    //     }
+    //     return doc;
+    // }
     abortMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()
                 .add(-params.intervalInMinutes, 'minutes')
                 .toDate();
-            return this.taskModel.updateMany({
-                status: { $eq: factory.taskStatus.Running },
-                lastTriedAt: {
+            return this.taskModel.updateMany(Object.assign({ status: { $eq: factory.taskStatus.Running }, lastTriedAt: {
                     $type: 'date',
                     $lt: lastTriedAtShoudBeLessThan
-                },
-                remainingNumberOfTries: { $eq: 0 }
-            }, {
+                }, remainingNumberOfTries: { $eq: 0 } }, (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), {
                 $set: {
                     status: factory.taskStatus.Aborted,
                     dateAborted: new Date()
@@ -794,48 +633,30 @@ class TaskRepo {
         });
     }
     /**
-     * 実行結果を保管する
+     * タスクIDから実行結果とステータスを保管する
+     * Abortedの場合、dateAbortedもセットする
      */
-    pushExecutionResultById(params, executionResult, 
+    setExecutionResultAndStatus(params, update, 
     // support customr function(2025-05-25~)
     next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { id, status } = params;
+            const { id, remainingNumberOfTries, name } = params;
+            const { status, executionResult } = update;
             yield this.taskModel.updateOne({ _id: { $eq: id } }, {
-                $set: { status },
+                $set: Object.assign({ status }, (status === factory.taskStatus.Aborted) ? { dateAborted: executionResult.endDate } : undefined // 2025-08-04~
+                ),
                 $push: { executionResults: executionResult }
             })
                 .exec();
             // emit event(2025-05-26~)
             if (typeof next === 'function') {
-                task_1.taskEventEmitter.emitTaskStatusChanged({ id, status, executionResult }, next);
+                if (status !== factory.taskStatus.Executed) {
+                    const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
+                    task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
+                }
             }
         });
     }
-    /**
-     * 特定タスク検索
-     */
-    // public async findById<T extends factory.taskName>(params: {
-    //     name: T;
-    //     id: string;
-    // }): Promise<factory.task.ITask<T>> {
-    //     const doc = await this.taskModel.findOne(
-    //         {
-    //             name: { $eq: params.name },
-    //             _id: { $eq: params.id }
-    //         },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound('Task');
-    //     }
-    //     return doc.toObject();
-    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { limit } = params;
@@ -970,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
                 },
@@ -1000,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) {
@@ -1028,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
                 },
@@ -1058,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({