@chevre/domain 22.11.0-alpha.20 → 22.11.0-alpha.22

package/example/src/chevre/reIndex.ts

@@ -11,7 +11,7 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.Member.createInstance(mongoose.connection);
+    await chevre.repository.Task.createInstance(mongoose.connection);
     console.log('success!');
 }
 

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -186,6 +186,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { status: 1, lastTriedAt: 1, remainingNumberOfTries: 1, name: 1 },
+        {
+            name: 'abortMany',
+            partialFilterExpression: {
+                lastTriedAt: { $type: 'date' }
+            }
+        }
+    ],
     [
         { status: 1, expires: 1 },
         {

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

@@ -150,7 +150,11 @@ export declare class TaskRepo {
          * 十分に小さい数値を指定すれば、実質残り試行回数に関係なくRunningがReadyに変更されることになる
          */
         remainingNumberOfTries: {
-            $gt: number;
+            $gte?: number;
+            $lte?: number;
+        };
+        name: {
+            $in?: factory.taskName[];
         };
     }): Promise<UpdateWriteOpResult>;
     /**
@@ -163,6 +167,9 @@ export declare class TaskRepo {
     }): Promise<UpdateWriteOpResult>;
     abortMany(params: {
         intervalInMinutes: number;
+        name: {
+            $in?: factory.taskName[];
+        };
     }): Promise<UpdateWriteOpResult>;
     /**
      * タスクIDから実行結果とステータスを保管する

package/lib/chevre/repo/task.js

@@ -626,18 +626,16 @@ class TaskRepo {
             const lastTriedAtShoudBeLessThan = moment()
                 .add(-params.intervalInMinutes, 'minutes')
                 .toDate();
-            const remainingNumberOfTriesGt = params.remainingNumberOfTries.$gt;
-            return this.taskModel.updateMany(
-            // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
-            // @see schemas/task
-            {
-                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: remainingNumberOfTriesGt }
-            }, {
+                } }, (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 // 実行前に変更
                 }
@@ -706,14 +704,10 @@ class TaskRepo {
             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()

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.20"
+  "version": "22.11.0-alpha.22"
 }