@chevre/domain 22.6.0-alpha.14 → 22.6.0-alpha.17

package/lib/chevre/service/aggregation/event/aggregateOffers.js

@@ -122,8 +122,8 @@ function aggregateOfferByEvent(params) {
 function aggregateReservationByOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let reservationCount4offer;
-        let attendeeCount4offer;
-        let checkInCount4offer;
+        // let attendeeCount4offer: number | undefined;
+        // let checkInCount4offer: number | undefined;
         let reservationType = factory.reservationType.EventReservation;
         if (params.event.typeOf === factory.eventType.Event) {
             reservationType = factory.reservationType.BusReservation;
@@ -142,32 +142,31 @@ function aggregateReservationByOffer(params) {
                 // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } }
                 reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } }
             });
-            attendeeCount4offer = yield repos.reservation.count({
-                typeOf: reservationType,
-                reservationFor: { id: { $eq: params.event.id } },
-                reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-                // オファーカテゴリーごとに集計する(2024-11-10~)
-                // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
-                reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
-                attended: true
-            });
-            checkInCount4offer = yield repos.reservation.count({
-                typeOf: reservationType,
-                reservationFor: { id: { $eq: params.event.id } },
-                reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-                // オファーカテゴリーごとに集計する(2024-11-10~)
-                // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
-                reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
-                checkedIn: true
-            });
+            // attendeeCount4offer = await repos.reservation.count({
+            //     typeOf: reservationType,
+            //     reservationFor: { id: { $eq: params.event.id } },
+            //     reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            //     // オファーカテゴリーごとに集計する(2024-11-10~)
+            //     // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
+            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
+            //     attended: true
+            // });
+            // checkInCount4offer = await repos.reservation.count({
+            //     typeOf: reservationType,
+            //     reservationFor: { id: { $eq: params.event.id } },
+            //     reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            //     // オファーカテゴリーごとに集計する(2024-11-10~)
+            //     // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } },
+            //     reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } },
+            //     checkedIn: true
+            // });
         }
         const { maximumAttendeeCapacity, remainingAttendeeCapacity } = yield calculateCapacityByOffer(params)(repos);
         return Object.assign(Object.assign({ aggregateReservation: {
                 typeOf: 'AggregateReservation',
-                // aggregateDate: params.aggregateDate, // 最適化につき廃止(2024-03-26~)
-                reservationCount: reservationCount4offer,
-                attendeeCount: attendeeCount4offer,
-                checkInCount: checkInCount4offer
+                reservationCount: reservationCount4offer
+                // attendeeCount: attendeeCount4offer, // discontinue(2024-11-10~)
+                // checkInCount: checkInCount4offer // discontinue(2024-11-10~)
             } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined);
     });
 }

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

@@ -15,35 +15,44 @@ const moment = require("moment-timezone");
 const factory = require("../../../factory");
 const event_1 = require("../../event");
 const debug = createDebug('chevre-domain:service:task');
-// enum RoleName {
-//     Customer = 'customer',
-//     POS = 'pos'
-// }
-// const AVAILABLE_ROLE_NAMES: string[] = [RoleName.Customer, RoleName.POS];
-function createEvents(schedule
-// createDate?: Date
-) {
-    // tslint:disable-next-line:max-func-body-length
+function createEvents(schedule, createDate) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const eventServiceId = (_b = (_a = schedule.offers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.id;
         const makesOffer = (_d = (_c = schedule.offers) === null || _c === void 0 ? void 0 : _c.seller) === null || _d === void 0 ? void 0 : _d.makesOffer;
         const applicationIds = (Array.isArray(makesOffer))
             ? makesOffer.map(({ availableAtOrFrom }) => availableAtOrFrom.id)
             : [];
+        const eventSeriesId = (_e = schedule.superEvent) === null || _e === void 0 ? void 0 : _e.id;
         if (typeof eventServiceId !== 'string' || eventServiceId === '') {
             throw new factory.errors.NotFound('schedule.offers.itemOffered.id');
         }
+        if (typeof eventSeriesId !== 'string' || eventSeriesId === '') {
+            throw new factory.errors.NotFound('schedule.superEvent.id');
+        }
         const project = schedule.project;
         // 引数情報取得
-        const targetInfo = getTargetInfoForCreateFromSetting(schedule);
+        const targetInfo = getTargetInfoForCreateFromSetting(schedule, createDate);
         debug(targetInfo.length, 'targetInfos ->', targetInfo);
+        // 施設コンテンツ検索
+        const screeningEventSeries = (yield repos.eventSeries.projectEventSeriesFields({
+            project: { id: { $eq: project.id } },
+            id: { $eq: eventSeriesId }
+        }, [
+            'location', 'additionalProperty', 'description', 'endDate', 'headline', 'kanaName', 'name',
+            'soundFormat', 'startDate', 'typeOf', 'videoFormat', 'workPerformed'
+        ])).shift();
+        if (screeningEventSeries === undefined) {
+            throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
+        }
+        const workPerformedIdentifier = screeningEventSeries.workPerformed.identifier;
         // 劇場検索
         const movieTheaters = yield repos.movieTheater.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: project.id } },
-            branchCode: { $eq: schedule.theater }
+            branchCode: { $eq: screeningEventSeries.location.branchCode }
         }, ['id', 'branchCode', 'offers', 'parentOrganization']);
         const movieTheater = movieTheaters.shift();
         if (movieTheater === undefined) {
@@ -60,18 +69,6 @@ function createEvents(schedule
         if (screeningRoom === undefined) {
             throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
         }
-        // 施設コンテンツ検索
-        const workPerformedIdentifier = schedule.film;
-        const screeningEventSeries = (yield repos.eventSeries.projectEventSeriesFields({
-            project: { id: { $eq: project.id } },
-            workPerformed: { identifiers: [workPerformedIdentifier] }
-        }, [
-            'location', 'additionalProperty', 'description', 'endDate', 'headline', 'kanaName', 'name',
-            'soundFormat', 'startDate', 'typeOf', 'videoFormat', 'workPerformed'
-        ])).shift();
-        if (screeningEventSeries === undefined) {
-            throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
-        }
         // 興行検索
         // const eventServiceProductID = schedule.eventServiceProductID; // 興行設定に変更(2023-09-24~)
         const searchEventServicesResult = yield repos.product.projectFields({
@@ -113,7 +110,7 @@ function createEvents(schedule
                 screeningRoom.branchCode,
                 performanceInfo.start_time
             ].join('');
-            const maxValue = (_f = (_e = movieTheater.offers) === null || _e === void 0 ? void 0 : _e.eligibleQuantity) === null || _f === void 0 ? void 0 : _f.maxValue;
+            const maxValue = (_g = (_f = movieTheater.offers) === null || _f === void 0 ? void 0 : _f.eligibleQuantity) === null || _g === void 0 ? void 0 : _g.maxValue;
             const availabilityEnds = moment(performanceInfo.end_date)
                 .tz('Asia/Tokyo')
                 .endOf('date')
@@ -168,7 +165,7 @@ function createEvents(schedule
                                 ? { name: screeningEventSeries.location.name }
                                 : undefined)
                         }
-                    } }, { name: { ja: (typeof eventService.name === 'string') ? eventService.name : String((_g = eventService.name) === null || _g === void 0 ? void 0 : _g.ja) } }), seller: offersSeller }, {
+                    } }, { name: { ja: (typeof eventService.name === 'string') ? eventService.name : String((_h = eventService.name) === null || _h === void 0 ? void 0 : _h.ja) } }), seller: offersSeller }, {
             // availabilityEnds, // discontinue(2024-10-16~)
             // availabilityStarts,
             // validThrough,
@@ -223,9 +220,9 @@ function createEvents(schedule
 /**
  * パフォーマンス作成・作成対象情報取得
  */
-function getTargetInfoForCreateFromSetting(settings) {
+function getTargetInfoForCreateFromSetting(settings, createDate) {
     const performanceInfos = [];
-    const { days, duration, noPerformanceTimes, createDate, hours, start, minutes, tours } = settings;
+    const { days, duration, noPerformanceTimes, hours, start, minutes, tours } = settings;
     // 作成対象時間: 9,10,11など
     // const hours: string[] = ['9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22'];
     // 作成開始が今日から何日後か: 30
@@ -290,7 +287,7 @@ function createEventBySchedule(params) {
         if (schedule === null) {
             throw new factory.errors.NotFound('Schedule');
         }
-        yield createEvents(schedule)(repos, settings);
+        yield createEvents(schedule, (params.object.startDate instanceof Date) ? params.object.startDate : new Date())(repos, settings);
     });
 }
 exports.createEventBySchedule = createEventBySchedule;

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.389.0-alpha.10",
-    "@cinerino/sdk": "10.16.0-alpha.7",
+    "@chevre/factory": "4.389.0-alpha.12",
+    "@cinerino/sdk": "10.16.0-alpha.8",
     "@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.6.0-alpha.14"
+  "version": "22.6.0-alpha.17"
 }