@chevre/domain 21.2.0-alpha.13 → 21.2.0-alpha.131

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

@@ -17,6 +17,9 @@ interface IStatus {
 export interface IAggregateTask {
     statuses: IStatus[];
 }
+interface IOptionOnCreate {
+    emitImmediately: boolean;
+}
 /**
  * タスクリポジトリ
  */
@@ -24,13 +27,43 @@ export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
-    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<{
+    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
-    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>): Promise<void>;
+    createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
+    executeById(params: {
+        id: string;
+        executor: {
+            name: string;
+        };
+    }): Promise<factory.task.ITask<factory.taskName> | null>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
+        executor: {
+            name: string;
+        };
     }): Promise<factory.task.ITask<T> | null>;
+    /**
+     * 一定期間遅延したタスクを実行する
+     */
+    executeTasks(params: {
+        now: Date;
+        /**
+         * 指定期間遅延しているタスクを実行する
+         */
+        delayInSeconds: number;
+        limit: number;
+        name: {
+            /**
+             * 指定タスクのみ実行する
+             */
+            $in?: factory.taskName[];
+            /**
+             * 指定タスク以外のみ実行する
+             */
+            $nin?: factory.taskName[];
+        };
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;
@@ -60,9 +93,19 @@ export declare class MongoRepository {
     }): Promise<void>;
     deleteByName(params: {
         name: factory.taskName;
+        status?: {
+            $eq?: factory.taskStatus;
+        };
+        runsAt?: {
+            $gte: Date;
+            $lte: Date;
+        };
     }): Promise<import("mongodb").DeleteResult>;
     countDelayedTasks(params: {
         delayInSeconds: number;
+        name: {
+            $nin?: factory.taskName[];
+        };
     }): Promise<number>;
     aggregateTask(params: {
         project?: {

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();
         });
     }
@@ -345,10 +427,7 @@ class MongoRepository {
             const runsAtLt = moment()
                 .add(-params.delayInSeconds, 'seconds')
                 .toDate();
-            return this.taskModel.count({
-                status: factory.taskStatus.Ready,
-                runsAt: { $lt: runsAtLt }
-            })
+            return this.taskModel.count(Object.assign({ status: factory.taskStatus.Ready, runsAt: { $lt: runsAtLt } }, (Array.isArray(params.name.$nin)) ? { name: { $nin: params.name.$nin } } : 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>>;
     /**
      * 進行中の取引を取得する
@@ -112,6 +114,11 @@ export declare class MongoRepository {
         };
         status: factory.transactionStatusType;
         id?: string;
+        tasksExportAction: {
+            agent: {
+                name: string;
+            };
+        };
     }): Promise<Pick<factory.transaction.ITransaction<T>, 'id' | 'typeOf'> | null>;
     /**
      * タスクエクスポートリトライ
@@ -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;