@chevre/domain 22.11.0-alpha.23 → 22.11.0-alpha.24

package/example/src/chevre/task/countPotentiallyRunning.ts

@@ -0,0 +1,41 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+const excludedTaskNames = [
+    chevre.factory.taskName.DeleteTransaction,
+    chevre.factory.taskName.ImportEventCapacitiesFromCOA,
+    chevre.factory.taskName.ImportEventsFromCOA,
+    chevre.factory.taskName.AcceptCOAOffer,
+    chevre.factory.taskName.CheckMovieTicket,
+    chevre.factory.taskName.AuthorizePayment,
+    chevre.factory.taskName.PublishPaymentUrl
+];
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    let allTaskNames = Object.values(chevre.factory.taskName);
+    allTaskNames = allTaskNames.filter((taskName) => !excludedTaskNames.includes(taskName));
+    console.log('allTaskNames:', allTaskNames, allTaskNames.length);
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const result = await taskRepo.countPotentiallyRunning({
+        name: {
+            $in: allTaskNames
+        },
+        runsAt: { $lt: new Date() },
+        limit: 100
+    });
+    console.log('result:', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -103,7 +103,7 @@ export declare class TaskRepo {
     countPotentiallyRunning(params: {
         name?: {
             $eq?: factory.taskName;
-            $nin?: factory.taskName[];
+            $in?: factory.taskName[];
         };
         runsAt: {
             $lt: Date;
@@ -118,7 +118,7 @@ export declare class TaskRepo {
     emitRunningIfExists(params: {
         name?: {
             $eq?: factory.taskName;
-            $nin?: factory.taskName[];
+            $in?: factory.taskName[];
         };
         executor: {
             name: string;
@@ -127,7 +127,6 @@ export declare class TaskRepo {
             $lt: Date;
         };
         sort: {
-            numberOfTried?: factory.sortType;
             runsAt: factory.sortType;
         };
     }, next?: INextFunction): Promise<Pick<factory.task.ITask<factory.taskName>, 'id' | 'name'> | null>;

package/lib/chevre/repo/task.js

@@ -31,7 +31,7 @@ const task_2 = require("./mongoose/schemas/task");
  * タスク実行時のソート条件
  */
 const sortOrder4executionOfTasks = {
-    numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先
+    // numberOfTried: factory.sortType.Ascending, // トライ回数の少なさ優先 // discontinue(2025-08-06~)
     runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
 };
 const executableTaskProjection = {
@@ -433,13 +433,14 @@ class TaskRepo {
         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 === null || name === void 0 ? void 0 : name.$nin;
+            // 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(nameNin))
+            const query = this.taskModel.countDocuments(Object.assign({ 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(nameNin)) ? { $nin: nameNin } : undefined)
+                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameIn)) ? { $in: nameIn } : undefined)
                 }
                 : undefined));
             if (typeof limit === 'number' && limit >= 0) {
@@ -466,10 +467,11 @@ class TaskRepo {
                 name: 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))
+            // const nameNin = params.name?.$nin;
+            const nameIn = (_b = params.name) === null || _b === void 0 ? void 0 : _b.$in;
+            const doc = yield this.taskModel.findOneAndUpdate(Object.assign({ 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(nameNin)) ? { $nin: nameNin } : undefined)
+                    name: Object.assign(Object.assign({}, (typeof nameEq === 'string') ? { $eq: nameEq } : undefined), (Array.isArray(nameIn)) ? { $in: nameIn } : undefined)
                 }
                 : undefined), {
                 $set: {

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.23"
+  "version": "22.11.0-alpha.24"
 }