@chevre/domain 22.9.0-alpha.50 → 22.9.0-alpha.52

package/example/src/chevre/makeExpiredManyTasks.ts

@@ -0,0 +1,27 @@
+// tslint:disable:no-implicit-dependencies no-console
+import { chevre } from '../../../lib/index';
+
+import * as  moment from 'moment';
+import * as  mongoose from 'mongoose';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const expiresLt = moment()
+        .add(-1, 'hour')
+        .toDate();
+    const result = await taskRepo.makeExpiredMany({
+        expiresLt
+    });
+    console.log('result:', result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -94,6 +94,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { expires: 1, runsAt: -1 },
+        {
+            name: 'expires',
+            partialFilterExpression: {
+                expires: { $exists: true }
+            }
+        }
+    ],
     [
         { remainingNumberOfTries: 1, runsAt: -1 },
         { name: 'searchByRemainingNumberOfTries-v2' }

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

@@ -78,9 +78,9 @@ export declare class TaskRepo {
         };
     }): Promise<IExecutableTask<T> | null>;
     /**
-     * 一定期間遅延したタスクを実行する
+     * emit OnTaskStatusChanged on delayed tasks
      */
-    executeTasks(params: {
+    emitDelayedTasksEvent(params: {
         now: Date;
         /**
          * 指定期間遅延しているタスクを実行する
@@ -98,6 +98,12 @@ export declare class TaskRepo {
             $nin?: factory.taskName[];
         };
     }): Promise<IDelayedTask[]>;
+    /**
+     * make tasks expired
+     */
+    makeExpiredMany(params: {
+        expiresLt: Date;
+    }): Promise<UpdateWriteOpResult>;
     /**
      * 実行中ステータスのままになっているタスクをリトライする
      */

package/lib/chevre/repo/task.js

@@ -436,9 +436,9 @@ class TaskRepo {
         });
     }
     /**
-     * 一定期間遅延したタスクを実行する
+     * emit OnTaskStatusChanged on delayed tasks
      */
-    executeTasks(params) {
+    emitDelayedTasksEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const runsAtLt = moment(params.now)
                 .add(-params.delayInSeconds, 'seconds')
@@ -450,12 +450,8 @@ class TaskRepo {
                 status: 1
             };
             const delayedTasks = yield this.taskModel.find(Object.assign(Object.assign({ 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)
-                // .select({
-                //     _id: 1,
-                //     name: 1,
-                //     status: 1
-                // })
                 .limit(params.limit)
+                .sort(sortOrder4executionOfTasks) // sort(2025-03-03~)
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean() // lean(2024-09-26~)
                 .exec();
@@ -471,6 +467,26 @@ class TaskRepo {
             return delayedTasks;
         });
     }
+    /**
+     * make tasks 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();
+        });
+    }
     /**
      * 実行中ステータスのままになっているタスクをリトライする
      */

package/lib/chevre/repo/transaction.js

@@ -701,6 +701,9 @@ class TransactionRepo {
             if (typeof params.limit !== 'number' || params.limit === 0) {
                 throw new factory.errors.ArgumentNull('limit');
             }
+            const sort = {
+                startDate: factory.sortType.Ascending
+            };
             // IDをemitしたいのでまずリスト検索(2023-04-27~)
             const expiringTransactions = yield this.transactionModel.find({
                 status: { $eq: factory.transactionStatusType.InProgress },
@@ -712,6 +715,7 @@ class TransactionRepo {
                 typeOf: 1
             })
                 .limit(params.limit)
+                .sort(sort) // sort(2025-03-03~)
                 .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .lean()
                 .exec();

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.393.0-alpha.35",
+    "@chevre/factory": "4.393.0-alpha.36",
     "@cinerino/sdk": "10.21.0-alpha.23",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -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.50"
+  "version": "22.9.0-alpha.52"
 }

package/example/src/chevre/retryTasks.ts

@@ -1,41 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  moment from 'moment';
-import * as  mongoose from 'mongoose';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
-    const result = await taskRepo.taskModel.updateMany(
-        {
-            // _id: { $eq: '673b5f8f5735a0a2dc953cfc' },
-            'project.id': { $eq: project.id },
-            status: { $eq: chevre.factory.taskStatus.Aborted },
-            lastTriedAt: {
-                $gt: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-2, 'days')
-                    .toDate()
-            },
-            name: { $eq: chevre.factory.taskName.VoidPayment }
-        },
-        {
-            $set: {
-                status: chevre.factory.taskStatus.Ready,
-                remainingNumberOfTries: 3
-            }
-        }
-    )
-        .exec();
-    console.log('result:', result);
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);