@chevre/domain 22.5.0-alpha.50 → 22.5.0-alpha.52

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

@@ -27,6 +27,13 @@ function onEventChanged(params) {
                     identifier: `onEventChanged`
                 })(repos);
             }
+            // inform to agg(2024-10-30~)
+            yield createInform2aggTasks({
+                project: { id: params.project.id },
+                ids: params.id,
+                typeOf: params.typeOf,
+                isNew: params.isNew
+            })(repos, settings);
             // 通知タスク作成(2023-06-08~)
             if (params.useInform === true) {
                 yield createInformTasks({
@@ -257,3 +264,49 @@ function createInformTasks(params) {
         }
     });
 }
+function createInform2aggTasks(params) {
+    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+        let event4inform;
+        const informEvent2agg = settings.onEventChanged.informEvent2agg;
+        if (params.typeOf === factory.eventType.ScreeningEvent) {
+            event4inform = {
+                id: params.ids,
+                isNew: params.isNew === true,
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                typeOf: factory.eventType.ScreeningEvent
+            };
+        }
+        if (event4inform !== undefined) {
+            const informObject = event4inform;
+            if (Array.isArray(informEvent2agg)) {
+                const taskRunsAt = new Date();
+                const informTasks = informEvent2agg.map((informEvent) => {
+                    var _a, _b;
+                    const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    const informActionAttributes = {
+                        object: informObject,
+                        recipient: {
+                            id: '',
+                            name: String((_b = informEvent.recipient) === null || _b === void 0 ? void 0 : _b.name),
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        }
+                    };
+                    return {
+                        project: informObject.project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: taskRunsAt,
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informActionAttributes
+                    };
+                });
+                if (informTasks.length > 0) {
+                    yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                }
+            }
+        }
+    });
+}

package/lib/chevre/service/reserve/potentialActions/onPendingReservationCanceled.js

@@ -11,23 +11,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPendingReservationCanceled = void 0;
 const factory = require("../../../factory");
-const onEventChanged_1 = require("../../offer/onEventChanged");
+// import { createAggregateScreeningEventIfNotExist } from '../../offer/onEventChanged';
 const factory_1 = require("../factory");
 function onPendingReservationCanceled(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const { project, reservationFor, reservationNumber } = params;
+        const { reservationFor, reservationNumber } = params;
         // migrate to agg(2024-10-29~)
-        if (!settings.useAggregationOnAggService) {
-            if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
-                // 冗長な作成を避ける
-                yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
-                    project: { id: project.id },
-                    reservationFor: [{ id: reservationFor.id }],
-                    force: false,
-                    identifier: `onPendingReservationCanceled:${reservationNumber}`
-                })({ task: repos.task });
-            }
-        }
+        // if (typeof reservationFor?.id === 'string') {
+        //     // 冗長な作成を避ける
+        //     await createAggregateScreeningEventIfNotExist({
+        //         project: { id: project.id },
+        //         reservationFor: [{ id: reservationFor.id }],
+        //         force: false,
+        //         identifier: `onPendingReservationCanceled:${reservationNumber}`
+        //     })({ task: repos.task });
+        // }
         // inform(2024-10-25~)
         const informReservations = settings.onReservationStatusChanged.informReservation;
         const now = new Date();

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -14,7 +14,7 @@ exports.onReservationCanceled = void 0;
  * 予約取消時アクション
  */
 const factory = require("../../../factory");
-const onEventChanged_1 = require("../../offer/onEventChanged");
+// import { createAggregateScreeningEventIfNotExist } from '../../offer/onEventChanged';
 const factory_1 = require("../factory");
 // tslint:disable-next-line:max-func-body-length
 function onReservationCanceled(
@@ -28,7 +28,6 @@ canceledReservations,
  */
 reservationFor) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const informReservations = settings.onReservationStatusChanged.informReservation;
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
             const now = new Date();
@@ -77,15 +76,13 @@ reservationFor) {
         }
         if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
             // migrate to agg(2024-10-29~)
-            if (!settings.useAggregationOnAggService) {
-                // 冗長な作成を避ける
-                yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
-                    project: { id: reservationFor.project.id },
-                    reservationFor: [{ id: reservationFor.id }],
-                    force: false,
-                    identifier: `onReservationCanceled:${(_a = canceledReservations === null || canceledReservations === void 0 ? void 0 : canceledReservations[0]) === null || _a === void 0 ? void 0 : _a.reservationNumber}`
-                })({ task: repos.task });
-            }
+            // 冗長な作成を避ける
+            // await createAggregateScreeningEventIfNotExist({
+            //     project: { id: reservationFor.project.id },
+            //     reservationFor: [{ id: reservationFor.id }],
+            //     force: false,
+            //     identifier: `onReservationCanceled:${canceledReservations?.[0]?.reservationNumber}`
+            // })({ task: repos.task });
         }
     });
 }

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -14,13 +14,13 @@ exports.onReservationCheckedIn = void 0;
  * 予約発券時アクション
  */
 const factory = require("../../../factory");
-const onEventChanged_1 = require("../../offer/onEventChanged");
+// import { createAggregateScreeningEventIfNotExist } from '../../offer/onEventChanged';
 const factory_1 = require("../factory");
 // tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const tasks = [];
         const project = { id: params.project.id, typeOf: factory.organizationType.Project };
         const informReservations = settings.onReservationStatusChanged.informReservation;
@@ -71,28 +71,29 @@ function onReservationCheckedIn(params) {
             yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // migrate to agg(2024-10-29~)
-        if (!settings.useAggregationOnAggService) {
-            // 冗長な作成を避ける
-            const reservationForIds = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.ids;
-            if (Array.isArray(reservationForIds)) {
-                // 集計タスクを追加
-                yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
-                    // すでにイベントが削除されているケースに備えて、イベント存在検証(2023-09-12~)
-                    const existingEvents = yield repos.event.projectEventFields({
-                        id: { $eq: reservationForId },
-                        typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
-                    }, ['typeOf']);
-                    if (existingEvents.length > 0) {
-                        yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
-                            project: { id: params.project.id },
-                            reservationFor: [{ id: reservationForId }],
-                            force: false,
-                            identifier: `onReservationCheckedIn:${ticketToken}`
-                        })({ task: repos.task });
-                    }
-                })));
-            }
-        }
+        // 冗長な作成を避ける
+        // const reservationForIds = params.object.reservationFor?.ids;
+        // if (Array.isArray(reservationForIds)) {
+        //     // 集計タスクを追加
+        //     await Promise.all(reservationForIds.map(async (reservationForId) => {
+        //         // すでにイベントが削除されているケースに備えて、イベント存在検証(2023-09-12~)
+        //         const existingEvents = <Pick<factory.event.IEvent<factory.eventType>, 'id'>[]>await repos.event.projectEventFields(
+        //             {
+        //                 id: { $eq: reservationForId },
+        //                 typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
+        //             },
+        //             ['typeOf']
+        //         );
+        //         if (existingEvents.length > 0) {
+        //             await createAggregateScreeningEventIfNotExist({
+        //                 project: { id: params.project.id },
+        //                 reservationFor: [{ id: reservationForId }],
+        //                 force: false,
+        //                 identifier: `onReservationCheckedIn:${ticketToken}`
+        //             })({ task: repos.task });
+        //         }
+        //     }));
+        // }
     });
 }
 exports.onReservationCheckedIn = onReservationCheckedIn;

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -14,7 +14,7 @@ exports.onReservationConfirmed = exports.onReservationConfirmedByAction = void 0
  * 予約確定時アクション
  */
 const factory = require("../../../factory");
-const onEventChanged_1 = require("../../offer/onEventChanged");
+// import { createAggregateScreeningEventIfNotExist } from '../../offer/onEventChanged';
 const factory_1 = require("../factory");
 /**
  * 予約確定後のアクション
@@ -57,14 +57,12 @@ function onReservationConfirmed(confirmedReservations) {
             // ひとつめの予約からReservationPackageの共有属性を取り出す
             const { bookingTime, issuedThrough, project, provider, reservationFor, reservationNumber, underName } = confirmedReservations[0];
             // migrate to agg(2024-10-29~)
-            if (!settings.useAggregationOnAggService) {
-                yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
-                    project,
-                    reservationFor: [{ id: reservationFor.id }],
-                    force: false,
-                    identifier: `onReservationConfirmed:${reservationNumber}`
-                })({ task: repos.task });
-            }
+            // await createAggregateScreeningEventIfNotExist({
+            //     project,
+            //     reservationFor: [{ id: reservationFor.id }],
+            //     force: false,
+            //     identifier: `onReservationConfirmed:${reservationNumber}`
+            // })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];
             const subReservations4inform = confirmedReservations.map((r) => {

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -15,7 +15,7 @@ exports.onReservationUsed = void 0;
  */
 const moment = require("moment");
 const factory = require("../../../factory");
-const onEventChanged_1 = require("../../offer/onEventChanged");
+// import { createAggregateScreeningEventIfNotExist } from '../../offer/onEventChanged';
 const factory_1 = require("../factory");
 /**
  * 予約使用
@@ -76,46 +76,45 @@ function onReservationUsed(attendedReservation) {
         // dependent on project settings(2024-10-29~)
         // if (settings.useAggregateEntranceGateProjects.includes(attendedReservation.project.id)) {
         if (useAggregateEntranceGate) {
-            if (!settings.useAggregationOnAggService) {
-                // 使用アクション集計タスクを作成する(冗長な作成を避ける)
-                const readyAggregateUseActionsTaskDoc = yield repos.task.taskModel.findOne({
-                    'project.id': { $eq: attendedReservation.project.id },
-                    name: { $eq: factory.taskName.AggregateUseActionsOnEvent },
-                    status: { $eq: factory.taskStatus.Ready },
-                    'data.id': { $exists: true, $eq: attendedReservation.reservationFor.id }
-                }, { _id: 1 })
-                    .exec();
-                if (readyAggregateUseActionsTaskDoc === null) {
-                    const aggregateUseActionsTask = {
-                        project: attendedReservation.project,
-                        name: factory.taskName.AggregateUseActionsOnEvent,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 3,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: {
-                            typeOf: attendedReservation.reservationFor.typeOf,
-                            id: attendedReservation.reservationFor.id
-                        }
-                    };
-                    tasks.push(aggregateUseActionsTask);
-                }
-            }
+            // 使用アクション集計タスクを作成する(冗長な作成を避ける)
+            // const readyAggregateUseActionsTaskDoc = await repos.task.taskModel.findOne(
+            //     {
+            //         'project.id': { $eq: attendedReservation.project.id },
+            //         name: { $eq: factory.taskName.AggregateUseActionsOnEvent },
+            //         status: { $eq: factory.taskStatus.Ready },
+            //         'data.id': { $exists: true, $eq: attendedReservation.reservationFor.id }
+            //     },
+            //     { _id: 1 }
+            // )
+            //     .exec();
+            // if (readyAggregateUseActionsTaskDoc === null) {
+            //     const aggregateUseActionsTask: factory.task.aggregateUseActionsOnEvent.IAttributes = {
+            //         project: attendedReservation.project,
+            //         name: factory.taskName.AggregateUseActionsOnEvent,
+            //         status: factory.taskStatus.Ready,
+            //         runsAt: now,
+            //         remainingNumberOfTries: 3,
+            //         numberOfTried: 0,
+            //         executionResults: [],
+            //         data: {
+            //             typeOf: attendedReservation.reservationFor.typeOf,
+            //             id: attendedReservation.reservationFor.id
+            //         }
+            //     };
+            //     tasks.push(aggregateUseActionsTask);
+            // }
         }
         if (tasks.length > 0) {
             yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // migrate to agg(2024-10-29~)
-        if (!settings.useAggregationOnAggService) {
-            // 冗長な作成を避ける
-            yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
-                project: attendedReservation.project,
-                reservationFor: [{ id: attendedReservation.reservationFor.id }],
-                force: false,
-                identifier: `onReservationUsed:${attendedReservation.id}`
-            })({ task: repos.task });
-        }
+        // 冗長な作成を避ける
+        // await createAggregateScreeningEventIfNotExist({
+        //     project: attendedReservation.project,
+        //     reservationFor: [{ id: attendedReservation.reservationFor.id }],
+        //     force: false,
+        //     identifier: `onReservationUsed:${attendedReservation.id}`
+        // })({ task: repos.task });
     });
 }
 exports.onReservationUsed = onReservationUsed;

package/lib/chevre/service/reserve/potentialActions/onReservationsCreated.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onReservationsCreated = void 0;
 const factory = require("../../../factory");
-const onEventChanged_1 = require("../../offer/onEventChanged");
+// import { createAggregateScreeningEventIfNotExist } from '../../offer/onEventChanged';
 const factory_1 = require("../factory");
 /**
  * 予約作成時イベント
@@ -19,15 +19,13 @@ const factory_1 = require("../factory");
 function onReservationsCreated(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         // migrate to agg(2024-10-29~)
-        if (!settings.useAggregationOnAggService) {
-            // 集計タスク
-            yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
-                project: { id: params.project.id },
-                reservationFor: [{ id: params.event.id }],
-                force: false,
-                identifier: `onReservationsCreated:${params.transaction.transactionNumber}`
-            })({ task: repos.task });
-        }
+        // 集計タスク
+        // await createAggregateScreeningEventIfNotExist({
+        //     project: { id: params.project.id },
+        //     reservationFor: [{ id: params.event.id }],
+        //     force: false,
+        //     identifier: `onReservationsCreated:${params.transaction.transactionNumber}`
+        // })({ task: repos.task });
         // inform(2024-10-25~)
         const informReservations = settings.onReservationStatusChanged.informReservation;
         const now = new Date();

package/lib/chevre/settings.d.ts

@@ -27,11 +27,13 @@ interface IWebhookSettings {
      */
     headerIdentifier?: string;
 }
+interface IOnEventChanged {
+    informEvent?: factory.project.IInformParams[];
+    informEvent2agg?: factory.project.IInformParams[];
+}
 interface IOptions {
     onOrderStatusChanged: IOnOrderStatusChanged;
-    onEventChanged: {
-        informEvent?: factory.project.IInformParams[];
-    };
+    onEventChanged: IOnEventChanged;
     onReservationStatusChanged: IOnReservationStatusChanged;
     onResourceUpdated: {
         informResource?: factory.project.IInformParams[];
@@ -77,7 +79,6 @@ interface IOptions {
          */
         minIntervalBetweenPayAndRefund: number;
     };
-    useAggregationOnAggService?: boolean;
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
     notification: IWebhookSettings;
@@ -87,9 +88,7 @@ interface IOptions {
  */
 declare class Settings {
     readonly onOrderStatusChanged: IOnOrderStatusChanged;
-    readonly onEventChanged: {
-        informEvent?: factory.project.IInformParams[];
-    };
+    readonly onEventChanged: IOnEventChanged;
     readonly onReservationStatusChanged: IOnReservationStatusChanged;
     readonly onResourceUpdated: {
         informResource?: factory.project.IInformParams[];
@@ -138,7 +137,6 @@ declare class Settings {
          */
         minIntervalBetweenPayAndRefund: number;
     };
-    readonly useAggregationOnAggService: boolean;
     readonly useAssetTransactionSyncProcessing: boolean;
     readonly useExperimentalFeature: boolean;
     /**

package/lib/chevre/settings.js

@@ -12,7 +12,7 @@ class Settings {
         // useAggregateEntranceGateProjects,
         // useAggregateOfferProjects,
         // useOfferRateLimitProjects,
-        abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAggregationOnAggService, useAssetTransactionSyncProcessing, useExperimentalFeature, notification } = options;
+        abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, notification } = options;
         this.onEventChanged = onEventChanged;
         this.onOrderStatusChanged = onOrderStatusChanged;
         this.onResourceUpdated = onResourceUpdated;
@@ -30,7 +30,6 @@ class Settings {
         this.coa = coa;
         this.gmo = gmo;
         this.movieticketReserve = movieticketReserve;
-        this.useAggregationOnAggService = useAggregationOnAggService === true;
         this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
         this.notification = notification;

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.388.0-alpha.9",
-    "@cinerino/sdk": "10.16.0-alpha.3",
+    "@chevre/factory": "4.388.0-alpha.10",
+    "@cinerino/sdk": "10.16.0-alpha.4",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.5.0-alpha.50"
+  "version": "22.5.0-alpha.52"
 }