@chevre/domain 21.2.0-alpha.16 → 21.2.0-alpha.18

package/example/src/chevre/transaction/makeExpired.ts

@@ -0,0 +1,18 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+    const result = await transactionRepo.makeExpired({
+        expires: new Date()
+    });
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -2,7 +2,8 @@
 import { EventEmitter } from 'events';
 import * as factory from '../factory';
 interface IListenArgsOnTaskStatusChanged {
-    id: string;
+    id?: string;
+    name: factory.taskName;
     status: factory.taskStatus;
 }
 type IOnTaskStatusChangedListener = (listenArgs: IListenArgsOnTaskStatusChanged) => void;
@@ -14,4 +15,4 @@ declare class TaskEventEmitter extends EventEmitter {
     emitTaskStatusChanged(args: IListenArgsOnTaskStatusChanged): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { taskEventEmitter };
+export { IOnTaskStatusChangedListener, taskEventEmitter };

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

@@ -18,4 +18,4 @@ declare class TransactionEventEmitter extends EventEmitter {
     emitTransactionStatusChanged(args: IListenArgsOnTransactionStatusChanged): void;
 }
 declare const transactionEventEmitter: TransactionEventEmitter;
-export { transactionEventEmitter };
+export { IListenArgsOnTransactionStatusChanged, transactionEventEmitter };

package/lib/chevre/repo/assetTransaction.js

@@ -405,15 +405,29 @@ class MongoRepository {
      */
     makeExpired(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // ステータスと期限を見て更新
-            yield this.transactionModel.updateMany({
-                status: factory.transactionStatusType.InProgress,
+            // IDをemitしたいのでまずリスト検索(2023-04-27~)
+            const expiringTransactions = yield this.transactionModel.find({
+                status: { $eq: factory.transactionStatusType.InProgress },
                 expires: { $lt: params.expires }
-            }, {
-                status: factory.transactionStatusType.Expired,
-                endDate: new Date()
             })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
+                .setOptions({ maxTimeMS: 10000 })
                 .exec();
+            if (expiringTransactions.length > 0) {
+                // ステータスと期限を見て更新
+                yield this.transactionModel.updateMany({
+                    _id: { $in: expiringTransactions.map((t) => t.id) },
+                    status: { $eq: factory.transactionStatusType.InProgress },
+                    expires: { $lt: params.expires }
+                }, {
+                    status: factory.transactionStatusType.Expired,
+                    endDate: new Date()
+                })
+                    .exec();
+            }
         });
     }
     /**

package/lib/chevre/repo/task.js

@@ -161,12 +161,18 @@ class MongoRepository {
                     .map((objectId) => {
                     return { id: objectId.toHexString() };
                 });
-                savedTasks.forEach((savedTask) => {
+                taskAttributes.forEach((savedTask) => {
                     task_2.taskEventEmitter.emitTaskStatusChanged({
-                        id: savedTask.id,
+                        name: savedTask.name,
                         status: factory.taskStatus.Ready
                     });
                 });
+                // savedTasks.forEach((savedTask) => {
+                //     taskEventEmitter.emitTaskStatusChanged({
+                //         id: savedTask.id,
+                //         status: factory.taskStatus.Ready
+                //     });
+                // });
                 // return result.ops;
                 return savedTasks;
             }

package/lib/chevre/repo/transaction.js

@@ -509,15 +509,36 @@ class MongoRepository {
      */
     makeExpired(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // ステータスと期限を見て更新
-            yield this.transactionModel.updateMany({
-                status: factory.transactionStatusType.InProgress,
+            // IDをemitしたいのでまずリスト検索(2023-04-27~)
+            const expiringTransactions = yield this.transactionModel.find({
+                status: { $eq: factory.transactionStatusType.InProgress },
                 expires: { $lt: params.expires }
-            }, {
-                status: factory.transactionStatusType.Expired,
-                endDate: new Date()
             })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
+                .setOptions({ maxTimeMS: 10000 })
                 .exec();
+            if (expiringTransactions.length > 0) {
+                // ステータスと期限を見て更新
+                yield this.transactionModel.updateMany({
+                    _id: { $in: expiringTransactions.map((t) => t.id) },
+                    status: { $eq: factory.transactionStatusType.InProgress },
+                    expires: { $lt: params.expires }
+                }, {
+                    status: factory.transactionStatusType.Expired,
+                    endDate: new Date()
+                })
+                    .exec();
+                expiringTransactions.forEach((expiringTransaction) => {
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: expiringTransaction.id,
+                        typeOf: expiringTransaction.typeOf,
+                        status: factory.transactionStatusType.Expired
+                    });
+                });
+            }
         });
     }
     /**

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.16"
+  "version": "21.2.0-alpha.18"
 }