@chevre/domain 28.1.0-alpha.3 → 28.1.0-alpha.5

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

@@ -21,6 +21,7 @@ const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
+const integration_1 = require("../../repo/setting/integration");
 const onAggregateOfferUpdated_1 = require("./onResourceUpdated/onAggregateOfferUpdated");
 // import { onCategoryCodeUpdated } from './onResourceUpdated/onCategoryCodeUpdated';
 const onHasPOSUpdated_1 = require("./onResourceUpdated/onHasPOSUpdated");
@@ -39,6 +40,7 @@ function call(params) {
             entranceGate: new entranceGate_1.EntranceGateRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             pos: new pos_1.POSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             member: new member_1.MemberRepo(connection),
             movieTheater: new movieTheater_1.MovieTheaterRepo(connection),
@@ -63,7 +65,8 @@ function onResourceUpdated(params) {
             // await onResourceDeleted(params)(repos);
         }
         else {
-            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'useInformResourceTypes']);
+            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['useInformResourceTypes']);
+            const hubSettings = (await repos.integrationSetting.getByKey('hub'));
             const useInformResourceTypes = setting?.useInformResourceTypes;
             const useInform = params.useInform === true
                 && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
@@ -75,50 +78,50 @@ function onResourceUpdated(params) {
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case factory_1.factory.creativeWorkType.Movie:
                         await createInformMovieTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case factory_1.factory.product.ProductType.EventService:
                         await createInformProductTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case 'CategoryCode':
                         await createInformCategoryCodeTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case factory_1.factory.placeType.MovieTheater:
                         await createInformMovieTheaterTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     // ルーム通知に対応(2026-01-16~)
                     case factory_1.factory.placeType.ScreeningRoom:
-                        await createInformRoomTasks(params, setting)(repos);
+                        await createInformRoomTasks(params, hubSettings)(repos);
                         break;
                     // 入場ゲート通知に対応(2026-01-17~)
                     case factory_1.factory.placeType.EntranceGate:
-                        await createInformEntranceGateTasks(params, setting)(repos);
+                        await createInformEntranceGateTasks(params, hubSettings)(repos);
                         break;
                     case 'AccountTitle':
                         await createInformAccountTitleTasks({
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case 'POS':
                         await (0, onHasPOSUpdated_1.createInformHasPOSTasks)({
@@ -133,7 +136,7 @@ function onResourceUpdated(params) {
                             project: { id: params.project.id },
                             ids: params.id,
                             typeOf: params.typeOf
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     case 'OfferCatalog':
                         await (0, onOfferCatalogUpdated_1.createInformOfferCatalogTasks)({
@@ -141,7 +144,7 @@ function onResourceUpdated(params) {
                             ids: params.id,
                             typeOf: params.typeOf,
                             isOfferCatalogItem: params.isOfferCatalogItem === true
-                        }, setting)(repos);
+                        }, hubSettings)(repos);
                         break;
                     default:
                     // no op
@@ -184,8 +187,8 @@ function onResourceUpdated(params) {
 function createInformNoteTasks(params, setting) {
     return async (repos) => {
         const notes4inform = await repos.note.findNotes({ id: { $in: params.ids } }, ['about', 'identifier', 'project', 'text', 'typeOf', 'version']);
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (notes4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -234,8 +237,8 @@ function createInformMovieTasks(params, setting) {
             'additionalProperty', 'datePublished', 'duration', 'identifier', 'name', 'project',
             'typeOf', 'distributor', 'contentRating', 'headline', 'thumbnailUrl'
         ]);
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (movies4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -284,8 +287,8 @@ function createInformProductTasks(params, setting) {
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType']
         // []
         );
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (products4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -333,7 +336,8 @@ function createInformCategoryCodeTasks(params, setting) {
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory_1.factory.categoryCode.CategorySetIdentifier.DistributorType } }
         }, ['name', 'additionalProperty', 'project', 'typeOf', 'codeValue', 'inCodeSet']);
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (categoryCodes4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -381,7 +385,8 @@ function createInformMovieTheaterTasks(params, setting) {
         if (params.ids.length === 0) {
             return;
         }
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         const movieTheaters = await repos.movieTheater.projectFields({
             // limit: 1,
             // page: 1,
@@ -453,8 +458,8 @@ function createInformRoomTasks(params, setting) {
     return async (repos
     // settings: Settings
     ) => {
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (Array.isArray(params.branchCode) && params.branchCode.length > 0) {
             // ルームを検索
             const rooms = (await repos.screeningRoom.findRooms({
@@ -513,7 +518,8 @@ function createInformRoomTasks(params, setting) {
 }
 function createInformEntranceGateTasks(params, setting) {
     return async (repos) => {
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         if (Array.isArray(params.identifier) && params.identifier.length > 0) {
             // 入場ゲートを検索
             repos.entranceGate.setOperatorId({ id: params.containedInPlace.id });
@@ -574,8 +580,8 @@ function createInformAccountTitleTasks(params, setting) {
         if (params.ids.length !== 1) {
             throw new factory_1.factory.errors.Argument('id', 'id.length must be 1');
         }
-        // const informResources = settings.onResourceUpdated.informResource;
-        const informResources = setting?.onResourceUpdated?.informResource;
+        // const informResources = setting?.onResourceUpdated?.informResource;
+        const informResources = setting?.onTaskStatusChanged.informTask2hub;
         const accountTitle = await repos.adminAccountTitleCategory.findAccountTitleCategorAsNotification({
             id: params.ids[0],
             projectId: params.project.id

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

@@ -10,7 +10,6 @@ const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMeth
 const message_1 = require("../../repo/message");
 const order_2 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
-const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -21,7 +20,6 @@ const placeOrder_2 = require("../order/placeOrder");
 function call(params) {
     return async ({ connection }) => {
         const { data } = params;
-        const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, placeOrder_2.placeOrder)({
             ...data,
             agent: { id: data.project.id, typeOf: factory_1.factory.organizationType.Project },
@@ -37,9 +35,9 @@ function call(params) {
             message: new message_1.MessageRepo(connection),
             order: new order_2.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
-            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             task: new task_1.TaskRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
-        }, settings);
+        });
     };
 }

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

@@ -5,7 +5,7 @@ const reserve_1 = require("../../repo/action/reserve");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 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 confirmReservation_1 = require("../reserve/confirmReservation");
 /**
@@ -23,7 +23,7 @@ function call(params) {
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(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/returnOrder.js

@@ -4,7 +4,7 @@ exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const returnAction_1 = require("../../repo/action/returnAction");
 const order_1 = require("../../repo/order");
-const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 // import { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 const returnOrder_1 = require("../order/returnOrder");
@@ -21,7 +21,7 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             actions: { returnAction: new returnAction_1.ReturnActionRepo(connection) },
             order: new order_1.OrderRepo(connection),
-            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             task: new task_1.TaskRepo(connection),
             // returnOrder: new ReturnOrderRepo(connection)
         });

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

@@ -5,7 +5,7 @@ const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const sendOrder_1 = require("../../repo/action/sendOrder");
 const order_1 = require("../../repo/order");
-const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const sendOrder_2 = require("../order/sendOrder");
 /**
@@ -30,7 +30,7 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             actions: { sendOrder: new sendOrder_1.SendOrderActionRepo(connection) },
             order: new order_1.OrderRepo(connection),
-            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection }),
             task: new task_1.TaskRepo(connection),
         });
     };

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

@@ -4,6 +4,7 @@ exports.call = call;
 const inform_1 = require("../../repo/action/inform");
 const potentialAction_1 = require("../../repo/potentialAction");
 const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
@@ -18,7 +19,8 @@ function call(params) {
                 inform: new inform_1.InformActionRepo(connection)
             },
             potentialAction: new potentialAction_1.PotentialActionRepo(connection),
-            setting: new setting_1.SettingRepo(connection)
+            setting: new setting_1.SettingRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
         });
     };
 }

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.3"
+  "version": "28.1.0-alpha.5"
 }