@chevre/domain 21.2.0-alpha.11 → 21.2.0-alpha.111

package/lib/chevre/repo/task.js

@@ -13,6 +13,8 @@ exports.MongoRepository = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const task_1 = require("./mongoose/schemas/task");
+const task_2 = require("../eventEmitter/task");
+const settings_1 = require("../settings");
 /**
  * タスク実行時のソート条件
  */
@@ -149,27 +151,43 @@ class MongoRepository {
         }
         return andConditions;
     }
-    saveMany(taskAttributes) {
+    saveMany(taskAttributes, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const emitImmediately = (options === null || options === void 0 ? void 0 : options.emitImmediately) === true;
             if (taskAttributes.length > 0) {
                 const result = yield this.taskModel.insertMany(taskAttributes, { ordered: false, rawResult: true });
                 if (result.insertedCount !== taskAttributes.length) {
                     throw new factory.errors.ServiceUnavailable('all tasks not saved');
                 }
-                // return result.ops;
-                return Object.values(result.insertedIds)
+                const savedTasks = Object.values(result.insertedIds)
                     .map((objectId) => {
                     return { id: objectId.toHexString() };
                 });
+                if (emitImmediately) {
+                    savedTasks.forEach((savedTask) => {
+                        task_2.taskEventEmitter.emitTaskStatusChanged({
+                            id: savedTask.id,
+                            status: factory.taskStatus.Ready
+                        });
+                    });
+                    // taskAttributes.forEach((savedTask) => {
+                    //     taskEventEmitter.emitTaskStatusChanged({
+                    //         name: savedTask.name,
+                    //         status: factory.taskStatus.Ready
+                    //     });
+                    // });
+                }
+                // return result.ops;
+                return savedTasks;
             }
             else {
                 return [];
             }
         });
     }
-    createInformTaskIfNotExist(params) {
+    createInformTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.taskModel.findOneAndUpdate({
+            const createdTask = yield this.taskModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 name: params.name,
                 'data.object.id': {
@@ -177,7 +195,38 @@ class MongoRepository {
                     $eq: String(params.data.object.id)
                 }
             }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
+    executeById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.taskModel.findOneAndUpdate({
+                status: factory.taskStatus.Ready,
+                runsAt: { $lt: new Date() },
+                _id: { $eq: params.id }
+            }, {
+                status: factory.taskStatus.Running,
+                lastTriedAt: new Date(),
+                $inc: {
+                    remainingNumberOfTries: -1,
+                    numberOfTried: 1 // トライ回数増やす
+                },
+                executor: params.executor
+            }, { new: true })
                 .exec();
+            if (doc === null) {
+                // tslint:disable-next-line:no-null-keyword
+                return null;
+            }
+            return doc.toObject();
         });
     }
     executeOneByName(params) {
@@ -192,7 +241,8 @@ class MongoRepository {
                 $inc: {
                     remainingNumberOfTries: -1,
                     numberOfTried: 1 // トライ回数増やす
-                }
+                },
+                executor: params.executor
             }, { new: true })
                 .sort(sortOrder4executionOfTasks)
                 .exec();
@@ -203,6 +253,35 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const runsAtLt = moment(params.now)
+                .add(-params.delayInSeconds, 'seconds')
+                .toDate();
+            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))
+                .select({
+                _id: 1,
+                name: 1,
+                status: 1
+            })
+                .limit(params.limit)
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+            if (delayedTasks.length > 0) {
+                delayedTasks.forEach((delayedTask) => {
+                    task_2.taskEventEmitter.emitTaskStatusChanged({
+                        id: delayedTask.id,
+                        name: delayedTask.name,
+                        status: delayedTask.status
+                    });
+                });
+            }
+            return delayedTasks;
+        });
+    }
     retry(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()
@@ -297,7 +376,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.taskModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -319,7 +398,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.runsAt) !== undefined) {
                 query.sort({ runsAt: params.sort.runsAt });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -333,10 +412,13 @@ class MongoRepository {
         });
     }
     deleteByName(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.taskModel.deleteMany({
-                name: { $eq: params.name }
-            })
+            return this.taskModel.deleteMany(Object.assign(Object.assign({ name: { $eq: params.name } }, (typeof ((_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') ? { status: { $eq: params.status.$eq } } : undefined), (((_b = params.runsAt) === null || _b === void 0 ? void 0 : _b.$gte) instanceof Date)
+                ? {
+                    runsAt: { $gte: params.runsAt.$gte, $lte: params.runsAt.$lte }
+                }
+                : undefined))
                 .exec();
         });
     }

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

@@ -40,6 +40,8 @@ export declare class MongoRepository {
     findById<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
+        inclusion?: string[];
+        exclusion?: string[];
     }): Promise<factory.transaction.ITransaction<T>>;
     /**
      * 進行中の取引を取得する
@@ -88,7 +90,6 @@ export declare class MongoRepository {
         id: string;
         object?: {
             name?: string;
-            dateOnTransactionStatusChangedEmitted?: Date;
         };
     }): Promise<void>;
     /**
@@ -112,7 +113,13 @@ export declare class MongoRepository {
             $in: T[];
         };
         status: factory.transactionStatusType;
-    }): Promise<factory.transaction.ITransaction<T> | null>;
+        id?: string;
+        tasksExportAction: {
+            agent: {
+                name: string;
+            };
+        };
+    }): Promise<Pick<factory.transaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
      * TODO updatedAtを基準にしているが、タスクエクスポートトライ日時を持たせた方が安全か？
@@ -120,6 +127,16 @@ export declare class MongoRepository {
     reexportTasks(params: {
         intervalInMinutes: number;
     }): Promise<void>;
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params: {
+        now: Date;
+        delayInSeconds: number;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -131,7 +148,9 @@ export declare class MongoRepository {
      * 取引を期限切れにする
      */
     makeExpired(params: {
-        expires: Date;
+        expires: {
+            $lt: Date;
+        };
     }): Promise<void>;
     /**
      * 取引を中止する
@@ -151,7 +170,7 @@ export declare class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate(params: {
+    findByIdAndUpdateInProgress(params: {
         id: string;
         update: {
             $set?: any;

package/lib/chevre/repo/transaction.js

@@ -13,6 +13,8 @@ exports.MongoRepository = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const transaction_1 = require("./mongoose/schemas/transaction");
+const transaction_2 = require("../eventEmitter/transaction");
+const settings_1 = require("../settings");
 /**
  * 取引リポジトリ
  */
@@ -263,7 +265,9 @@ class MongoRepository {
             else {
                 expires = params.expires;
             }
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -272,10 +276,29 @@ class MongoRepository {
      */
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf }
             })
+                .select(projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
@@ -291,7 +314,9 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: params.typeOf },
-                status: { $eq: factory.transactionStatusType.InProgress }
+                status: { $eq: factory.transactionStatusType.InProgress },
+                // expiresを条件に追加(2023-05-12~),
+                expires: { $gt: new Date() }
             })
                 .exec();
             if (doc === null) {
@@ -343,9 +368,9 @@ class MongoRepository {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 $set: Object.assign(Object.assign({ 'agent.id': params.agent.id }, (typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined), (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
             }, {
@@ -363,9 +388,9 @@ class MongoRepository {
     updateExpires(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 $set: {
                     expires: params.expires
@@ -384,16 +409,14 @@ class MongoRepository {
      * 注文名称など
      */
     updateObject(params) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
-                $set: Object.assign(Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined), (((_b = params.object) === null || _b === void 0 ? void 0 : _b.dateOnTransactionStatusChangedEmitted) instanceof Date)
-                    ? { 'object.dateOnTransactionStatusChangedEmitted': params.object.dateOnTransactionStatusChangedEmitted }
-                    : undefined)
+                $set: Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined)
             }, {
                 projection: { _id: 1 }
             })
@@ -409,9 +432,9 @@ class MongoRepository {
     confirm(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.transactionModel.findOneAndUpdate({
-                _id: params.id,
-                typeOf: params.typeOf,
-                status: factory.transactionStatusType.InProgress
+                _id: { $eq: params.id },
+                typeOf: { $eq: params.typeOf },
+                status: { $eq: factory.transactionStatusType.InProgress }
             }, {
                 status: factory.transactionStatusType.Confirmed,
                 endDate: new Date(),
@@ -426,43 +449,49 @@ class MongoRepository {
             // NotFoundであれば取引状態確認
             if (doc === null) {
                 const transaction = yield this.findById({ typeOf: params.typeOf, id: params.id });
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Confirmed) {
-                    // すでに確定済の場合
-                    return;
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore next */
+                    // すでに確定済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Already expired');
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore next */
                 }
                 else if (transaction.status === factory.transactionStatusType.Canceled) {
                     throw new factory.errors.Argument('Transaction id', 'Already canceled');
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore next */
                 }
                 else {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            // return doc.toObject();
+            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Confirmed
+            });
         });
     }
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
     startExportTasks(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined)
-                ? {
-                    'project.id': {
-                        $eq: params.project.id
-                    }
-                } : undefined), (params.typeOf !== undefined && params.typeOf !== null && Array.isArray(params.typeOf.$in))
-                ? { typeOf: { $in: params.typeOf.$in } } : undefined), { status: params.status, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }), { tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting }, { new: true })
+            switch (params.status) {
+                case factory.transactionStatusType.InProgress:
+                    throw new factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
+                default:
+                // no op
+            }
+            const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
+            return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined) ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
+                'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
+                'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
+                'tasksExportAction.startDate': new Date(),
+                tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting
+            }, { new: true })
+                .select({
+                _id: 1,
+                typeOf: 1
+            })
                 .exec()
                 // tslint:disable-next-line:no-null-keyword
                 .then((doc) => (doc === null) ? null : doc.toObject());
@@ -475,17 +504,74 @@ class MongoRepository {
      */
     reexportTasks(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.updateMany({
-                tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting,
+            const reexportingTransactions = yield this.transactionModel.find({
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
                 updatedAt: {
                     $lt: moment()
                         .add(-params.intervalInMinutes, 'minutes')
                         .toDate()
                 }
-            }, {
-                tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
             })
+                .select({
+                _id: 1,
+                typeOf: 1,
+                status: 1
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
+            if (reexportingTransactions.length > 0) {
+                for (const reexportingTransaction of reexportingTransactions) {
+                    yield this.transactionModel.updateOne({
+                        _id: { $eq: reexportingTransaction.id },
+                        tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+                    }, {
+                        tasksExportAction: {
+                            actionStatus: factory.actionStatusType.PotentialActionStatus
+                        },
+                        tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
+                    })
+                        .exec();
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: reexportingTransaction.id,
+                        typeOf: reexportingTransaction.typeOf,
+                        status: reexportingTransaction.status
+                    });
+                }
+            }
+        });
+    }
+    /**
+     * タスクエクスポートの遅延している取引について明示的にemitTransactionStatusChangedを実行する
+     */
+    exportTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const delayedTransactions = yield this.transactionModel.find({
+                status: { $in: params.status.$in },
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported },
+                endDate: {
+                    $exists: true,
+                    $lt: moment(params.now)
+                        .add(-params.delayInSeconds, 'seconds')
+                        .toDate()
+                }
+            })
+                .select({
+                _id: 1,
+                typeOf: 1,
+                status: 1
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+            if (delayedTransactions.length > 0) {
+                delayedTransactions.forEach((delayedTransaction) => {
+                    transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                        id: delayedTransaction.id,
+                        typeOf: delayedTransaction.typeOf,
+                        status: delayedTransaction.status
+                    });
+                });
+            }
+            return delayedTransactions;
         });
     }
     /**
@@ -494,9 +580,15 @@ class MongoRepository {
      */
     setTasksExportedById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findByIdAndUpdate(params.id, {
+            const endDate = new Date();
+            yield this.transactionModel.updateOne({
+                _id: { $eq: params.id },
+                tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
+            }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
-                tasksExportedAt: new Date()
+                tasksExportedAt: endDate,
+                'tasksExportAction.actionStatus': factory.actionStatusType.CompletedActionStatus,
+                'tasksExportAction.endDate': endDate
             })
                 .exec();
         });
@@ -506,15 +598,36 @@ class MongoRepository {
      */
     makeExpired(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // ステータスと期限を見て更新
-            yield this.transactionModel.updateMany({
-                status: factory.transactionStatusType.InProgress,
-                expires: { $lt: params.expires }
-            }, {
-                status: factory.transactionStatusType.Expired,
-                endDate: new Date()
+            // IDをemitしたいのでまずリスト検索(2023-04-27~)
+            const expiringTransactions = yield this.transactionModel.find({
+                status: { $eq: factory.transactionStatusType.InProgress },
+                expires: { $lt: params.expires.$lt }
+            })
+                .select({
+                _id: 1,
+                typeOf: 1
             })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .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.$lt }
+                }, {
+                    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
+                    });
+                });
+            }
         });
     }
     /**
@@ -539,11 +652,8 @@ class MongoRepository {
             // NotFoundであれば取引状態確認
             if (doc === null) {
                 const transaction = yield this.findById(params);
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Canceled) {
-                    // すでに中止済の場合
-                    return;
+                    // すでに中止済の場合スルー
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -555,14 +665,18 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            // return doc.toObject();
+            transaction_2.transactionEventEmitter.emitTransactionStatusChanged({
+                id: params.id,
+                typeOf: params.typeOf,
+                status: factory.transactionStatusType.Canceled
+            });
         });
     }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.transactionModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -605,7 +719,7 @@ class MongoRepository {
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -613,9 +727,12 @@ class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate(params) {
+    findByIdAndUpdateInProgress(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, {
+            yield this.transactionModel.findOneAndUpdate({
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress }
+            }, params.update, {
                 // new: true,
                 projection: { _id: 1 }
             })
@@ -630,7 +747,8 @@ class MongoRepository {
     saveOrderNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateOne({
-                _id: params.id,
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress },
                 'object.orderNumber': { $exists: false }
             }, { 'object.orderNumber': params.orderNumber })
                 .exec();
@@ -639,7 +757,8 @@ class MongoRepository {
     saveConfirmationNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateOne({
-                _id: params.id,
+                _id: { $eq: params.id },
+                status: { $eq: factory.transactionStatusType.InProgress },
                 'object.confirmationNumber': { $exists: false }
             }, { 'object.confirmationNumber': params.confirmationNumber })
                 .exec();

package/lib/chevre/repo/trip.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
 const trip_1 = require("./mongoose/schemas/trip");
+const settings_1 = require("../settings");
 /**
  * トリップリポジトリ
  */
@@ -193,7 +194,7 @@ class MongoRepository {
             // console.log(explainResult[0].queryPlanner?.winningPlan?.inputStage?.inputStage?.inputStage);
             // console.log(explainResult);
             // return [];
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });