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

package/example/src/chevre/aggregateAllEvents2.ts

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

package/example/src/chevre/createEventBySchedule.ts

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

package/example/src/chevre/findSetting.ts

@@ -12,12 +12,16 @@ const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'st
 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', 'onReservationStatusChanged', 'onResourceUpdated']);
+    const result = await settingRepo.findOne({}, ['onResourceUpdated', 'onEventChanged']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -78,6 +82,24 @@ async function main() {
                                 })
                         }
                     }
+                    : 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
             }
         );

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

@@ -12,7 +12,11 @@ interface IOnReservationStatusChanged {
      */
     informReservation?: factory.project.IInformParams[];
 }
+interface IOnEventChanged {
+    informEvent2agg?: factory.project.IInformParams[];
+}
 export interface ISetting {
+    onEventChanged?: IOnEventChanged;
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged?: IOnReservationStatusChanged;
     onResourceUpdated?: {

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

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

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

@@ -46,5 +46,5 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onReservationStatusChanged' | 'onResourceUpdated'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

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

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/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/task/createEvent/createEvent.d.ts

@@ -8,8 +8,8 @@ import type { ScreeningRoomRepo } from '../../../repo/place/screeningRoom';
 import type { ProductRepo } from '../../../repo/product';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ScheduleRepo } from '../../../repo/schedule';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import { Settings } from '../../../settings';
 export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
     action: ActionRepo;
     event: EventRepo;
@@ -20,5 +20,6 @@ export declare function createEvent(params: factory.task.createEvent.IData): (re
     product: ProductRepo;
     project: ProjectRepo;
     schedule: ScheduleRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;

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

@@ -11,10 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEvent = void 0;
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const createEventBySchedule_1 = require("./createEventBySchedule");
 const createEventSeries_1 = require("./createEventSeries");
 function createEvent(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(params.object) && params.instrument !== undefined) {
             yield (0, createEventSeries_1.createEventSeries)({
                 agent: params.agent,
@@ -33,7 +36,7 @@ function createEvent(params) {
                 project: params.project,
                 targetCollection: params.targetCollection,
                 typeOf: params.typeOf
-            })(repos, settings);
+            })(repos);
         }
         else {
             throw new factory.errors.NotImplemented('unexpected task not implemented');

package/lib/chevre/service/task/createEvent/createEventBySchedule.d.ts

@@ -7,9 +7,9 @@ import type { ScreeningRoomRepo } from '../../../repo/place/screeningRoom';
 import type { ProductRepo } from '../../../repo/product';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ScheduleRepo } from '../../../repo/schedule';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
 export declare function createEventBySchedule(params: factory.task.createEvent.ICreateEventByScheduleAction): (repos: {
     action: ActionRepo;
     event: EventRepo;
@@ -20,5 +20,6 @@ export declare function createEventBySchedule(params: factory.task.createEvent.I
     product: ProductRepo;
     project: ProjectRepo;
     schedule: ScheduleRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;

package/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -14,13 +14,16 @@ const createDebug = require("debug");
 // import * as fs from 'fs';
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const event_1 = require("../../event");
 const debug = createDebug('chevre-domain:service:task');
 function createEvents(
 // schedule: factory.schedule.ISchedule4ttts | factory.schedule.IEventWithSchedule,
 schedule, createDate) {
     // tslint:disable-next-line:cyclomatic-complexity 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, _b, _c, _d, _e, _f, _g, _h;
         // console.log(moment.duration(15, 'minute').toISOString());
         // return;
@@ -224,7 +227,9 @@ schedule, createDate) {
                 attributes: eventAttributes,
                 project: { id: eventAttributes.project.id },
                 agent: eventAttributes.project
-            })(repos, settings);
+            })(repos
+            // settings
+            );
             debug('event update(updateEvent4ttts)', id, eventAttributes.startDate);
         }
         debug(targetInfo.length, 'events updated');
@@ -350,7 +355,9 @@ function getTargetInfoByEventWithSchedule(settings, createDate) {
     return performanceInfos;
 }
 function createEventBySchedule(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const schedule = yield repos.schedule.findOne({
             id: { $eq: params.object.eventSchedule.id },
             project: { id: { $eq: params.project.id } }
@@ -358,7 +365,7 @@ function createEventBySchedule(params) {
         if (schedule === null) {
             throw new factory.errors.NotFound('Schedule');
         }
-        yield createEvents(schedule, (params.object.startDate instanceof Date) ? params.object.startDate : new Date())(repos, settings);
+        yield createEvents(schedule, (params.object.startDate instanceof Date) ? params.object.startDate : new Date())(repos);
     });
 }
 exports.createEventBySchedule = createEventBySchedule;

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

@@ -19,13 +19,14 @@ const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const schedule_1 = require("../../repo/schedule");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const createEvent_1 = require("./createEvent/createEvent");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         yield (0, createEvent_1.createEvent)(data)({
             action: new action_1.ActionRepo(connection),
             event: new event_1.EventRepo(connection),
@@ -36,8 +37,11 @@ function call(data) {
             product: new product_1.ProductRepo(connection),
             project: new project_1.ProjectRepo(connection),
             schedule: new schedule_1.ScheduleRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }, settings);
+        }
+        // settings
+        );
     });
 }
 exports.call = call;

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

@@ -13,19 +13,23 @@ exports.call = void 0;
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const project_1 = require("../../repo/project");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const onEventChanged_1 = require("../offer/onEventChanged");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         yield (0, onEventChanged_1.onEventChanged)(data)({
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
             project: new project_1.ProjectRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }, settings);
+        }
+        // settings
+        );
     });
 }
 exports.call = call;

package/lib/chevre/settings.d.ts

@@ -1,4 +1,3 @@
-import * as factory from './factory';
 import { AggregationSettings, ICallableTaskOperation, ICallResult, IOperationExecute } from './settings/aggregation';
 interface IWebhookSettings {
     /**
@@ -15,10 +14,6 @@ interface IWebhookSettings {
      */
     headerIdentifier?: string;
 }
-interface IOnEventChanged {
-    informEvent?: factory.project.IInformParams[];
-    informEvent2agg?: factory.project.IInformParams[];
-}
 interface ISurfrockSettings {
     /**
      * 着券時タイムアウト
@@ -39,7 +34,6 @@ interface ISurfrockSettings {
     credentialsExpireInSeconds?: number;
 }
 interface IOptions {
-    onEventChanged: IOnEventChanged;
     userPoolIdOld: string;
     userPoolIdNew: string;
     abortedTasksWithoutReport: string[];
@@ -76,7 +70,6 @@ interface IOptions {
  * domain settings
  */
 declare class Settings {
-    readonly onEventChanged: IOnEventChanged;
     readonly userPoolIdOld: string;
     readonly userPoolIdNew: string;
     readonly abortedTasksWithoutReport: string[];

package/lib/chevre/settings.js

@@ -1,4 +1,5 @@
 "use strict";
+// import * as factory from './factory';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Settings = exports.AggregationSettings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
 const aggregation_1 = require("./settings/aggregation");
@@ -8,12 +9,13 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, 
+        const { 
+        // onEventChanged,
         // onOrderStatusChanged,
         // onResourceUpdated,
         // onReservationStatusChanged,
         userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, notification } = options;
-        this.onEventChanged = onEventChanged;
+        // this.onEventChanged = onEventChanged;
         // this.onOrderStatusChanged = onOrderStatusChanged;
         // this.onResourceUpdated = onResourceUpdated;
         // this.onReservationStatusChanged = onReservationStatusChanged;

package/package.json

@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.41"
+  "version": "22.6.0-alpha.42"
 }