@chevre/domain 22.6.0-alpha.40 → 22.6.0-alpha.42

package/example/src/chevre/aggregateAllEvents2.ts

@@ -44,15 +44,6 @@ export async function aggregateScreeningEvent() {
                         sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
                     },
                     settings: new chevre.settings.Settings({
-                        onEventChanged: {
-                            informEvent: []
-                        },
-                        onResourceUpdated: {
-                            informResource: []
-                        },
-                        onReservationStatusChanged: {
-                            informReservation: []
-                        },
                         notification: {
                             timeout: 1000,
                             useFetchAPI: true,

package/example/src/chevre/createEventBySchedule.ts

@@ -24,15 +24,6 @@ async function main() {
                 sendGrid: await chevre.credentials.SendGrid.createInstance({ apiKey: 'xxx' })
             },
             settings: new chevre.settings.Settings({
-                onEventChanged: {
-                    informEvent: []
-                },
-                onResourceUpdated: {
-                    informResource: []
-                },
-                onReservationStatusChanged: {
-                    informReservation: []
-                },
                 notification: {
                     timeout: 1000,
                     useFetchAPI: true,

package/example/src/chevre/findSetting.ts

@@ -6,12 +6,22 @@ import { chevre } from '../../../lib/index';
 const informOrderUrls = (typeof process.env.INFORM_ORDER_URL === 'string')
     ? process.env.INFORM_ORDER_URL.split(' ')
     : [];
+const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'string')
+    ? process.env.INFORM_RESERVATION_URL.split(' ')
+    : [];
+const informResourceUrls = (typeof process.env.INFORM_RESOURCE_URL === 'string')
+    ? process.env.INFORM_RESOURCE_URL.split(',')
+    : [];
+const informEvent2aggUrls = (typeof process.env.INFORM_EVENT_AGG_URL === 'string')
+    ? process.env.INFORM_EVENT_AGG_URL.split(' ')
+    : [];
+// tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const result = await settingRepo.findOne({}, ['onOrderStatusChanged']);
+    const result = await settingRepo.findOne({}, ['onResourceUpdated', 'onEventChanged']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -35,6 +45,65 @@ async function main() {
             });
             console.log('saved');
         }
+    } else {
+        const updateResult = await settingRepo.updateByProject(
+            { project: { id: { $eq: '*' } } },
+            {
+                ...(informReservationUrls.length > 0)
+                    ? {
+                        onReservationStatusChanged: {
+                            informReservation: informReservationUrls
+                                .filter((url) => url.length > 0)
+                                .map((url) => {
+                                    return {
+                                        recipient: {
+                                            typeOf: chevre.factory.creativeWorkType.WebApplication,
+                                            name: 'Aggregation Service',
+                                            url
+                                        }
+                                    };
+                                })
+                        }
+                    }
+                    : undefined,
+                ...(informResourceUrls.length > 0)
+                    ? {
+                        onResourceUpdated: {
+                            informResource: informResourceUrls
+                                .filter((url) => url.length > 0)
+                                .map((url) => {
+                                    return {
+                                        recipient: {
+                                            typeOf: chevre.factory.creativeWorkType.WebApplication,
+                                            name: 'Global HUB',
+                                            url
+                                        }
+                                    };
+                                })
+                        }
+                    }
+                    : undefined,
+                ...(informEvent2aggUrls.length > 0)
+                    ? {
+
+                        onEventChanged: {
+                            informEvent2agg: informEvent2aggUrls
+                                .filter((url) => url.length > 0)
+                                .map((url) => {
+                                    return {
+                                        recipient: {
+                                            typeOf: chevre.factory.creativeWorkType.WebApplication,
+                                            name: 'Aggregation Service',
+                                            url
+                                        }
+                                    };
+                                })
+                        }
+                    }
+                    : undefined
+            }
+        );
+        console.log('updated', updateResult);
     }
 }
 

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -6,8 +6,22 @@ interface IOnOrderStatusChanged {
      */
     informOrder?: factory.project.IInformParams[];
 }
+interface IOnReservationStatusChanged {
+    /**
+     * AggService通知先
+     */
+    informReservation?: factory.project.IInformParams[];
+}
+interface IOnEventChanged {
+    informEvent2agg?: factory.project.IInformParams[];
+}
 export interface ISetting {
+    onEventChanged?: IOnEventChanged;
     onOrderStatusChanged: IOnOrderStatusChanged;
+    onReservationStatusChanged?: IOnReservationStatusChanged;
+    onResourceUpdated?: {
+        informResource?: factory.project.IInformParams[];
+    };
     project: {
         id: string;
         typeOf: factory.organizationType.Project;

package/lib/chevre/repo/mongoose/schemas/setting.js

@@ -8,7 +8,10 @@ const modelName = 'Setting';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed
+    onEventChanged: mongoose_1.SchemaTypes.Mixed,
+    onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    onResourceUpdated: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import type { Connection } from 'mongoose';
 import { ISetting } from './mongoose/schemas/setting';
 type IKeyOfProjection = keyof ISetting;
@@ -16,4 +40,11 @@ export declare class SettingRepo {
             };
         };
     }, inclusion: IKeyOfProjection[]): Promise<ISetting | null>;
+    updateByProject(filter: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -47,5 +47,14 @@ class SettingRepo {
                 .exec();
         });
     }
+    updateByProject(filter, update) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { onEventChanged, onReservationStatusChanged, onResourceUpdated } = update;
+            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
+                $set: Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined)
+            })
+                .exec();
+        });
+    }
 }
 exports.SettingRepo = SettingRepo;

package/lib/chevre/service/assetTransaction/reserve/cancel.d.ts

@@ -3,6 +3,7 @@ import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 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';
 type ICancelOperation<T> = (repos: {
@@ -10,6 +11,7 @@ type ICancelOperation<T> = (repos: {
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }, settings: Settings) => Promise<T>;

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

@@ -16,7 +16,9 @@ const cancelReservation_1 = require("../../reserve/cancelReservation");
  * 取引中止
  */
 function cancel(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         // まず取引状態変更
         const { id } = yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Reserve,
@@ -35,7 +37,7 @@ function cancel(params) {
                 id,
                 typeOf: factory.assetTransactionType.Reserve
             }
-        })(repos, settings);
+        })(repos);
     });
 }
 exports.cancel = cancel;

package/lib/chevre/service/assetTransaction/reserve/confirm.d.ts

@@ -4,12 +4,14 @@ import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderRepo } from '../../../repo/order';
 import type { ReservationRepo } from '../../../repo/reservation';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 interface IConfirmRepo {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
 }
 type IConfirmOperation<T> = (repos: IConfirmRepo, settings: Settings) => Promise<T>;

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

@@ -60,7 +60,7 @@ function confirm(params) {
                 potentialReserveAction: { object: { reservationNumber: transaction.transactionNumber } },
                 useOnReservationConfirmed: true,
                 byTask: true
-            })(repos, settings);
+            })(repos);
         }
     });
 }

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -13,6 +13,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';
 interface IStartOperationRepos {
@@ -29,6 +30,7 @@ interface IStartOperationRepos {
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }

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

@@ -28,7 +28,7 @@ const ONE_MONTH_IN_DAYS = 31;
  * 取引開始
  */
 function start(params, options) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const now = new Date();
         const reservationNumber = params.transactionNumber;
@@ -70,7 +70,7 @@ function start(params, options) {
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd,
             // acceptedOffers4transactionObject,
             objectSubReservations
-        })(repos, settings);
+        })(repos);
         return {
             transaction: { id },
             objectSubReservations,
@@ -154,7 +154,9 @@ function createObjectAttributes(params, options) {
  * 予約追加
  */
 function addReservations(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const reservationNumber = params.transaction.transactionNumber;
         const { event, reservationFor, objectSubReservations } = params;
         let lockedOfferRateLimitKeys = [];
@@ -197,7 +199,7 @@ function addReservations(params) {
             transaction: {
                 transactionNumber: reservationNumber
             }
-        })(repos, settings);
+        })(repos);
     });
 }
 /**

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

@@ -11,9 +11,9 @@ import type { MovieTheaterRepo } from '../repo/place/movieTheater';
 import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
 import type { ProjectRepo } from '../repo/project';
 import type { SellerRepo } from '../repo/seller';
+import type { SettingRepo } from '../repo/setting';
 import type { TaskRepo } from '../repo/task';
 import * as factory from '../factory';
-import { Settings } from '../settings';
 interface IImportFromCOAParams {
     project: {
         id: string;
@@ -84,6 +84,7 @@ export declare function updateEvent4ttts(params: {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     project: ProjectRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export {};

package/lib/chevre/service/event.js

@@ -16,6 +16,7 @@ const difference = require("lodash.difference");
 // import { google } from 'googleapis';
 const moment = require("moment-timezone");
 const factory = require("../factory");
+// import { Settings } from '../settings';
 const onEventChanged_1 = require("./offer/onEventChanged");
 const debug = createDebug('chevre-domain:service:event');
 /**
@@ -856,7 +857,9 @@ function createScreeningRoomFromCOA(project, seller, screenFromCOA) {
     };
 }
 function updateEvent4ttts(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const actionAttributes = Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.actionType.UpdateAction, agent: params.agent, object: {
                 id: params.oldEventId,
                 typeOf: factory.eventType.ScreeningEvent
@@ -893,12 +896,9 @@ function updateEvent4ttts(params) {
             typeOf: factory.eventType.ScreeningEvent,
             isNew: false,
             useInform: true
-        })({
-            event: repos.event,
-            eventSeries: repos.eventSeries,
-            project: repos.project,
-            task: repos.task
-        }, settings);
+        })(repos
+        // settings
+        );
     });
 }
 exports.updateEvent4ttts = updateEvent4ttts;

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

@@ -16,6 +16,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';
@@ -55,6 +56,7 @@ declare function processStartReserve4chevre(params: {
     priceSpecification: PriceSpecificationRepo;
     project: ProjectRepo;
     seat: SeatRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -11,12 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onEventChanged = void 0;
 const factory = require("../../factory");
+// import { Settings } from '../../settings';
 /**
  * イベント変更時処理
  */
 function onEventChanged(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         if (params.id.length > 0) {
+            const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'onEventChanged']);
             // ScreeningEventであれば集計タスク -> migrate to agg(2024-10-31~)
             // inform to agg(2024-10-30~)
             yield createInform2aggTasks({
@@ -24,14 +28,14 @@ function onEventChanged(params) {
                 ids: params.id,
                 typeOf: params.typeOf,
                 isNew: params.isNew
-            })(repos, settings);
-            // 通知タスク作成(2023-06-08~)
+            }, setting)(repos);
+            // 通知タスク作成
             if (params.useInform === true) {
                 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 +82,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 +206,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/reserve/cancelReservation.d.ts

@@ -1,9 +1,9 @@
 import * as factory from '../../factory';
-import { Settings } from '../../settings';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
 import { StockHolderRepo } from '../../repo/stockHolder';
 import type { TaskRepo } from '../../repo/task';
 /**
@@ -15,8 +15,9 @@ declare function cancelPendingReservation(actionAttributes: factory.task.cancelP
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 /**
  * 予約をキャンセルする
  */
@@ -25,9 +26,10 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 declare function processUnlockOfferRateLimit(params: {
     reservation: {
         reservationNumber: string;

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

@@ -22,7 +22,9 @@ const onReservationCanceled_1 = require("./potentialActions/onReservationCancele
  * 保留予約取消
  */
 function cancelPendingReservation(actionAttributes) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes)(repos);
         yield (0, onPendingReservationCanceled_1.onPendingReservationCanceled)(
@@ -34,7 +36,7 @@ function cancelPendingReservation(actionAttributes) {
                 id: String((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id)
             },
             reservationNumber: reserveTransaction.object.reservationNumber
-        })({ task: repos.task }, settings);
+        })(repos);
     });
 }
 exports.cancelPendingReservation = cancelPendingReservation;
@@ -157,7 +159,9 @@ function cancelPengindIfNotYet(params) {
  */
 function cancelReservation(actionAttributesList) {
     // 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* () {
         const now = new Date();
         if (actionAttributesList.length > 0) {
             // tslint:disable-next-line:max-func-body-length
@@ -317,7 +321,7 @@ function cancelReservation(actionAttributesList) {
                 {
                     project: { id: actionAttributes.project.id },
                     id: canceledReservationForId
-                })({ task: repos.task }, settings);
+                })(repos);
             })));
         }
     });