@chevre/domain 22.9.0-alpha.51 → 22.9.0-alpha.53

package/example/src/chevre/{makeExpired.ts → makeTransactionExpired.ts}

@@ -11,14 +11,13 @@ async function main() {
 
     const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
 
-    const result = await transactionRepo.makeExpired({
+    const result = await transactionRepo.makeOneExpiredIfExists({
         expires: {
             $lt: moment()
                 // tslint:disable-next-line:no-magic-numbers
                 .add(-60, 'seconds')
                 .toDate()
-        },
-        limit: 1
+        }
     });
 
     console.log('result:', result);

package/lib/chevre/repo/task.js

@@ -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();

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

@@ -142,6 +142,14 @@ export declare class TransactionRepo {
     setTasksExportedById(params: {
         id: string;
     }): Promise<void>;
+    /**
+     * add(2025-03-03~)
+     */
+    makeOneExpiredIfExists(params: {
+        expires: {
+            $lt: Date;
+        };
+    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | void>;
     /**
      * 取引を期限切れにする
      */

package/lib/chevre/repo/transaction.js

@@ -693,6 +693,41 @@ class TransactionRepo {
                 .exec();
         });
     }
+    /**
+     * add(2025-03-03~)
+     */
+    makeOneExpiredIfExists(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endDate = new Date();
+            const doc = yield this.transactionModel.findOneAndUpdate({
+                status: { $eq: factory.transactionStatusType.InProgress },
+                expires: { $lt: params.expires.$lt }
+            }, {
+                status: factory.transactionStatusType.Expired,
+                endDate
+            }, {
+                new: true,
+                projection: {
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    typeOf: 1
+                }
+            })
+                .lean()
+                .exec();
+            if (doc === null) {
+                // no op
+            }
+            else {
+                transaction_1.transactionEventEmitter.emitTransactionStatusChanged({
+                    id: doc.id,
+                    typeOf: doc.typeOf,
+                    status: factory.transactionStatusType.Expired
+                });
+                return doc;
+            }
+        });
+    }
     /**
      * 取引を期限切れにする
      */
@@ -701,6 +736,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 +750,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

@@ -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.51"
+  "version": "22.9.0-alpha.53"
 }