@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/repo/task.js

@@ -1,24 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskRepo = void 0;
 const moment = require("moment");
@@ -69,18 +49,17 @@ const AVAILABLE_PROJECT_FIELDS = [
  * タスクリポジトリ
  */
 class TaskRepo {
+    taskModel;
     constructor(connection) {
         this.taskModel = connection.model(task_2.modelName, (0, task_2.createSchema)());
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         const andConditions = [];
-        const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
+        const idEq = params.id?.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
@@ -88,16 +67,16 @@ class TaskRepo {
             andConditions.push({ name: { $eq: params.name } });
         }
         else {
-            const nameIn = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$in;
+            const nameIn = params.name?.$in;
             if (Array.isArray(nameIn)) {
                 andConditions.push({ name: { $in: nameIn } });
             }
-            const nameNin = (_e = params.name) === null || _e === void 0 ? void 0 : _e.$nin;
+            const nameNin = params.name?.$nin;
             if (Array.isArray(nameNin)) {
                 andConditions.push({ name: { $nin: nameNin } });
             }
         }
-        const statusEq = (_f = params.status) === null || _f === void 0 ? void 0 : _f.$eq;
+        const statusEq = params.status?.$eq;
         if (typeof statusEq === 'string') {
             andConditions.push({ status: { $eq: statusEq } });
         }
@@ -116,206 +95,170 @@ class TaskRepo {
         if (params.lastTriedThrough instanceof Date) {
             andConditions.push({ lastTriedAt: { $type: 'date', $lte: params.lastTriedThrough } });
         }
-        const dateAbortedGte = (_g = params.dateAborted) === null || _g === void 0 ? void 0 : _g.$gte;
+        const dateAbortedGte = params.dateAborted?.$gte;
         if (dateAbortedGte instanceof Date) {
             andConditions.push({ dateAborted: { $type: 'date', $gte: dateAbortedGte } });
         }
-        const dateAbortedLte = (_h = params.dateAborted) === null || _h === void 0 ? void 0 : _h.$lte;
+        const dateAbortedLte = params.dateAborted?.$lte;
         if (dateAbortedLte instanceof Date) {
             andConditions.push({ dateAborted: { $type: 'date', $lte: dateAbortedLte } });
         }
-        const objectIdEq = (_l = (_k = (_j = params.data) === null || _j === void 0 ? void 0 : _j.object) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        const objectIdEq = params.data?.object?.id?.$eq;
         if (typeof objectIdEq === 'string') {
             andConditions.push({ 'data.object.id': { $exists: true, $eq: objectIdEq } });
         }
-        const objectOrderNumberEq = (_p = (_o = (_m = params.data) === null || _m === void 0 ? void 0 : _m.object) === null || _o === void 0 ? void 0 : _o.orderNumber) === null || _p === void 0 ? void 0 : _p.$eq;
+        const objectOrderNumberEq = params.data?.object?.orderNumber?.$eq;
         if (typeof objectOrderNumberEq === 'string') {
             andConditions.push({ 'data.object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
         }
-        const objectTransactionNumberEq = (_s = (_r = (_q = params.data) === null || _q === void 0 ? void 0 : _q.object) === null || _r === void 0 ? void 0 : _r.transactionNumber) === null || _s === void 0 ? void 0 : _s.$eq;
+        const objectTransactionNumberEq = params.data?.object?.transactionNumber?.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({ 'data.object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
         }
-        const objectPurposeIdEq = (_v = (_u = (_t = params.data) === null || _t === void 0 ? void 0 : _t.purpose) === null || _u === void 0 ? void 0 : _u.id) === null || _v === void 0 ? void 0 : _v.$eq;
+        const objectPurposeIdEq = params.data?.purpose?.id?.$eq;
         if (typeof objectPurposeIdEq === 'string') {
             andConditions.push({ 'data.purpose.id': { $exists: true, $eq: objectPurposeIdEq } });
         }
-        const objectPurposeOrderNumberEq = (_y = (_x = (_w = params.data) === null || _w === void 0 ? void 0 : _w.purpose) === null || _x === void 0 ? void 0 : _x.orderNumber) === null || _y === void 0 ? void 0 : _y.$eq;
+        const objectPurposeOrderNumberEq = params.data?.purpose?.orderNumber?.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({ 'data.purpose.orderNumber': { $exists: true, $eq: objectPurposeOrderNumberEq } });
         }
-        const alternateNameRegex = (_z = params.alternateName) === null || _z === void 0 ? void 0 : _z.$regex;
+        const alternateNameRegex = params.alternateName?.$regex;
         if (typeof alternateNameRegex === 'string' && alternateNameRegex.length > 0) {
             andConditions.push({ alternateName: { $exists: true, $regex: new RegExp(alternateNameRegex) } });
         }
-        const identifierRegex = (_0 = params.identifier) === null || _0 === void 0 ? void 0 : _0.$regex;
+        const identifierRegex = params.identifier?.$regex;
         if (typeof identifierRegex === 'string' && identifierRegex.length > 0) {
             andConditions.push({ identifier: { $exists: true, $regex: new RegExp(identifierRegex) } });
         }
         return andConditions;
     }
-    runImmediately(
+    async runImmediately(
     // resolve uniqueness of identifier(2025-03-27~)
     params, 
     // support customr function(2025-05-25~)
     next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const { expires } = params;
-            if (!(expires instanceof Date)) {
-                throw new factory.errors.Argument('expires', 'must be Date');
-            }
-            const savingTask = Object.assign(Object.assign({}, params), { status: factory.taskStatus.Ready, numberOfTried: 0, executionResults: [] });
-            const result = yield this.taskModel.insertMany(savingTask, { rawResult: true });
-            const id = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
-            if (typeof id !== 'string') {
-                throw new factory.errors.Internal('task not saved');
-            }
-            task_1.taskEventEmitter.emitTaskStatusChanged({
-                id,
-                status: factory.taskStatus.Ready,
-                expires // emit expires(2025-03-31~)
-            }, next);
-            return { id };
-        });
+        const { expires } = params;
+        if (!(expires instanceof Date)) {
+            throw new factory.errors.Argument('expires', 'must be Date');
+        }
+        const savingTask = {
+            ...params,
+            status: factory.taskStatus.Ready,
+            numberOfTried: 0,
+            executionResults: []
+        };
+        const result = await this.taskModel.insertMany(savingTask, { rawResult: true });
+        const id = result.insertedIds?.[0]?.toHexString();
+        if (typeof id !== 'string') {
+            throw new factory.errors.Internal('task not saved');
+        }
+        task_1.taskEventEmitter.emitTaskStatusChanged({
+            id,
+            status: factory.taskStatus.Ready,
+            expires // emit expires(2025-03-31~)
+        }, next);
+        return { id };
     }
-    saveMany(taskAttributes, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const emitImmediately = (options === null || options === void 0 ? void 0 : options.emitImmediately) === true;
-            if (taskAttributes.length > 0) {
-                // resolve uniqueness of identifier(2025-03-27~)
-                const creatingTasks = taskAttributes.map((_a) => {
-                    var { identifier } = _a, creatingTask = __rest(_a, ["identifier"]);
-                    return creatingTask;
-                });
-                const result = yield this.taskModel.insertMany(creatingTasks, { ordered: false, rawResult: true });
-                if (result.insertedCount !== taskAttributes.length) {
-                    throw new factory.errors.Internal('all tasks not saved');
-                }
-                const savedTasks = Object.values(result.insertedIds)
-                    .map((objectId) => {
-                    return { id: objectId.toHexString() };
-                });
-                if (emitImmediately) {
-                    savedTasks.forEach((savedTask) => {
-                        task_1.taskEventEmitter.emitTaskStatusChanged({
-                            id: savedTask.id,
-                            status: factory.taskStatus.Ready
-                        });
+    async saveMany(taskAttributes, options) {
+        const emitImmediately = options?.emitImmediately === true;
+        if (taskAttributes.length > 0) {
+            // resolve uniqueness of identifier(2025-03-27~)
+            const creatingTasks = taskAttributes.map(({ identifier, ...creatingTask }) => creatingTask);
+            const result = await this.taskModel.insertMany(creatingTasks, { ordered: false, rawResult: true });
+            if (result.insertedCount !== taskAttributes.length) {
+                throw new factory.errors.Internal('all tasks not saved');
+            }
+            const savedTasks = Object.values(result.insertedIds)
+                .map((objectId) => {
+                return { id: objectId.toHexString() };
+            });
+            if (emitImmediately) {
+                savedTasks.forEach((savedTask) => {
+                    task_1.taskEventEmitter.emitTaskStatusChanged({
+                        id: savedTask.id,
+                        status: factory.taskStatus.Ready
                     });
-                    // taskAttributes.forEach((savedTask) => {
-                    //     taskEventEmitter.emitTaskStatusChanged({
-                    //         name: savedTask.name,
-                    //         status: factory.taskStatus.Ready
-                    //     });
-                    // });
-                }
-                // return result.ops;
-                return savedTasks;
-            }
-            else {
-                return [];
-            }
-        });
+                });
+                // taskAttributes.forEach((savedTask) => {
+                //     taskEventEmitter.emitTaskStatusChanged({
+                //         name: savedTask.name,
+                //         status: factory.taskStatus.Ready
+                //     });
+                // });
+            }
+            // return result.ops;
+            return savedTasks;
+        }
+        else {
+            return [];
+        }
     }
     /**
      * タスク識別子から検索する
      */
-    findByIdentifier(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                status: 1
-            };
-            const doc = yield this.taskModel.findOne({
-                'project.id': { $eq: params.project.id },
-                name: { $eq: params.name },
-                identifier: { $exists: true, $eq: params.identifier }
-            }, projection)
-                .lean() // lean(2024-09-26~)
-                .exec();
-            if (doc === null) {
-                return;
-            }
-            const { id, status } = doc;
-            return { id, status };
-        });
+    async findByIdentifier(params) {
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            status: 1
+        };
+        const doc = await this.taskModel.findOne({
+            'project.id': { $eq: params.project.id },
+            name: { $eq: params.name },
+            identifier: { $exists: true, $eq: params.identifier }
+        }, projection)
+            .lean() // lean(2024-09-26~)
+            .exec();
+        if (doc === null) {
+            return;
+        }
+        const { id, status } = doc;
+        return { id, status };
     }
     /**
      * タスク識別子から冪等作成する
      * reimplement createIfNotExistByIdentifier(2025-03-28~)
      */
-    createIfNotExistByAlternateName(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof params.alternateName !== 'string' || params.alternateName.length === 0) {
-                throw new factory.errors.ArgumentNull('alternateName');
-            }
-            let createdTask;
-            const filterQuery = {
-                'project.id': { $eq: params.project.id },
-                name: { $eq: params.name },
-                alternateName: { $exists: true, $eq: params.alternateName }
-            };
-            const projection = {
-                _id: 0,
-                id: { $toString: '$_id' }
-            };
-            try {
-                createdTask = yield this.taskModel.findOneAndUpdate(filterQuery, { $setOnInsert: params }, {
-                    new: true,
-                    upsert: true,
-                    projection
-                })
-                    .lean()
-                    .exec();
-            }
-            catch (error) {
-                let throwsError = true;
-                if (yield (0, errorHandler_1.isMongoError)(error)) {
-                    // すでにalternateNameが存在する場合ok
-                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
-                        throwsError = false;
-                        createdTask = yield this.taskModel.findOne(filterQuery, projection)
-                            .lean()
-                            .exec();
-                    }
-                }
-                if (throwsError) {
-                    throw error;
-                }
-            }
-            if (typeof (createdTask === null || createdTask === void 0 ? void 0 : createdTask.id) === 'string') {
-                if (options.emitImmediately) {
-                    task_1.taskEventEmitter.emitTaskStatusChanged({
-                        id: createdTask.id,
-                        name: params.name,
-                        status: factory.taskStatus.Ready
-                    });
+    async createIfNotExistByAlternateName(params, options) {
+        if (typeof params.alternateName !== 'string' || params.alternateName.length === 0) {
+            throw new factory.errors.ArgumentNull('alternateName');
+        }
+        let createdTask;
+        const filterQuery = {
+            'project.id': { $eq: params.project.id },
+            name: { $eq: params.name },
+            alternateName: { $exists: true, $eq: params.alternateName }
+        };
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' }
+        };
+        try {
+            createdTask = await this.taskModel.findOneAndUpdate(filterQuery, { $setOnInsert: params }, {
+                new: true,
+                upsert: true,
+                projection
+            })
+                .lean()
+                .exec();
+        }
+        catch (error) {
+            let throwsError = true;
+            if (await (0, errorHandler_1.isMongoError)(error)) {
+                // すでにalternateNameが存在する場合ok
+                if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                    throwsError = false;
+                    createdTask = await this.taskModel.findOne(filterQuery, projection)
+                        .lean()
+                        .exec();
                 }
             }
-            else {
-                throw new factory.errors.Internal(`falied in creating a task unexpectedly. ${params.alternateName}`);
-            }
-        });
-    }
-    /**
-     * 取引削除タスク冪等作成
-     */
-    createDeleteTransactionTaskIfNotExist(
-    // resolve uniqueness of identifier(2025-03-27~)
-    params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (params.data.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
-                throw new factory.errors.NotImplemented(`only ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id} implemented`);
+            if (throwsError) {
+                throw error;
             }
-            const createdTask = yield this.taskModel.findOneAndUpdate({
-                'project.id': { $eq: params.project.id },
-                name: { $eq: params.name },
-                'data.object.id': { $exists: true, $eq: params.data.object.id }
-            }, { $setOnInsert: params }, { new: true, upsert: true })
-                .select({ _id: 1 })
-                .exec();
+        }
+        if (typeof createdTask?.id === 'string') {
             if (options.emitImmediately) {
                 task_1.taskEventEmitter.emitTaskStatusChanged({
                     id: createdTask.id,
@@ -323,157 +266,202 @@ class TaskRepo {
                     status: factory.taskStatus.Ready
                 });
             }
-        });
+        }
+        else {
+            throw new factory.errors.Internal(`falied in creating a task unexpectedly. ${params.alternateName}`);
+        }
+    }
+    /**
+     * 取引削除タスク冪等作成
+     */
+    async createDeleteTransactionTaskIfNotExist(
+    // resolve uniqueness of identifier(2025-03-27~)
+    params, options) {
+        if (params.data.object.specifyingMethod !== factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id) {
+            throw new factory.errors.NotImplemented(`only ${factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id} implemented`);
+        }
+        const createdTask = await this.taskModel.findOneAndUpdate({
+            'project.id': { $eq: params.project.id },
+            name: { $eq: params.name },
+            'data.object.id': { $exists: true, $eq: params.data.object.id }
+        }, { $setOnInsert: params }, { new: true, upsert: true })
+            .select({ _id: 1 })
+            .exec();
+        if (options.emitImmediately) {
+            task_1.taskEventEmitter.emitTaskStatusChanged({
+                id: createdTask.id,
+                name: params.name,
+                status: factory.taskStatus.Ready
+            });
+        }
     }
-    createOnAssetTransactionStatusChangedTaskIfNotExist(
+    async createOnAssetTransactionStatusChangedTaskIfNotExist(
     // resolve uniqueness of identifier(2025-03-27~)
     params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const createdTask = yield 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) {
-                task_1.taskEventEmitter.emitTaskStatusChanged({
-                    id: createdTask.id,
-                    name: params.name,
-                    status: factory.taskStatus.Ready
-                });
-            }
-        });
+        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) {
+            task_1.taskEventEmitter.emitTaskStatusChanged({
+                id: createdTask.id,
+                name: params.name,
+                status: factory.taskStatus.Ready
+            });
+        }
     }
     /**
      * Ready -> remainingNumberOfTriesが1減る
      * Running -> findOneするだけ
      */
-    executeOneById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = new Date();
-            let doc;
-            if (params.status === factory.taskStatus.Running) {
-                doc = yield this.taskModel.findOne(Object.assign({ _id: { $eq: params.id }, status: { $eq: params.status }, runsAt: { $lt: now } }, (params.expires instanceof Date) ? { expires: { $gt: now } } : undefined), executableTaskProjection)
-                    .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                    .lean()
-                    .exec();
-            }
-            else {
-                doc = yield this.taskModel.findOneAndUpdate(Object.assign({ _id: { $eq: params.id }, status: { $eq: params.status }, runsAt: { $lt: now } }, (params.expires instanceof Date) ? { expires: { $gt: now } } : undefined), {
-                    $set: {
-                        status: factory.taskStatus.Running, // 実行中に変更
-                        lastTriedAt: now,
-                        executor: params.executor
-                    },
-                    $inc: {
-                        remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                        numberOfTried: 1 // トライ回数増やす
-                    }
-                }, { new: true, projection: executableTaskProjection })
-                    .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                    .lean() // lean(2024-09-26~)
-                    .exec();
-            }
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
-            return doc;
-        });
-    }
-    /**
-     * Readyのタスクをname指定でひとつRunningに変更する
-     */
-    executeOneIfExists(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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 = 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({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined
-                    // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
-                    )
-                }
-                : undefined), {
+    async executeOneById(params) {
+        const now = new Date();
+        let doc;
+        if (params.status === factory.taskStatus.Running) {
+            doc = await this.taskModel.findOne({
+                _id: { $eq: params.id },
+                status: { $eq: params.status },
+                runsAt: { $lt: now },
+                ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined
+            }, executableTaskProjection)
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        }
+        else {
+            doc = await this.taskModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: params.status },
+                runsAt: { $lt: now },
+                ...(params.expires instanceof Date) ? { expires: { $gt: now } } : undefined
+            }, {
                 $set: {
                     status: factory.taskStatus.Running, // 実行中に変更
-                    lastTriedAt: new Date(),
+                    lastTriedAt: now,
                     executor: params.executor
                 },
                 $inc: {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, Object.assign({ new: true, projection: executableTaskProjection }, (typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
-                ? { sort: params.sort }
-                : undefined))
+            }, { new: true, projection: executableTaskProjection })
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean() // lean(2024-09-26~)
                 .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
-            return doc;
-        });
+        }
+        if (doc === null) {
+            return null;
+        }
+        return doc;
+    }
+    /**
+     * Readyのタスクをname指定でひとつRunningに変更する
+     */
+    async executeOneIfExists(params) {
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        const nameEq = params.name?.$eq;
+        // const nameNin = params.name?.$nin;
+        const doc = await this.taskModel.findOneAndUpdate({
+            status: { $eq: factory.taskStatus.Ready },
+            runsAt: { $lt: params.runsAt.$lt },
+            ...(typeof nameEq === 'string')
+                ? {
+                    name: {
+                        ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined
+                        // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined
+                    }
+                }
+                : undefined
+        }, {
+            $set: {
+                status: factory.taskStatus.Running, // 実行中に変更
+                lastTriedAt: new Date(),
+                executor: params.executor
+            },
+            $inc: {
+                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
+                numberOfTried: 1 // トライ回数増やす
+            }
+        }, {
+            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();
+        if (doc === null) {
+            return null;
+        }
+        return doc;
     }
     /**
      * add(2025-03-16~)
      */
-    countPotentiallyRunning(params) {
-        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?.$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(nameIn))
+    async countPotentiallyRunning(params) {
+        const { runsAt, limit, name } = params;
+        const nameEq = name?.$eq;
+        // const nameNin = name?.$nin;
+        const nameIn = name?.$in;
+        if (!(runsAt.$lt instanceof Date)) {
+            throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        const query = this.taskModel.countDocuments({
+            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(nameIn)) ? { $in: nameIn } : undefined)
+                    name: {
+                        ...(typeof nameEq === 'string') ? { $eq: nameEq } : undefined,
+                        // ...(Array.isArray(nameNin)) ? { $nin: nameNin } : undefined,
+                        ...(Array.isArray(nameIn)) ? { $in: nameIn } : undefined
+                    }
                 }
-                : undefined));
-            if (typeof limit === 'number' && limit >= 0) {
-                query.limit(limit);
-            }
-            const count = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-            return { count };
+                : undefined
         });
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
     }
     /**
      * 実行日時を一定期間過ぎたReadyタスクについて、Runningスタータスに変更した上で、Runningイベントを発生させる
      */
-    emitRunningIfExists(params, next // support next function(2025-08-02~)
+    async emitRunningIfExists(params, next // support next function(2025-08-02~)
     ) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!(params.runsAt.$lt instanceof Date)) {
-                throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
-            }
-            const projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                name: 1
-            };
-            const nameEq = (_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq;
-            // const nameNin = params.name?.$nin;
-            // const nameIn = params.name?.$in;
-            const { nameFilterBeforeRunsAt } = params;
-            const filter = Object.assign(Object.assign(Object.assign({ status: { $eq: factory.taskStatus.Ready } }, (nameFilterBeforeRunsAt) ? { name: params.name } : undefined), { runsAt: { $lt: params.runsAt.$lt } }), (!nameFilterBeforeRunsAt) ? { name: params.name } : undefined
+        if (!(params.runsAt.$lt instanceof Date)) {
+            throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            name: 1
+        };
+        const nameEq = params.name?.$eq;
+        // const nameNin = params.name?.$nin;
+        // const nameIn = params.name?.$in;
+        const { nameFilterBeforeRunsAt } = params;
+        const filter = {
+            status: { $eq: factory.taskStatus.Ready },
+            ...(nameFilterBeforeRunsAt) ? { name: params.name } : undefined,
+            runsAt: { $lt: params.runsAt.$lt },
+            ...(!nameFilterBeforeRunsAt) ? { name: params.name } : undefined
             // ...(typeof nameEq === 'string' || Array.isArray(nameIn))
             //     ? {
             //         name: {
@@ -483,109 +471,114 @@ class TaskRepo {
             //         }
             //     }
             //     : undefined
-            );
-            const doc = yield this.taskModel.findOneAndUpdate(filter, {
-                $set: {
-                    status: factory.taskStatus.Running, // 実行中に変更
-                    lastTriedAt: new Date(),
-                    executor: params.executor
-                },
-                $inc: {
-                    remainingNumberOfTries: -1, // 残りトライ可能回数減らす
-                    numberOfTried: 1 // トライ回数増やす
-                }
-            }, Object.assign({ new: true, projection }, (typeof params.sort.numberOfTried === 'number' || typeof params.sort.runsAt === 'number')
+        };
+        const doc = await this.taskModel.findOneAndUpdate(filter, {
+            $set: {
+                status: factory.taskStatus.Running, // 実行中に変更
+                lastTriedAt: new Date(),
+                executor: params.executor
+            },
+            $inc: {
+                remainingNumberOfTries: -1, // 残りトライ可能回数減らす
+                numberOfTried: 1 // トライ回数増やす
+            }
+        }, {
+            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();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
-            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;
-        });
+                : undefined
+        })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean()
+            .exec();
+        if (doc === null) {
+            return null;
+        }
+        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;
     }
     /**
      * Readyのままで期限切れのタスクをExpiredに変更する
      */
-    makeExpiredMany(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { expiresLt } = params;
-            if (!(expiresLt instanceof Date)) {
-                throw new factory.errors.Argument('expiresLt', 'must be Date');
-            }
-            return this.taskModel.updateMany({
-                status: { $eq: factory.taskStatus.Ready },
-                expires: { $exists: true, $lt: expiresLt }
-            }, {
-                $set: {
-                    status: factory.taskStatus.Expired
-                }
-            })
-                .exec();
-        });
+    async makeExpiredMany(params) {
+        const { expiresLt } = params;
+        if (!(expiresLt instanceof Date)) {
+            throw new factory.errors.Argument('expiresLt', 'must be Date');
+        }
+        return this.taskModel.updateMany({
+            status: { $eq: factory.taskStatus.Ready },
+            expires: { $exists: true, $lt: expiresLt }
+        }, {
+            $set: {
+                status: factory.taskStatus.Expired
+            }
+        })
+            .exec();
     }
     /**
      * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
      */
-    retryMany(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastTriedAtShoudBeLessThan = moment()
-                .add(-params.intervalInMinutes, 'minutes')
-                .toDate();
-            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
-                } }, (typeof remainingNumberOfTriesGte === 'number')
+    async retryMany(params) {
+        const lastTriedAtShoudBeLessThan = moment()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        const remainingNumberOfTriesGte = params.remainingNumberOfTries.$gte;
+        const remainingNumberOfTriesLte = params.remainingNumberOfTries.$lte;
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            ...(typeof remainingNumberOfTriesGte === 'number')
                 ? { remainingNumberOfTries: { $gte: remainingNumberOfTriesGte } }
-                : undefined), (typeof remainingNumberOfTriesLte === 'number')
+                : undefined,
+            ...(typeof remainingNumberOfTriesLte === 'number')
                 ? { remainingNumberOfTries: { $lte: remainingNumberOfTriesLte } }
-                : undefined), (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), {
-                $set: {
-                    status: factory.taskStatus.Ready // 実行前に変更
-                }
-            })
-                .exec();
-        });
+                : undefined,
+            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
+        }, {
+            $set: {
+                status: factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
     }
     /**
      * 実行中止済タスクを強制的にリトライ
      * 中止済タスクでなければ何もしない
      */
-    retryForciblyIfAborted(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.taskModel.updateOne({
-                _id: { $eq: params.id },
-                status: { $eq: factory.taskStatus.Aborted }
-            }, {
-                $set: {
-                    status: factory.taskStatus.Ready
-                },
-                $inc: {
-                    remainingNumberOfTries: params.remainingNumberOfTries
-                }
-            })
-                .exec();
-        });
+    async retryForciblyIfAborted(params) {
+        return this.taskModel.updateOne({
+            _id: { $eq: params.id },
+            status: { $eq: factory.taskStatus.Aborted }
+        }, {
+            $set: {
+                status: factory.taskStatus.Ready
+            },
+            $inc: {
+                remainingNumberOfTries: params.remainingNumberOfTries
+            }
+        })
+            .exec();
     }
     // public async abortOne(params: {
     //     intervalInMinutes: number;
@@ -623,278 +616,276 @@ class TaskRepo {
     //     }
     //     return doc;
     // }
-    abortMany(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastTriedAtShoudBeLessThan = moment()
-                .add(-params.intervalInMinutes, 'minutes')
-                .toDate();
-            return this.taskModel.updateMany(Object.assign({ status: { $eq: factory.taskStatus.Running }, lastTriedAt: {
-                    $type: 'date',
-                    $lt: lastTriedAtShoudBeLessThan
-                }, remainingNumberOfTries: { $eq: 0 } }, (Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined), {
-                $set: {
-                    status: factory.taskStatus.Aborted,
-                    dateAborted: new Date()
-                }
-            })
-                .exec();
-        });
+    async abortMany(params) {
+        const lastTriedAtShoudBeLessThan = moment()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany({
+            status: { $eq: factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            remainingNumberOfTries: { $eq: 0 },
+            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
+        }, {
+            $set: {
+                status: factory.taskStatus.Aborted,
+                dateAborted: new Date()
+            }
+        })
+            .exec();
     }
     /**
      * タスクIDから実行結果とステータスを保管する
      * Abortedの場合、dateAbortedもセットする
      */
-    setExecutionResultAndStatus(params, update, 
+    async setExecutionResultAndStatus(params, update, 
     // support customr function(2025-05-25~)
     next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { id, remainingNumberOfTries, name } = params;
-            const { status, executionResult } = update;
-            yield this.taskModel.updateOne({ _id: { $eq: id } }, {
-                $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') {
-                const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
-                task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
-            }
-        });
+        const { id, remainingNumberOfTries, name } = params;
+        const { status, executionResult } = update;
+        await this.taskModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                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') {
+            const changedTask = { id, name, status, remainingNumberOfTries, executionResult };
+            task_1.taskEventEmitter.emitTaskStatusChanged(changedTask, next);
+        }
     }
-    count(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { limit } = params;
-            const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.taskModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {});
-            if (typeof limit === 'number' && limit >= 0) {
-                query.limit(limit);
-            }
-            const count = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-            return { count };
-        });
+    async count(params) {
+        const { limit } = params;
+        const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
+        const query = this.taskModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {});
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
     }
     /**
      * 検索する
      */
-    projectFields(params, 
+    async projectFields(params, 
     // projection?: IProjection
     inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
-            // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
-            //     ? Object.values(projection)
-            //         .some((value) => value !== 0)
-            //     : false;
-            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
-            }
-            else {
-                // no op
-            }
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                query.limit(params.limit)
-                    .skip(params.limit * (page - 1));
-            }
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.runsAt) !== undefined) {
-                query.sort({ runsAt: params.sort.runsAt });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // lean(2024-09-26~)
-                .exec();
-        });
+        const conditions = TaskRepo.CREATE_MONGO_CONDITIONS(params);
+        // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
+        //     ? Object.values(projection)
+        //         .some((value) => value !== 0)
+        //     : false;
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        else {
+            // no op
+        }
+        const projection = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            ...Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))
+        };
+        const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+        if (typeof params.limit === 'number' && params.limit > 0) {
+            const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            query.limit(params.limit)
+                .skip(params.limit * (page - 1));
+        }
+        if (params.sort?.runsAt !== undefined) {
+            query.sort({ runsAt: params.sort.runsAt });
+        }
+        return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .lean() // lean(2024-09-26~)
+            .exec();
     }
-    deleteByProject(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.taskModel.deleteMany({
-                'project.id': { $eq: params.project.id }
-            })
-                .exec();
-        });
+    async deleteByProject(params) {
+        await this.taskModel.deleteMany({
+            'project.id': { $eq: params.project.id }
+        })
+            .exec();
     }
-    deleteByName(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            return this.taskModel.deleteMany(Object.assign(Object.assign({ name: { $eq: params.name } }, (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: { $eq: params.status.$eq } } : undefined), (((_b = params.runsAt) === null || _b === void 0 ? void 0 : _b.$gte) instanceof Date)
+    async deleteByName(params) {
+        return this.taskModel.deleteMany({
+            name: { $eq: params.name },
+            ...(typeof params.status?.$eq === 'string') ? { status: { $eq: params.status.$eq } } : undefined,
+            ...(params.runsAt?.$gte instanceof Date)
                 ? {
                     runsAt: { $gte: params.runsAt.$gte, $lte: params.runsAt.$lte }
                 }
-                : undefined))
-                .exec();
-        });
+                : undefined
+        })
+            .exec();
     }
     /**
      * 不要なタスクを削除する
      */
-    deleteRunsAtPassedCertainPeriod(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.taskModel.deleteMany({
-                runsAt: { $lt: params.runsAt.$lt },
-                status: {
-                    $in: [
-                        factory.taskStatus.Aborted,
-                        factory.taskStatus.Executed,
-                        factory.taskStatus.Expired
-                    ]
-                }
-            })
-                .exec();
-        });
+    async deleteRunsAtPassedCertainPeriod(params) {
+        return this.taskModel.deleteMany({
+            runsAt: { $lt: params.runsAt.$lt },
+            status: {
+                $in: [
+                    factory.taskStatus.Aborted,
+                    factory.taskStatus.Executed,
+                    factory.taskStatus.Expired
+                ]
+            }
+        })
+            .exec();
     }
-    countDelayedTasks(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { limit } = params;
-            const runsAtLt = moment()
-                .add(-params.delayInSeconds, 'seconds')
-                .toDate();
-            const query = this.taskModel.countDocuments(Object.assign({ status: { $eq: factory.taskStatus.Ready }, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined));
-            if (typeof limit === 'number' && limit >= 0) {
-                query.limit(limit);
-            }
-            const count = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-            return { count };
+    async countDelayedTasks(params) {
+        const { limit } = params;
+        const runsAtLt = moment()
+            .add(-params.delayInSeconds, 'seconds')
+            .toDate();
+        const query = this.taskModel.countDocuments({
+            status: { $eq: factory.taskStatus.Ready },
+            runsAt: { $lt: runsAtLt },
+            ...(Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : undefined
         });
+        if (typeof limit === 'number' && limit >= 0) {
+            query.limit(limit);
+        }
+        const count = await query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
+        return { count };
     }
     getCursor(conditions, projection) {
         return this.taskModel.find(conditions, projection)
             .sort({ runsAt: factory.sortType.Ascending })
             .cursor();
     }
-    unsetUnnecessaryFields(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.taskModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
-                .exec();
-        });
+    async unsetUnnecessaryFields(params) {
+        return this.taskModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
+            .exec();
     }
-    aggregateTask(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const statuses = yield Promise.all([
-                factory.taskStatus.Executed,
-                factory.taskStatus.Aborted
-            ].map((taskStatus) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                const matchConditions = Object.assign({ 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')
+    async aggregateTask(params) {
+        const statuses = await Promise.all([
+            factory.taskStatus.Executed,
+            factory.taskStatus.Aborted
+        ].map(async (taskStatus) => {
+            const matchConditions = {
+                runsAt: {
+                    $gte: params.runsFrom,
+                    $lte: params.runsThrough
+                },
+                status: { $eq: taskStatus },
+                ...(typeof params.project?.id?.$ne === 'string')
                     ? { 'project.id': { $ne: params.project.id.$ne } }
-                    : undefined);
-                return this.agggregateByStatus({ matchConditions, status: taskStatus });
-            })));
-            return { statuses };
-        });
+                    : undefined
+            };
+            return this.agggregateByStatus({ matchConditions, status: taskStatus });
+        }));
+        return { statuses };
     }
-    // tslint:disable-next-line:max-func-body-length
-    agggregateByStatus(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const matchConditions = params.matchConditions;
-            const taskStatus = params.status;
-            const aggregate1 = this.taskModel.aggregate([
-                {
-                    $match: matchConditions
-                },
-                {
-                    $project: {
-                        latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
-                        status: '$status',
-                        runsAt: '$runsAt',
-                        lastTriedAt: '$lastTriedAt'
-                    }
-                },
-                {
-                    $group: {
-                        _id: '$status',
-                        taskCount: { $sum: 1 },
-                        maxLatency: { $max: '$latency' },
-                        minLatency: { $min: '$latency' },
-                        avgLatency: { $avg: '$latency' }
-                    }
-                },
-                {
-                    $project: {
-                        _id: 0,
-                        taskCount: '$taskCount',
-                        avgLatency: '$avgLatency',
-                        maxLatency: '$maxLatency',
-                        minLatency: '$minLatency'
-                    }
+    async agggregateByStatus(params) {
+        const matchConditions = params.matchConditions;
+        const taskStatus = params.status;
+        const aggregate1 = this.taskModel.aggregate([
+            {
+                $match: matchConditions
+            },
+            {
+                $project: {
+                    latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
+                    status: '$status',
+                    runsAt: '$runsAt',
+                    lastTriedAt: '$lastTriedAt'
                 }
-            ]);
-            // 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) {
-                return {
-                    status: taskStatus,
-                    aggregation: {
-                        taskCount: 0,
-                        avgLatency: 0,
-                        maxLatency: 0,
-                        minLatency: 0,
-                        percentilesLatency: percents.map((percent) => {
-                            return {
-                                name: String(percent),
-                                value: 0
-                            };
-                        })
-                    }
-                };
-            }
-            const ranks4percentile = percents.map((percentile) => {
-                return {
-                    percentile,
-                    // tslint:disable-next-line:no-magic-numbers
-                    rank: Math.floor(aggregations[0].taskCount * percentile / 100)
-                };
-            });
-            const aggregate2 = this.taskModel.aggregate([
-                {
-                    $match: matchConditions
-                },
-                {
-                    $project: {
-                        latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
-                        status: '$status',
-                        runsAt: '$runsAt',
-                        lastTriedAt: '$lastTriedAt'
-                    }
-                },
-                { $sort: { latency: 1 } },
-                {
-                    $group: {
-                        _id: '$status',
-                        latencies: { $push: '$latency' }
-                    }
-                },
-                {
-                    $project: {
-                        _id: 0,
-                        percentilesLatency: ranks4percentile.map((rank) => {
-                            return {
-                                name: String(rank.percentile),
-                                value: { $arrayElemAt: ['$latencies', rank.rank] }
-                            };
-                        })
-                    }
+            },
+            {
+                $group: {
+                    _id: '$status',
+                    taskCount: { $sum: 1 },
+                    maxLatency: { $max: '$latency' },
+                    minLatency: { $min: '$latency' },
+                    avgLatency: { $avg: '$latency' }
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    taskCount: '$taskCount',
+                    avgLatency: '$avgLatency',
+                    maxLatency: '$maxLatency',
+                    minLatency: '$minLatency'
                 }
-            ]);
-            const aggregations2 = yield aggregate2.exec();
+            }
+        ]);
+        // const explainResult = await aggregate1.explain();
+        // console.dir(explainResult, { depth: null });
+        // return;
+        const aggregations = await aggregate1.exec();
+        const percents = [50, 95, 99];
+        if (aggregations.length === 0) {
             return {
                 status: taskStatus,
-                aggregation: Object.assign(Object.assign({}, aggregations[0]), aggregations2[0])
+                aggregation: {
+                    taskCount: 0,
+                    avgLatency: 0,
+                    maxLatency: 0,
+                    minLatency: 0,
+                    percentilesLatency: percents.map((percent) => {
+                        return {
+                            name: String(percent),
+                            value: 0
+                        };
+                    })
+                }
+            };
+        }
+        const ranks4percentile = percents.map((percentile) => {
+            return {
+                percentile,
+                rank: Math.floor(aggregations[0].taskCount * percentile / 100)
             };
         });
+        const aggregate2 = this.taskModel.aggregate([
+            {
+                $match: matchConditions
+            },
+            {
+                $project: {
+                    latency: { $subtract: ['$lastTriedAt', '$runsAt'] },
+                    status: '$status',
+                    runsAt: '$runsAt',
+                    lastTriedAt: '$lastTriedAt'
+                }
+            },
+            { $sort: { latency: 1 } },
+            {
+                $group: {
+                    _id: '$status',
+                    latencies: { $push: '$latency' }
+                }
+            },
+            {
+                $project: {
+                    _id: 0,
+                    percentilesLatency: ranks4percentile.map((rank) => {
+                        return {
+                            name: String(rank.percentile),
+                            value: { $arrayElemAt: ['$latencies', rank.rank] }
+                        };
+                    })
+                }
+            }
+        ]);
+        const aggregations2 = await aggregate2.exec();
+        return {
+            status: taskStatus,
+            aggregation: {
+                ...aggregations[0],
+                ...aggregations2[0]
+            }
+        };
     }
 }
 exports.TaskRepo = TaskRepo;