@chevre/domain 28.1.0-alpha.4 → 28.1.0-alpha.6

package/lib/chevre/service/task/useReservation.js

@@ -7,7 +7,7 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
-const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const useReservation_1 = require("../reserve/useReservation");
 /**
@@ -31,7 +31,7 @@ function call(params) {
             code: new authorization_1.AuthorizationRepo(connection),
             order: new order_1.OrderRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
-            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             task: new task_1.TaskRepo(connection)
         });
     };

package/lib/chevre/service/task/voidReserveTransaction.js

@@ -12,7 +12,6 @@ const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const reserveInterface_1 = require("../../repo/reserveInterface");
-const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
@@ -46,11 +45,11 @@ function call(params) {
                 coaAuthClientCreated = true;
             }
         }
-        const settings = new integration_1.IntegrationSettingRepo({ connection });
+        const integrationSettingRepo = new integration_1.IntegrationSettingRepo({ connection });
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
+        }, { timeout: (await integrationSettingRepo.getByKey('coa')).timeoutReserve });
         try {
             await (0, voidTransaction_1.voidTransaction)({
                 ...params.data,
@@ -67,11 +66,11 @@ function call(params) {
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
                 orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 reservation: new reservation_1.ReservationRepo(connection),
-                setting: new setting_1.SettingRepo(connection),
+                integrationSetting: integrationSettingRepo,
                 task: new task_1.TaskRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 reserveService
-            }, settings);
+            });
         }
         catch (error) { // eslint-disable-line no-useless-catch
             throw error;

package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.d.ts

@@ -1,12 +1,12 @@
 import { factory } from '../../../factory';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 import type { IExecutableTask } from '../../../taskSettings';
 declare function informTaskIfNeeded(params: {
     task: IExecutableTask<factory.taskName>;
     executionEndDate: Date;
 }): (repos: {
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { informTaskIfNeeded };

package/lib/chevre/service/taskHandler/onOperationFailed/informTaskIfNeeded.js

@@ -9,9 +9,9 @@ const factory_1 = require("../../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:taskHandler:onOperationFailed');
 function createInformTasks(params) {
     const { task, setting, executionEndDate } = params;
-    const informTask = setting?.onTaskStatusChanged?.informTask;
-    const informTaskNames = setting?.onTaskStatusChanged?.informTaskNames;
-    const informTaskStatuses = setting?.onTaskStatusChanged?.informTaskStatuses;
+    const informTask = setting?.informActions;
+    const informTaskNames = setting?.informTaskNames;
+    const informTaskStatuses = setting?.informTaskStatuses;
     const informTasks = [];
     if (Array.isArray(informTaskNames) && informTaskNames.includes(task.name)) {
         if (Array.isArray(informTaskStatuses)) {
@@ -85,7 +85,7 @@ function informTaskIfNeeded(params) {
             && task.name !== factory_1.factory.taskName.HandleNotification // nameで絞る
             && task.name !== factory_1.factory.taskName.TriggerWebhook;
         if (useInform) {
-            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTaskStatusChanged']);
+            const setting = await repos.integrationSetting.getByKey('agg');
             const informTasks = createInformTasks({ task, setting, executionEndDate });
             debug('informTaskIfNeeded: creating inform tasks...', JSON.stringify(informTasks));
             if (informTasks.length > 0) {

package/lib/chevre/service/taskHandler/onOperationFailed.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { SettingRepo } from '../../repo/setting';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 import type { TaskRepo } from '../../repo/task';
 import type { TaskRunningRepo } from '../../repo/taskRunning';
 import type { IExecutableTask } from '../../taskSettings';
@@ -12,7 +12,7 @@ declare function onOperationFailed(params: {
     error: any;
     next?: never;
 }): (repos: {
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     taskRunning: TaskRunningRepo;
 }) => Promise<void>;

package/lib/chevre/service/taskHandler.js

@@ -21,7 +21,7 @@ function executeTask(task) {
     const now = new Date();
     debug('executing an executableTask...', task, now);
     return async (settings, options) => {
-        const settingRepo = new (await import('../repo/setting.js')).SettingRepo(settings.connection);
+        const integrationSettingRepo = new (await import('../repo/setting/integration.js')).IntegrationSettingRepo({ connection: settings.connection });
         const taskRepo = new (await import('../repo/task.js')).TaskRepo(settings.connection);
         const taskRunningRepo = new (await import('../repo/taskRunning.js')).TaskRunningRepo(settings.connection);
         try {
@@ -56,7 +56,7 @@ function executeTask(task) {
         catch (error) {
             await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error
-            })({ setting: settingRepo, task: taskRepo, taskRunning: taskRunningRepo });
+            })({ integrationSetting: integrationSettingRepo, task: taskRepo, taskRunning: taskRunningRepo });
         }
     };
 }

package/package.json

@@ -89,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.1.0-alpha.4"
+  "version": "28.1.0-alpha.6"
 }