@chevre/domain 22.9.0-alpha.57 → 22.9.0-alpha.58

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

@@ -86,6 +86,15 @@ export declare class TaskRepo {
             $lt: Date;
         };
     }): Promise<IExecutableTask<factory.taskName> | null>;
+    findExecutableOne(params: {
+        name?: {
+            $eq?: factory.taskName;
+            $nin?: factory.taskName[];
+        };
+        runsAt: {
+            $lt: Date;
+        };
+    }): Promise<IExecutableTask<factory.taskName> | null>;
     /**
      * emit OnTaskStatusChanged on delayed tasks
      */

package/lib/chevre/repo/task.js

@@ -22,6 +22,19 @@ const sortOrder4executionOfTasks = {
     numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先
     runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
 };
+const executableTaskProjection = {
+    _id: 0,
+    id: { $toString: '$_id' },
+    // 必要最低限にprojection(2024-04-23~)
+    data: 1,
+    name: 1,
+    status: 1,
+    numberOfTried: 1,
+    project: 1,
+    remainingNumberOfTries: 1,
+    runsAt: 1,
+    expires: 1
+};
 // type IProjection = { [key in IKeyOfProjection]?: 0 | 1; };
 const AVAILABLE_PROJECT_FIELDS = [
     'identifier',
@@ -358,19 +371,6 @@ class TaskRepo {
     }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                // 必要最低限にprojection(2024-04-23~)
-                data: 1,
-                name: 1,
-                status: 1,
-                numberOfTried: 1,
-                project: 1,
-                remainingNumberOfTries: 1,
-                runsAt: 1,
-                expires: 1
-            };
             const doc = yield this.taskModel.findOneAndUpdate({
                 status: { $eq: factory.taskStatus.Ready },
                 runsAt: { $lt: new Date() },
@@ -385,7 +385,7 @@ class TaskRepo {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, { new: true, projection })
+            }, { new: true, projection: executableTaskProjection })
                 .lean() // lean(2024-09-26~)
                 .exec();
             if (doc === null) {
@@ -404,19 +404,6 @@ class TaskRepo {
             if (!(params.runsAt.$lt instanceof Date)) {
                 throw new factory.errors.Argument('runsAt.$lt', 'must be Date');
             }
-            const projection = {
-                _id: 0,
-                id: { $toString: '$_id' },
-                // 必要最低限にprojection(2024-04-23~)
-                data: 1,
-                name: 1,
-                status: 1,
-                numberOfTried: 1,
-                project: 1,
-                remainingNumberOfTries: 1,
-                runsAt: 1,
-                expires: 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))
@@ -433,7 +420,7 @@ class TaskRepo {
                     remainingNumberOfTries: -1, // 残りトライ可能回数減らす
                     numberOfTried: 1 // トライ回数増やす
                 }
-            }, { new: true, projection })
+            }, { new: true, projection: executableTaskProjection })
                 .sort(sortOrder4executionOfTasks)
                 .lean() // lean(2024-09-26~)
                 .exec();
@@ -444,6 +431,29 @@ class TaskRepo {
             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');
+            }
+            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.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(sortOrder4executionOfTasks)
+                .lean()
+                .exec();
+            if (doc === null) {
+                // tslint:disable-next-line:no-null-keyword
+                return null;
+            }
+            return doc;
+        });
+    }
     /**
      * emit OnTaskStatusChanged on delayed tasks
      */

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.57"
+  "version": "22.9.0-alpha.58"
 }