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

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -1,6 +1,5 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { CancelActionRepo } from '../../../repo/action/cancel';
 import { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
@@ -8,7 +7,7 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -26,7 +25,7 @@ interface IVoidTransactionByActionIdRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
     /**
@@ -48,5 +47,5 @@ declare function voidTransactionByActionId(params: factory.task.voidReserveTrans
          */
         id: string;
     };
-}): (repos: IVoidTransactionByActionIdRepos, settings: Settings) => Promise<void>;
+}): (repos: IVoidTransactionByActionIdRepos) => Promise<void>;
 export { IVoidTransactionByActionIdRepos, voidTransactionByActionId };

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -10,7 +10,7 @@ const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTrans
  * 特定の承認アクションについて処理する
  */
 function voidTransactionByActionId(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         if (typeof params.id !== 'string' || params.id === '') {
             throw new factory_1.factory.errors.ArgumentNull('id');
         }
@@ -51,7 +51,7 @@ function voidTransactionByActionId(params) {
             default:
                 await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                     action
-                })(repos, settings);
+                })(repos);
             // const transactionNumber = action.object.pendingTransaction?.transactionNumber;
             // if (typeof transactionNumber === 'string') {
             //     // すでに取消済であったとしても、すべて取消処理(actionStatusに関係なく)

package/lib/chevre/service/offer/onEventChanged.js

@@ -14,7 +14,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:offer:onEventChanged')
 function onEventChanged(params) {
     return async (repos) => {
         if (params.id.length > 0) {
-            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onEventChanged', 'useInformResourceTypes']);
+            const integrationSetting = await repos.integrationSetting.getByKey('agg');
+            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
@@ -26,7 +27,7 @@ function onEventChanged(params) {
                 ids: params.id,
                 typeOf: params.typeOf,
                 isNew: params.isNew
-            }, setting)(repos);
+            }, integrationSetting)(repos);
             if (useInform) {
                 await createInformTasks({
                     project: { id: params.project.id },
@@ -228,8 +229,7 @@ function createInform2aggTasks(params, setting) {
     // settings: Settings
     ) => {
         let event4inform;
-        // const informEvent2agg = settings.onEventChanged.informEvent2agg;
-        const informEvent2agg = setting?.onEventChanged?.informEvent2agg;
+        const informEvent2agg = setting?.informActions;
         if (params.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             event4inform = {
                 id: params.ids,

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionCanceled.d.ts

@@ -1,7 +1,6 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderRepo } from '../../../repo/order';
-import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
@@ -9,7 +8,6 @@ interface IOnPayTransactionCanceledRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    setting: SettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
 }

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.d.ts

@@ -2,17 +2,16 @@ import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IOnPayTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     message: MessageRepo;
     order: OrderRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
 }
@@ -20,5 +19,5 @@ declare function onPayTransactionConfirmed(params: factory.task.onAssetTransacti
     object: factory.task.onAssetTransactionStatusChanged.IObjectAsPayTransaction & {
         status: factory.transactionStatusType.Confirmed;
     };
-}): (repos: IOnPayTransactionConfirmedRepos, settings: Settings) => Promise<void>;
+}): (repos: IOnPayTransactionConfirmedRepos) => Promise<void>;
 export { IOnPayTransactionConfirmedRepos, onPayTransactionConfirmed };

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.js

@@ -4,7 +4,7 @@ exports.onPayTransactionConfirmed = onPayTransactionConfirmed;
 const paymentDue2Processing_1 = require("../onAssetTransactionStatusChanged/paymentDue2Processing");
 const factory_1 = require("../../../factory");
 function onPayTransactionConfirmed(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -29,7 +29,7 @@ function onPayTransactionConfirmed(params) {
                     confirmationNumber,
                     orderNumber,
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged
-                })(repos, settings);
+                })(repos);
             }
         }
     };

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onReserveTransactionConfirmed.d.ts

@@ -1,7 +1,6 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderRepo } from '../../../repo/order';
-import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
@@ -10,7 +9,6 @@ interface IOnReserveTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
-    setting: SettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
 }

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.d.ts

@@ -1,14 +1,13 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
     order: OrderRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }
 /**
@@ -21,5 +20,5 @@ declare function paymentDue2Processing(params: {
     confirmationNumber: string;
     orderNumber: string;
     useOnOrderStatusChanged: boolean;
-}): (repos: IPaymentDue2ProcessingRepos, settings: Settings) => Promise<void>;
+}): (repos: IPaymentDue2ProcessingRepos) => Promise<void>;
 export { IPaymentDue2ProcessingRepos, paymentDue2Processing, };

package/lib/chevre/service/order/onAssetTransactionStatusChanged/paymentDue2Processing.js

@@ -12,7 +12,7 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
  * 全決済取引確定を完了した注文に関して、アイテムを処理する
  */
 function paymentDue2Processing(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         let order;
         try {
             order = await repos.order.changeStatus({
@@ -69,7 +69,7 @@ function paymentDue2Processing(params) {
                     orderStatus: factory_1.factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                 },
                 // placeOrderTransaction
-            })(repos, settings);
+            })(repos);
         }
     };
 }

package/lib/chevre/service/order/onAssetTransactionStatusChanged.d.ts

@@ -2,7 +2,7 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
-import type { SettingRepo } from '../../repo/setting';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { paymentDue2Processing } from './onAssetTransactionStatusChanged/paymentDue2Processing';
@@ -14,7 +14,7 @@ interface IOnAssetTransactionStatusChangedRepos {
     assetTransaction: AssetTransactionRepo;
     message: MessageRepo;
     order: OrderRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
 }

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

@@ -29,7 +29,7 @@ function onAssetTransactionStatusChanged(params) {
                                 ...params.object,
                                 status: params.object.status
                             }
-                        })(repos, settings);
+                        })(repos);
                         break;
                     case factory_1.factory.assetTransactionType.COAReserveTransaction:
                         await (0, onReserveTransactionConfirmed_1.onReserveTransactionConfirmed)({

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered/factory.d.ts

@@ -1,9 +1,9 @@
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
+import type { IIntegrationSettings } from '../../../../repo/setting/integration';
 type IDeliveredOrder = Pick<factory.order.IOrder, 'id' | 'customer' | 'orderNumber' | 'project' | 'typeOf'> & {
     orderStatus: factory.orderStatus.OrderDelivered;
 };
-declare function createInformTasks(order: IDeliveredOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: IDeliveredOrder, setting: IIntegrationSettings['agg']): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 /**
  * 注文配送後のアクション
  */

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

@@ -7,7 +7,7 @@ function createInformTasks(order,
 setting) {
     const taskRunsAt = new Date();
     // const informOrder = settings.onOrderStatusChanged?.informOrder;
-    const informOrder = setting?.onOrderStatusChanged?.informOrder;
+    const informOrder = setting?.informActions;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDelivered.d.ts

@@ -1,8 +1,8 @@
 import { factory } from '../../../factory';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnOrderDeliveredRepos {
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }
 declare function onOrderDelivered(params: {

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

@@ -15,7 +15,7 @@ function onOrderDelivered(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+        const setting = await repos.integrationSetting.getByKey('agg');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         // const sendOrderPotentialActions =

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
+import type { IIntegrationSettings } from '../../../../repo/setting/integration';
 type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'project' | 'typeOf' | 'seller' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'customer' | 'id'> & {
     /**
      * 何ページ目の配送か
@@ -13,7 +13,7 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
 };
 declare function createInformTasks(params: {
     order: IInTransitOrder;
-}, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+}, setting: IIntegrationSettings['agg']): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
 }): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes)[];

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

@@ -39,7 +39,7 @@ setting) {
     const { order } = params;
     const taskRunsAt = new Date();
     // const informOrder = settings.onOrderStatusChanged?.informOrder;
-    const informOrder = setting?.onOrderStatusChanged?.informOrder;
+    const informOrder = setting?.informActions;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}:${order.acceptedOffers.page}`;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially.d.ts

@@ -1,8 +1,8 @@
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 import { IInTransitOrder } from './onOrderDeliveredPartially/factory';
 interface IOnOrderDeliveredPartiallyRepos {
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }
 declare function onOrderDeliveredPartially(params: {

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

@@ -12,10 +12,8 @@ const factory_1 = require("../../../factory");
 const factory_2 = require("./onOrderDeliveredPartially/factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 function onOrderDeliveredPartially(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    return async (repos) => {
+        const setting = await repos.integrationSetting.getByKey('agg');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         switch (params.order.orderStatus) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
+import type { IIntegrationSettings } from '../../../../repo/setting/integration';
 type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'name' | 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf'> & {
     id: string;
     numAcceptedOffers: number;
@@ -10,7 +10,7 @@ type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, '
     identifier: string;
 };
 type ICreatingInformProcessingOrderTask = Pick<factory.task.IAttributes<factory.taskName.TriggerWebhook>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>;
-declare function createInformProcessingOrderTasks(order: IProcessingOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): ICreatingInformProcessingOrderTask[];
+declare function createInformProcessingOrderTasks(order: IProcessingOrder, setting: IIntegrationSettings['agg']): ICreatingInformProcessingOrderTask[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'orderNumber'> & {
         serialNumbers: string[];

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

@@ -10,7 +10,7 @@ const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgen
 const ASTERISK_CHARACTER = '*';
 function createInformProcessingOrderTasks(order, setting) {
     const taskRunsAt = new Date();
-    const informOrder = setting?.onOrderStatusChanged?.informOrder;
+    const informOrder = setting?.informActions;
     const informTasks = [];
     const order4inform = creteProcessingOrderAsNotification(order);
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.d.ts

@@ -1,8 +1,7 @@
 import type { MessageRepo } from '../../../repo/message';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';
 declare function onOrderProcessing(params: {
@@ -13,7 +12,7 @@ declare function onOrderProcessing(params: {
     };
 }): (repos: {
     message: MessageRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { IExternalOrder, onOrderProcessing, processOrder };

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

@@ -17,10 +17,10 @@ Object.defineProperty(exports, "processOrder", { enumerable: true, get: function
 const debug = (0, debug_1.default)('chevre-domain:service:order');
 // type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'>;
 function onOrderProcessing(params) {
-    return async (repos, settings) => {
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+    return async (repos) => {
+        const setting = await repos.integrationSetting.getByKey('agg');
         // const { numTryConfirmReserveTransaction } = settings;
-        const numTryConfirmReserveTransaction = await settings.getByKey('numTryConfirmReserveTransaction');
+        const numTryConfirmReserveTransaction = await repos.integrationSetting.getByKey('numTryConfirmReserveTransaction');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         let creatingCheckResourceTask;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts

@@ -1,10 +1,10 @@
 import { factory } from '../../../../factory';
-import type { ISetting } from '../../../../repo/setting';
+import type { IIntegrationSettings } from '../../../../repo/setting/integration';
 type IReturnedOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner'>;
 type IReturnAction = factory.action.transfer.returnAction.order.IAttributes & {
     id: string;
 };
-declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IReturnAction, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IReturnAction, setting: IIntegrationSettings['agg']): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 /**
  * 注文返品後のアクション
  */

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

@@ -5,7 +5,7 @@ exports.createOnOrderReturnedTasksByTransaction = createOnOrderReturnedTasksByTr
 const factory_1 = require("../../../../factory");
 function createInformTasks(order, returnOrderAction, setting) {
     const taskRunsAt = new Date();
-    const informOrder = setting?.onOrderStatusChanged?.informOrder;
+    const informOrder = setting?.informActions;
     // const useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true; // discontinue(2025-07-01~)
     const informTasks = [];
     const informIdentifier = `${factory_1.factory.order.OrderType.Order}:${order.orderNumber}:${factory_1.factory.orderStatus.OrderReturned}`;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.d.ts

@@ -1,5 +1,5 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
-import type { SettingRepo } from '../../../repo/setting';
+import type { IntegrationSettingRepo } from '../../../repo/setting/integration';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import { IReturnAction } from './onOrderReturned/factory';
@@ -12,7 +12,7 @@ declare function onOrderReturned(params: {
     returnOrderAction: IReturnAction;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { onOrderReturned };

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

@@ -17,7 +17,7 @@ function onOrderReturned(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+        const setting = await repos.integrationSetting.getByKey('agg');
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });

package/lib/chevre/service/order/onOrderUpdated/factory.d.ts

@@ -1,4 +1,4 @@
 import { factory } from '../../../factory';
-import type { ISetting } from '../../../repo/setting';
-declare function createInformTasks(order: factory.notification.order.IUpdatedOrder4inform, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+import type { IIntegrationSettings } from '../../../repo/setting/integration';
+declare function createInformTasks(order: factory.notification.order.IUpdatedOrder4inform, setting: IIntegrationSettings['agg']): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 export { createInformTasks };

package/lib/chevre/service/order/onOrderUpdated/factory.js

@@ -6,7 +6,7 @@ function createInformTasks(order,
 // settings: Settings,
 setting) {
     const taskRunsAt = new Date();
-    const informOrder = setting?.onOrderStatusChanged?.informOrder;
+    const informOrder = setting?.informActions;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     if (Array.isArray(informOrder) && informOrder.length > 0) {

package/lib/chevre/service/order/onOrderUpdated.d.ts

@@ -1,7 +1,7 @@
 /**
  * 注文変更時処理
  */
-import type { SettingRepo } from '../../repo/setting';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 import type { TaskRepo } from '../../repo/task';
 import { factory } from '../../factory';
 export declare function onOrderUpdated(params: {
@@ -13,6 +13,6 @@ export declare function onOrderUpdated(params: {
     };
     updatedAt: Date;
 }): (repos: {
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -7,7 +7,7 @@ function onOrderUpdated(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
+        const setting = await repos.integrationSetting.getByKey('agg');
         const tasks = (0, factory_2.createInformTasks)({
             typeOf: factory_1.factory.order.OrderType.Order,
             orderNumber: params.orderNumber,

package/lib/chevre/service/order/payOrder.d.ts

@@ -1,11 +1,10 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
-import type { SettingRepo } from '../../repo/setting';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 /**
  * 注文を決済する
  */
@@ -13,8 +12,8 @@ declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPay
     acceptedOffer: AcceptedOfferRepo;
     message: MessageRepo;
     order: OrderRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { payOrder };

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

@@ -7,7 +7,7 @@ const factory_1 = require("../../factory");
  * 注文を決済する
  */
 function payOrder(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
@@ -18,6 +18,6 @@ function payOrder(params) {
             confirmationNumber,
             orderNumber,
             useOnOrderStatusChanged: params.useOnOrderStatusChanged
-        })(repos, settings);
+        })(repos);
     };
 }

package/lib/chevre/service/order/placeOrder.d.ts

@@ -6,11 +6,10 @@ import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authori
 import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
-import type { SettingRepo } from '../../repo/setting';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
-import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
@@ -22,7 +21,7 @@ interface IPlaceOrderRepos {
     message: MessageRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
     placeOrder: PlaceOrderRepo;
 }
@@ -39,5 +38,5 @@ declare function placeOrder(params: {
         orderNumber: string;
     };
     useOnOrderStatusChanged: boolean;
-}): (repos: IPlaceOrderRepos, settings: Settings) => Promise<void>;
+}): (repos: IPlaceOrderRepos) => Promise<void>;
 export { IPlaceOrderRepos, placeOrder };

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

@@ -10,7 +10,7 @@ const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIf
  * 注文を作成する
  */
 function placeOrder(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         // 注文番号から取引と注文をfixする
         const { orderNumber, confirmationNumber, order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             project: { id: params.project.id },
@@ -91,7 +91,7 @@ function placeOrder(params) {
                     confirmationNumber,
                     orderNumber,
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
-                })(repos, settings);
+                })(repos);
             }
         }
         // return { order };

package/lib/chevre/service/order/returnOrder.d.ts

@@ -1,7 +1,7 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { ReturnActionRepo } from '../../repo/action/returnAction';
 import type { OrderRepo } from '../../repo/order';
-import type { SettingRepo } from '../../repo/setting';
+import type { IntegrationSettingRepo } from '../../repo/setting/integration';
 import type { TaskRepo } from '../../repo/task';
 import { factory } from '../../factory';
 declare function returnOrder(params: {
@@ -21,7 +21,7 @@ declare function returnOrder(params: {
         returnAction: ReturnActionRepo;
     };
     order: OrderRepo;
-    setting: SettingRepo;
+    integrationSetting: IntegrationSettingRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { returnOrder };