@chevre/domain 26.0.0-alpha.21 → 26.0.0-alpha.23

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

@@ -4,6 +4,8 @@ import { IDocType } from './mongoose/schemas/task';
 type IKeyOfProjection = keyof factory.task.ITask<factory.taskName>;
 type IFindParams = factory.task.ISearchConditions & {
     data?: never;
+    lastTriedFrom?: never;
+    lastTriedThrough?: never;
 };
 /**
  * タスク管理リポジトリ

package/lib/chevre/repo/adminTask.js

@@ -68,12 +68,12 @@ class AdminTaskRepo {
         if (params.runsThrough instanceof Date) {
             andConditions.push({ runsAt: { $lte: params.runsThrough } });
         }
-        if (params.lastTriedFrom instanceof Date) {
-            andConditions.push({ lastTriedAt: { $type: 'date', $gte: params.lastTriedFrom } });
-        }
-        if (params.lastTriedThrough instanceof Date) {
-            andConditions.push({ lastTriedAt: { $type: 'date', $lte: params.lastTriedThrough } });
-        }
+        // if (params.lastTriedFrom instanceof Date) {
+        //     andConditions.push({ lastTriedAt: { $type: 'date', $gte: params.lastTriedFrom } });
+        // }
+        // if (params.lastTriedThrough instanceof Date) {
+        //     andConditions.push({ lastTriedAt: { $type: 'date', $lte: params.lastTriedThrough } });
+        // }
         const dateAbortedGte = params.dateAborted?.$gte;
         if (dateAbortedGte instanceof Date) {
             andConditions.push({ dateAborted: { $type: 'date', $gte: dateAbortedGte } });

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

@@ -4,6 +4,7 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
+const factory_1 = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'Task';
 exports.modelName = modelName;
@@ -51,19 +52,19 @@ const schemaOptions = {
 const indexes = [
     [
         { 'project.id': 1, runsAt: -1 },
-        { name: 'searchByProjectId-v20220721' }
+        { name: 'searchByProjectId-v20220721' } // タスク検索で使用中
     ],
     [
         { name: 1, runsAt: -1 },
-        { name: 'searchByName-v2' }
+        { name: 'searchByName-v2' } // タスク検索で使用中
     ],
     [
         { status: 1, runsAt: -1 },
-        { name: 'searchByStatus-v2' }
+        { name: 'searchByStatus-v2' } // タスク検索で使用中
     ],
     [
         { runsAt: -1 },
-        { name: 'searchByRunsAt-v2' }
+        { name: 'searchByRunsAt-v2' } // タスク検索で使用中
     ],
     // identifierはユニークインデックス有なので不要(2026-08-07~)
     // [
@@ -79,25 +80,27 @@ const indexes = [
     [
         { dateAborted: 1, runsAt: -1 },
         {
-            name: 'searchByDateAborted',
+            name: 'searchByDateAborted', // notifyAbortedTasksByEmailで使用中
             partialFilterExpression: {
                 dateAborted: { $type: 'date' }
             }
         }
     ],
-    [
-        { lastTriedAt: 1, runsAt: -1 },
-        {
-            name: 'searchByLastTriedAt-v2',
-            partialFilterExpression: {
-                lastTriedAt: { $type: 'date' }
-            }
-        }
-    ],
-    [
-        { remainingNumberOfTries: 1, runsAt: -1 },
-        { name: 'searchByRemainingNumberOfTries-v2' }
-    ],
+    // discontinue(2026-08-08~)
+    // [
+    //     { lastTriedAt: 1, runsAt: -1 },
+    //     {
+    //         name: 'searchByLastTriedAt-v2',
+    //         partialFilterExpression: {
+    //             lastTriedAt: { $type: 'date' }
+    //         }
+    //     }
+    // ],
+    // discontinue(2026-08-08~)
+    // [
+    //     { remainingNumberOfTries: 1, runsAt: -1 },
+    //     { name: 'searchByRemainingNumberOfTries-v2' }
+    // ],
     [
         { 'data.id': 1, runsAt: -1 },
         {
@@ -107,10 +110,11 @@ const indexes = [
             }
         }
     ],
-    [
-        { status: 1, name: 1, numberOfTried: 1, runsAt: 1 },
-        { name: 'executeOneByName' }
-    ],
+    // 遅延タスク実行時のソート条件をrunsAtのみに統一したため、numberOfTriedを含めたインデックスはもう不要(2026-08-08~)
+    // [
+    //     { status: 1, name: 1, numberOfTried: 1, runsAt: 1 },
+    //     { name: 'executeOneByName' }
+    // ],
     [
         { status: 1, runsAt: 1, name: 1 },
         { name: 'executeOneByNameIfExists' } // add(2025-03-08~)
@@ -220,6 +224,27 @@ const indexes = [
     // ],
 ];
 exports.indexes = indexes;
+const EXPIRE_AFTER_SECONDS = typeof process.env.TASK_EXPIRE_AFTER_SECONDS === 'string'
+    ? Number(process.env.TASK_EXPIRE_AFTER_SECONDS)
+    : undefined;
+// 0より大きい数値が設定されている場合のみ ttlインデックスを追加
+if (typeof EXPIRE_AFTER_SECONDS === 'number' && EXPIRE_AFTER_SECONDS > 0) {
+    indexes.push([
+        { runsAt: 1 },
+        {
+            name: 'ttlByRunsAt',
+            expireAfterSeconds: EXPIRE_AFTER_SECONDS,
+            partialFilterExpression: {
+                status: {
+                    $in: [
+                        factory_1.factory.taskStatus.Aborted,
+                        factory_1.factory.taskStatus.Executed
+                    ]
+                }
+            }
+        }
+    ]);
+}
 /**
  * タスクスキーマ
  */

package/lib/chevre/repo/taskDelayed.js

@@ -85,7 +85,7 @@ class TaskDelayedRepo {
         if (!(params.runsAt.$lt instanceof Date)) {
             throw new factory_1.factory.errors.Argument('runsAt.$lt', 'must be Date');
         }
-        // インデックスについては、name指定であれば'executeOneByName'あるいは'runDelayedTaskByName'を想定
+        // インデックスについては、name指定であれば'runDelayedTaskByName'を想定
         const filter = {
             status: { $eq: factory_1.factory.taskStatus.Ready },
             name: params.name,

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.3.0-alpha.0",
+    "@chevre/factory": "10.3.0-alpha.1",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.21"
+  "version": "26.0.0-alpha.23"
 }