@chevre/domain 21.2.0-alpha.19 → 21.2.0-alpha.20

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

@@ -17,6 +17,9 @@ interface IStatus {
 export interface IAggregateTask {
     statuses: IStatus[];
 }
+interface IOptionOnCreate {
+    emitImmediately: boolean;
+}
 /**
  * タスクリポジトリ
  */
@@ -24,10 +27,10 @@ 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;
     }): Promise<factory.task.ITask<factory.taskName> | null>;

package/lib/chevre/repo/task.js

@@ -150,8 +150,9 @@ 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) {
@@ -161,18 +162,14 @@ class MongoRepository {
                     .map((objectId) => {
                     return { id: objectId.toHexString() };
                 });
-                taskAttributes.forEach((savedTask) => {
-                    task_2.taskEventEmitter.emitTaskStatusChanged({
-                        name: savedTask.name,
-                        status: factory.taskStatus.Ready
+                if (emitImmediately) {
+                    taskAttributes.forEach((savedTask) => {
+                        task_2.taskEventEmitter.emitTaskStatusChanged({
+                            name: savedTask.name,
+                            status: factory.taskStatus.Ready
+                        });
                     });
-                });
-                // savedTasks.forEach((savedTask) => {
-                //     taskEventEmitter.emitTaskStatusChanged({
-                //         id: savedTask.id,
-                //         status: factory.taskStatus.Ready
-                //     });
-                // });
+                }
                 // return result.ops;
                 return savedTasks;
             }
@@ -181,9 +178,9 @@ class MongoRepository {
             }
         });
     }
-    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': {
@@ -191,7 +188,15 @@ 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) {
@@ -208,7 +213,6 @@ class MongoRepository {
                     numberOfTried: 1 // トライ回数増やす
                 }
             }, { new: true })
-                // .sort(sortOrder4executionOfTasks)
                 .exec();
             if (doc === null) {
                 // tslint:disable-next-line:no-null-keyword

package/lib/chevre/service/assetTransaction/cancelReservation.js

@@ -13,13 +13,11 @@ exports.exportTasksById = exports.startAndConfirm = exports.confirm = exports.st
 /**
  * 予約取消取引サービス
  */
-const createDebug = require("debug");
 const moment = require("moment");
 const mongoose = require("mongoose");
 const factory = require("../../factory");
 const settings_1 = require("../../settings");
 const factory_1 = require("./cancelReservation/factory");
-const debug = createDebug('chevre-domain:service');
 function validateStartParams(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -235,9 +233,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        debug('taskAttributes prepared', taskAttributes);
-        return repos.task.saveMany(taskAttributes);
-        // return Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -430,7 +430,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/pay.js

@@ -470,7 +470,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/refund.js

@@ -218,7 +218,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/registerService.js

@@ -301,8 +301,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
-        // return Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/assetTransaction/reserve.js

@@ -860,7 +860,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -89,7 +89,7 @@ function onOrderStatusChanged(params) {
                 break;
             default:
         }
-        yield repos.task.saveMany(tasks);
+        yield repos.task.saveMany(tasks, { emitImmediately: true });
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;

package/lib/chevre/service/order/placeOrder.js

@@ -269,6 +269,6 @@ function onPlaceOrder(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/order/returnOrder.js

@@ -204,10 +204,6 @@ function onReturn(returnActionAttributes) {
             }
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/order/sendOrder.js

@@ -178,6 +178,6 @@ function onSend(params) {
             }
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -576,9 +576,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/placeOrder.js

@@ -36,11 +36,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/returnOrder.js

@@ -384,11 +384,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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.19"
+  "version": "21.2.0-alpha.20"
 }