@chevre/domain 22.6.0-alpha.8 → 22.6.0

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

@@ -18,6 +18,7 @@ import type { ProductRepo } from '../../../repo/product';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
+import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
@@ -42,6 +43,7 @@ interface IAuthorizeRepos {
     productOffer: ProductOfferRepo;
     project: ProjectRepo;
     seat: SeatRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.d.ts

@@ -5,6 +5,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 { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TransactionRepo } from '../../../../repo/transaction';
@@ -16,6 +17,7 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }

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

@@ -6,6 +6,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 { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
@@ -16,6 +17,7 @@ interface IVoidTransactionRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
     /**

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

@@ -6,6 +6,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 { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
@@ -16,6 +17,7 @@ interface IVoidTransactionByActionIdRepos {
     offerRateLimit: OfferRateLimitRepo;
     orderInTransaction: OrderInTransactionRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
     /**

package/lib/chevre/service/offer/onEventChanged.d.ts

@@ -1,9 +1,9 @@
 import type { EventRepo } from '../../repo/event';
 import type { EventSeriesRepo } from '../../repo/eventSeries';
 import type { ProjectRepo } from '../../repo/project';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
-import { Settings } from '../../settings';
 /**
  * イベント変更時処理
  */
@@ -11,6 +11,7 @@ declare function onEventChanged(params: factory.task.onEventChanged.IData): (rep
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     project: ProjectRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { onEventChanged };

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

@@ -15,8 +15,12 @@ const factory = require("../../factory");
  * イベント変更時処理
  */
 function onEventChanged(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (params.id.length > 0) {
+            const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'onEventChanged', 'useInformResourceTypes']);
+            const useInformResourceTypes = setting === null || setting === void 0 ? void 0 : setting.useInformResourceTypes;
+            const useInform = params.useInform === true
+                && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
             // ScreeningEventであれば集計タスク -> migrate to agg(2024-10-31~)
             // inform to agg(2024-10-30~)
             yield createInform2aggTasks({
@@ -24,14 +28,13 @@ function onEventChanged(params) {
                 ids: params.id,
                 typeOf: params.typeOf,
                 isNew: params.isNew
-            })(repos, settings);
-            // 通知タスク作成(2023-06-08~)
-            if (params.useInform === true) {
+            }, setting)(repos);
+            if (useInform) {
                 yield createInformTasks({
                     project: { id: params.project.id },
                     ids: params.id,
                     typeOf: params.typeOf
-                })(repos, settings);
+                }, setting)(repos);
             }
             if (params.useSync === true) {
                 switch (params.typeOf) {
@@ -78,11 +81,15 @@ function syncEventSeries2screeningEvents(params) {
         }
     });
 }
-function createInformTasks(params) {
+function createInformTasks(params, setting) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let events4inform;
-        const informEvents = settings.onEventChanged.informEvent;
+        // const informEvents = settings.onEventChanged.informEvent;
+        const informEvents = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
         if (params.typeOf === factory.eventType.Event) {
             const eventsFromDB = yield repos.event.projectEventFields({
                 id: { $in: params.ids },
@@ -198,10 +205,14 @@ function createInformTasks(params) {
         }
     });
 }
-function createInform2aggTasks(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+function createInform2aggTasks(params, setting) {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let event4inform;
-        const informEvent2agg = settings.onEventChanged.informEvent2agg;
+        // const informEvent2agg = settings.onEventChanged.informEvent2agg;
+        const informEvent2agg = (_a = setting === null || setting === void 0 ? void 0 : setting.onEventChanged) === null || _a === void 0 ? void 0 : _a.informEvent2agg;
         if (params.typeOf === factory.eventType.ScreeningEvent) {
             event4inform = {
                 id: params.ids,

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

@@ -1,6 +1,7 @@
 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 { TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
@@ -9,6 +10,7 @@ declare function onAssetTransactionStatusChanged(params: factory.task.IData<fact
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }, settings: Settings) => Promise<void>;
@@ -22,6 +24,7 @@ declare function paymentDue2Processing(params: {
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -263,7 +263,7 @@ function paymentDue2Processing(params) {
                     offeredThroughIdentifier, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                  }),
                 placeOrderTransaction
-            })({ task: repos.task }, settings);
+            })(repos, settings);
         }
     });
 }

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

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

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

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformTasks = void 0;
 const factory = require("../../../../factory");
-function createInformTasks(order, settings) {
+function createInformTasks(order, 
+// settings: Settings,
+setting) {
     var _a;
     const taskRunsAt = new Date();
-    const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    // const informOrder = settings.onOrderStatusChanged?.informOrder;
+    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
 declare function onOrderDelivered(params: {
@@ -8,6 +8,7 @@ declare function onOrderDelivered(params: {
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { onOrderDelivered };

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

@@ -15,10 +15,14 @@ exports.onOrderDelivered = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const factory_1 = require("./onOrderDelivered/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderDelivered(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         // const sendOrderPotentialActions =
@@ -26,7 +30,7 @@ function onOrderDelivered(params) {
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order, settings)
+                    ...(0, factory_1.createInformTasks)(params.order, setting)
                     // ...createOnOrderSentTasksByTransaction({
                     //     potentialActions: sendOrderPotentialActions
                     // })

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'project' | 'typeOf' | 'seller' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'customer' | 'id'> & {
     acceptedOffers: {
         limit: number;
@@ -10,7 +10,7 @@ type IInTransitOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'projec
 };
 declare function createInformTasks(params: {
     order: IInTransitOrder;
-}, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+}, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
 }): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];

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

@@ -5,11 +5,14 @@ const factory = require("../../../../factory");
 function creteOrder4inform(order) {
     return Object.assign({ project: order.project, typeOf: order.typeOf, orderNumber: order.orderNumber, acceptedOffers: order.deliveredAcceptedOffers, orderStatus: factory.orderStatus.OrderInTransit }, (typeof order.id === 'string') ? { id: order.id } : undefined);
 }
-function createInformTasks(params, settings) {
+function createInformTasks(params, 
+// settings: Settings,
+setting) {
     var _a;
     const { order } = params;
     const taskRunsAt = new Date();
-    const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    // const informOrder = settings.onOrderStatusChanged?.informOrder;
+    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}:${order.acceptedOffers.page}`;

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

@@ -1,9 +1,10 @@
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import { Settings } from '../../../settings';
 import { IInTransitOrder } from './onOrderDeliveredPartially/factory';
 declare function onOrderDeliveredPartially(params: {
     order: IInTransitOrder;
 }): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { onOrderDeliveredPartially };

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

@@ -15,16 +15,20 @@ exports.onOrderDeliveredPartially = void 0;
  */
 const createDebug = require("debug");
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const factory_1 = require("./onOrderDeliveredPartially/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderDeliveredPartially(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderInTransit:
                 tasks = [
-                    ...(0, factory_1.createInformTasks)({ order: params.order }, settings),
+                    ...(0, factory_1.createInformTasks)({ order: params.order }, setting),
                     ...(0, factory_1.createNextSendOrderTasks)({ order: params.order }) // 次の配送タスクを作成
                 ];
                 break;

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

@@ -1,10 +1,10 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'name' | 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf'> & {
     numAcceptedOffers: number;
     orderStatus: factory.orderStatus.OrderProcessing;
 };
-declare function createInformTasks(order: IProcessingOrder, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: IProcessingOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'orderNumber'> & {
         serialNumbers: string[];

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

@@ -4,10 +4,13 @@ exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmR
 const factory = require("../../../../factory");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const ASTERISK_CHARACTER = '*';
-function createInformTasks(order, settings) {
+function createInformTasks(order, 
+// settings: Settings,
+setting) {
     var _a;
     const taskRunsAt = new Date();
-    const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    // const informOrder = settings.onOrderStatusChanged?.informOrder;
+    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;

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

@@ -1,3 +1,4 @@
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
@@ -12,6 +13,7 @@ declare function onOrderProcessing(params: {
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;
 export { IExternalOrder, onOrderProcessing, processOrder };

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

@@ -23,6 +23,7 @@ const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         const { numTryConfirmReserveTransaction } = settings;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
@@ -31,7 +32,7 @@ function onOrderProcessing(params) {
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order, settings),
+                    ...(0, factory_1.createInformTasks)(params.order, setting),
                     (0, factory_1.createCheckResourceTask)(params.order) // リソース検証タスクを追加(2024-03-13~)
                 ];
                 break;

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

@@ -1,7 +1,7 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 type IReturnedOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner'>;
-declare function createInformTasks(order: IReturnedOrder, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: IReturnedOrder, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 /**
  * 注文返品後のアクション
  */

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

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOnOrderReturnedTasksByTransaction = exports.createInformTasks = void 0;
 const factory = require("../../../../factory");
-function createInformTasks(order, settings) {
+function createInformTasks(order, 
+// settings: Settings,
+setting) {
     var _a, _b;
     const taskRunsAt = new Date();
-    const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    // const informOrder = settings.onOrderStatusChanged?.informOrder;
+    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;

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

@@ -1,7 +1,7 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
 type IReturnOrderTransaction = Pick<factory.transaction.returnOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderReturned(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
@@ -10,6 +10,7 @@ declare function onOrderReturned(params: {
     returnOrderTransaction?: IReturnOrderTransaction;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { onOrderReturned };

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

@@ -16,12 +16,16 @@ exports.onOrderReturned = void 0;
 const createDebug = require("debug");
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_1 = require("./onOrderReturned/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderReturned(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
@@ -49,7 +53,7 @@ function onOrderReturned(params) {
                 const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
                 const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order, settings),
+                    ...(0, factory_1.createInformTasks)(params.order, setting),
                     ...createReturnReserveTransactionTasks(Object.assign(Object.assign({}, params.order), { reservationNumbers,
                         offeredThroughIdentifier,
                         reservationForSuperEventLocationBranchCodes }), simpleOrder),

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

@@ -1,4 +1,4 @@
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
-declare function createInformTasks(order: factory.notification.order.IUpdatedOrder4inform, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+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>[];
 export { createInformTasks };

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

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInformTasks = void 0;
 const factory = require("../../../factory");
-function createInformTasks(order, settings) {
+function createInformTasks(order, 
+// settings: Settings,
+setting) {
     var _a;
     const taskRunsAt = new Date();
-    const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
+    // const informOrder = settings.onOrderStatusChanged?.informOrder;
+    const informOrder = (_a = setting === null || setting === void 0 ? void 0 : setting.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
     const informTasks = [];
     const order4inform = creteOrder4inform(order);
     if (Array.isArray(informOrder) && informOrder.length > 0) {

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

@@ -1,9 +1,9 @@
 /**
  * 注文変更時処理
  */
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
-import { Settings } from '../../settings';
 export declare function onOrderUpdated(params: {
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     name?: string;
@@ -13,5 +13,6 @@ export declare function onOrderUpdated(params: {
     };
     updatedAt: Date;
 }): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;

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

@@ -11,11 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderUpdated = void 0;
 const factory = require("../../factory");
+// import { Settings } from '../../settings';
 const factory_1 = require("./onOrderUpdated/factory");
 function onOrderUpdated(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
         let tasks = [];
-        tasks = (0, factory_1.createInformTasks)(Object.assign(Object.assign({ typeOf: factory.order.OrderType.Order, orderNumber: params.orderNumber, project: { id: params.project.id, typeOf: factory.organizationType.Project }, updatedAt: params.updatedAt }, (typeof params.name === 'string') ? { name: params.name } : undefined), (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), settings);
+        tasks = (0, factory_1.createInformTasks)(Object.assign(Object.assign({ typeOf: factory.order.OrderType.Order, orderNumber: params.orderNumber, project: { id: params.project.id, typeOf: factory.organizationType.Project }, updatedAt: params.updatedAt }, (typeof params.name === 'string') ? { name: params.name } : undefined), (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), 
+        // settings,
+        setting);
         yield repos.task.saveMany(tasks, { emitImmediately: true });
     });
 }

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

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { OrderRepo } from '../../repo/order';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
@@ -10,6 +11,7 @@ import { Settings } from '../../settings';
 declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -3,6 +3,7 @@ import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
@@ -26,6 +27,7 @@ declare function placeOrder(params: {
     action: ActionRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }, settings: Settings) => Promise<{

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

@@ -2,10 +2,10 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { ActionRepo } from '../../repo/action';
 import type { OrderRepo } from '../../repo/order';
 import type { OwnershipInfoRepo } from '../../repo/ownershipInfo';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
 import * as factory from '../../factory';
-import { Settings } from '../../settings';
 declare function returnOrder(params: {
     agent: factory.action.transfer.returnAction.order.IAgent;
     object: {
@@ -21,7 +21,8 @@ declare function returnOrder(params: {
     action: ActionRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { returnOrder };