@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateOffers = aggregateOffers;
 const createDebug = require("debug");
@@ -19,30 +10,34 @@ const debug = createDebug('chevre-domain:service:aggregation');
  * イベントに対するオファー集計
  */
 function aggregateOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 集計対象イベント検索
-        const event = yield repos.event.projectEventFieldsById({ id: params.id }, [
+        const event = await repos.event.projectEventFieldsById({ id: params.id }, [
             'location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'
         ] // projection(2024-07-21~)
         );
-        const eventCapacity = (yield repos.event.projectEventFields({
+        const eventCapacity = (await repos.event.projectEventFields({
             limit: 1,
             page: 1,
             id: { $eq: params.id },
             typeOf: params.typeOf
         }, ['maximumAttendeeCapacity', 'remainingAttendeeCapacity'])).shift();
         debug('processing aggregateOffersByEvent...', eventCapacity);
-        yield aggregateOffersByEvent({
-            event: Object.assign(Object.assign(Object.assign({}, event), (typeof (eventCapacity === null || eventCapacity === void 0 ? void 0 : eventCapacity.maximumAttendeeCapacity) === 'number')
-                ? { maximumAttendeeCapacity: eventCapacity.maximumAttendeeCapacity }
-                : undefined), (typeof (eventCapacity === null || eventCapacity === void 0 ? void 0 : eventCapacity.remainingAttendeeCapacity) === 'number')
-                ? { remainingAttendeeCapacity: eventCapacity.remainingAttendeeCapacity }
-                : undefined)
+        await aggregateOffersByEvent({
+            event: {
+                ...event,
+                ...(typeof eventCapacity?.maximumAttendeeCapacity === 'number')
+                    ? { maximumAttendeeCapacity: eventCapacity.maximumAttendeeCapacity }
+                    : undefined,
+                ...(typeof eventCapacity?.remainingAttendeeCapacity === 'number')
+                    ? { remainingAttendeeCapacity: eventCapacity.remainingAttendeeCapacity }
+                    : undefined
+            }
         })(repos);
-    });
+    };
 }
 function aggregateOffersByEvent(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -53,13 +48,13 @@ function aggregateOffersByEvent(params) {
         else {
             throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
-        const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
+        const screeningRoom = await repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
         // オファーごとの集計
-        const aggregateOffer = yield aggregateOfferByEvent({
+        const aggregateOffer = await aggregateOfferByEvent({
             aggregateDate: now,
             event,
             screeningRoom: screeningRoom
@@ -74,7 +69,7 @@ function aggregateOffersByEvent(params) {
         //     // }
         // };
         // aggregateReservationsに保管(2024-03-25~)
-        yield repos.aggregateReservation.save({
+        await repos.aggregateReservation.save({
             project: event.project,
             reservationFor: {
                 id: event.id,
@@ -85,29 +80,36 @@ function aggregateOffersByEvent(params) {
         }, {
             $set: { aggregateOffer }
         });
-    });
+    };
 }
 function reservedSeatsAvailable(params) {
-    var _a, _b, _c, _d;
-    return ((_d = (_c = (_b = (_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.ticketedSeat) !== undefined;
+    return params.event.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
 }
 function aggregateOfferByEvent(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
+    return async (repos) => {
+        const availableOffers = await (0, findEventOffers_1.findEventOffers)(params)(repos);
         // 集計対象のオファーにフィルター(2024-11-09~)
-        const offersIncludedInAggregateReservation = availableOffers.filter(({ settings }) => (settings === null || settings === void 0 ? void 0 : settings.includedInAggregateReservation) === true);
+        const offersIncludedInAggregateReservation = availableOffers.filter(({ settings }) => settings?.includedInAggregateReservation === true);
         // オファーごとの予約集計
         const offersWithAggregateReservation = [];
         for (const o of offersIncludedInAggregateReservation) {
-            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
+            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = await aggregateReservationByOffer({
                 aggregateDate: params.aggregateDate,
                 event: params.event,
                 screeningRoom: params.screeningRoom,
                 offer: o,
                 availableOffers
             })(repos);
-            offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_a = o.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: o.category } : undefined));
+            offersWithAggregateReservation.push({
+                typeOf: o.typeOf,
+                id: o.id,
+                identifier: o.identifier,
+                aggregateReservation: aggregateReservation,
+                ...(typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined,
+                ...(typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined,
+                // category情報を追加
+                ...(typeof o.category?.codeValue === 'string') ? { category: o.category } : undefined
+            });
         }
         return {
             typeOf: factory.offerType.AggregateOffer,
@@ -115,21 +117,20 @@ function aggregateOfferByEvent(params) {
             offerCount: offersIncludedInAggregateReservation.length,
             offers: offersWithAggregateReservation
         };
-    });
+    };
 }
 function aggregateReservationByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let reservationCount4offer;
         // let attendeeCount4offer: number | undefined;
         // let checkInCount4offer: number | undefined;
         const reservationType = factory.reservationType.EventReservation;
         const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
-            var _a;
-            return typeof (category === null || category === void 0 ? void 0 : category.codeValue) === 'string' && category.codeValue === ((_a = params.offer.category) === null || _a === void 0 ? void 0 : _a.codeValue);
+            return typeof category?.codeValue === 'string' && category.codeValue === params.offer.category?.codeValue;
         })
             .map(({ id }) => id);
         if (offerIdsWithSameCategory.length > 0) {
-            reservationCount4offer = yield repos.reservation.count({
+            reservationCount4offer = await repos.reservation.count({
                 typeOf: reservationType,
                 reservationFor: { id: { $eq: params.event.id } },
                 reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
@@ -156,21 +157,24 @@ function aggregateReservationByOffer(params) {
             //     checkedIn: true
             // });
         }
-        const { maximumAttendeeCapacity, remainingAttendeeCapacity } = yield calculateCapacityByOffer(params)(repos);
-        return Object.assign(Object.assign({ aggregateReservation: {
+        const { maximumAttendeeCapacity, remainingAttendeeCapacity } = await calculateCapacityByOffer(params)(repos);
+        return {
+            aggregateReservation: {
                 typeOf: 'AggregateReservation',
                 reservationCount: reservationCount4offer
                 // attendeeCount: attendeeCount4offer, // discontinue(2024-11-10~)
                 // checkInCount: checkInCount4offer // discontinue(2024-11-10~)
-            } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined);
-    });
+            },
+            ...(typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined,
+            ...(typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined
+        };
+    };
 }
 /**
  * オファーごとのキャパシティを算出する
  */
 function calculateCapacityByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         let maximumAttendeeCapacity;
         let remainingAttendeeCapacity;
         if (reservedSeatsAvailable({ event: params.event })) {
@@ -180,7 +184,7 @@ function calculateCapacityByOffer(params) {
             // 座席タイプ制約のあるオファーの場合
             const eligibleSeatingTypes = params.offer.eligibleSeatingType;
             if (Array.isArray(eligibleSeatingTypes)) {
-                const filterByEligibleSeatingTypeResult = yield filterByEligibleSeatingType({
+                const filterByEligibleSeatingTypeResult = await filterByEligibleSeatingType({
                     event: params.event,
                     screeningRoom: params.screeningRoom,
                     eligibleSeatingTypes: eligibleSeatingTypes.map((e) => e.codeValue)
@@ -192,10 +196,10 @@ function calculateCapacityByOffer(params) {
             const eligibleSubReservation = params.offer.eligibleSubReservation;
             if (Array.isArray(eligibleSubReservation)) {
                 // 適用サブ予約の座席タイプごとにキャパシティ算出
-                const capacities = yield Promise.all(eligibleSubReservation
+                const capacities = await Promise.all(eligibleSubReservation
                     .filter((subReservation) => typeof subReservation.amountOfThisGood === 'number' && subReservation.amountOfThisGood > 0)
-                    .map((subReservation) => __awaiter(this, void 0, void 0, function* () {
-                    const filterByEligibleSeatingTypeResult = yield filterByEligibleSeatingType({
+                    .map(async (subReservation) => {
+                    const filterByEligibleSeatingTypeResult = await filterByEligibleSeatingType({
                         event: params.event,
                         screeningRoom: params.screeningRoom,
                         eligibleSeatingTypes: [subReservation.typeOfGood.seatingType]
@@ -204,13 +208,13 @@ function calculateCapacityByOffer(params) {
                         maximumAttendeeCapacity: Math.floor(filterByEligibleSeatingTypeResult.maximumAttendeeCapacity / subReservation.amountOfThisGood),
                         remainingAttendeeCapacity: Math.floor(filterByEligibleSeatingTypeResult.remainingAttendeeCapacity / subReservation.amountOfThisGood)
                     };
-                })));
+                }));
                 // 座席タイプごとのキャパシティの中から、最小数を選択する
                 maximumAttendeeCapacity = Math.min(...(typeof maximumAttendeeCapacity === 'number') ? [maximumAttendeeCapacity] : [], ...capacities.map((c) => c.maximumAttendeeCapacity));
                 remainingAttendeeCapacity = Math.min(...(typeof remainingAttendeeCapacity === 'number') ? [remainingAttendeeCapacity] : [], ...capacities.map((c) => c.remainingAttendeeCapacity));
             }
             // 単価スペックの単位が1より大きい場合
-            const referenceQuantityValue = (_a = params.offer.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity.value;
+            const referenceQuantityValue = params.offer.priceSpecification?.referenceQuantity.value;
             if (typeof referenceQuantityValue === 'number' && referenceQuantityValue > 1) {
                 if (typeof maximumAttendeeCapacity === 'number') {
                     maximumAttendeeCapacity -= maximumAttendeeCapacity % referenceQuantityValue;
@@ -221,18 +225,17 @@ function calculateCapacityByOffer(params) {
             }
         }
         // レート制限がある場合、考慮する
-        if (yield isHoldByRateLimit(params)({ offerRateLimit: repos.offerRateLimit })) {
+        if (await isHoldByRateLimit(params)({ offerRateLimit: repos.offerRateLimit })) {
             remainingAttendeeCapacity = 0;
         }
         return { maximumAttendeeCapacity, remainingAttendeeCapacity };
-    });
+    };
 }
 function isHoldByRateLimit(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         let isHold = false;
-        const scope = (_a = params.offer.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope;
-        const unitInSeconds = (_b = params.offer.validRateLimit) === null || _b === void 0 ? void 0 : _b.unitInSeconds;
+        const scope = params.offer.validRateLimit?.scope;
+        const unitInSeconds = params.offer.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.event.project.id },
@@ -247,17 +250,17 @@ function isHoldByRateLimit(params) {
                 },
                 reservationNumber: ''
             };
-            const holder = yield repos.offerRateLimit.getHolder(rateLimitKey);
+            const holder = await repos.offerRateLimit.getHolder(rateLimitKey);
             // ロックされていれば在庫0
             if (typeof holder === 'string' && holder.length > 0) {
                 isHold = true;
             }
         }
         return isHold;
-    });
+    };
 }
 function filterByEligibleSeatingType(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 適用座席タイプに絞る
         const eligibleSeatOffers = (Array.isArray(params.screeningRoom.containsPlace))
             ? params.screeningRoom.containsPlace.reduce((a, b) => {
@@ -283,7 +286,7 @@ function filterByEligibleSeatingType(params) {
         const maximumAttendeeCapacity = eligibleSeatOffers.length;
         let remainingAttendeeCapacity;
         if (maximumAttendeeCapacity > 0) {
-            const availabilities = yield repos.stockHolder.searchHolders({
+            const availabilities = await repos.stockHolder.searchHolders({
                 project: { id: params.event.project.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
@@ -297,5 +300,5 @@ function filterByEligibleSeatingType(params) {
             remainingAttendeeCapacity = 0;
         }
         return { maximumAttendeeCapacity, remainingAttendeeCapacity };
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateScreeningEvent = aggregateScreeningEvent;
 /**
@@ -23,30 +14,29 @@ const debug = createDebug('chevre-domain:service:aggregation');
  * イベントデータをID指定で集計する
  */
 function aggregateScreeningEvent(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    ) => {
         // 集計対象イベント検索
-        const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
+        const event = await repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.id', 'superEvent.location.id', 'offers.itemOffered', 'maximumPhysicalAttendeeCapacity']);
         // プロジェクト設定検索
-        const project = yield repos.project.findById({
+        const project = await repos.project.findById({
             id: event.project.id,
             inclusion: ['settings']
         });
-        const useOfferRateLimit = ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.useOfferRateLimit) === true;
+        const useOfferRateLimit = project.settings?.useOfferRateLimit === true;
         let useAggregateOffer = false;
         if (event.typeOf === factory.eventType.ScreeningEvent) {
-            const eventSeriesIdsByProject = (_c = (_b = project.settings) === null || _b === void 0 ? void 0 : _b.useAggregateReservation) === null || _c === void 0 ? void 0 : _c.eventSeriesIds;
+            const eventSeriesIdsByProject = project.settings?.useAggregateReservation?.eventSeriesIds;
             const eventSeriesIdIncluded = Array.isArray(eventSeriesIdsByProject) && eventSeriesIdsByProject.includes(event.superEvent.id);
-            const useAggregateOfferByProject = ((_d = project.settings) === null || _d === void 0 ? void 0 : _d.useAggregateOffer) === true;
+            const useAggregateOfferByProject = project.settings?.useAggregateOffer === true;
             useAggregateOffer = eventSeriesIdIncluded && useAggregateOfferByProject;
         }
         let aggregatingEvents = [event];
         // dependent on project settings(2024-10-29~)
         if (useOfferRateLimit) {
-            const availableOffers = yield (0, findEventOffers_1.findEventOffers)({ event })(repos);
-            const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
+            const availableOffers = await (0, findEventOffers_1.findEventOffers)({ event })(repos);
+            const offerRateLimitExists = availableOffers.some((o) => typeof o.validRateLimit?.scope === 'string');
             if (offerRateLimitExists) {
                 // 同location、かつ同時間帯、のイベントに関しても集計する(ttts暫定対応)
                 const startFrom = moment(event.startDate)
@@ -57,7 +47,7 @@ function aggregateScreeningEvent(params) {
                     .add(-1, 'second')
                     .toDate();
                 if (event.typeOf === factory.eventType.ScreeningEvent) {
-                    aggregatingEvents = yield repos.event.projectEventFields({
+                    aggregatingEvents = await repos.event.projectEventFields({
                         limit: 100,
                         page: 1,
                         project: { id: { $eq: event.project.id } },
@@ -75,14 +65,14 @@ function aggregateScreeningEvent(params) {
         }
         debug(aggregatingEvents.length, 'aggregatingEvents found', aggregatingEvents.map((e) => e.id));
         for (const aggregatingEvent of aggregatingEvents) {
-            yield aggregateByEvent({ event: aggregatingEvent }, { useAggregateOffer })(repos);
+            await aggregateByEvent({ event: aggregatingEvent }, { useAggregateOffer })(repos);
         }
-    });
+    };
 }
 function aggregateByEvent(params, options) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         const now = new Date();
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
@@ -93,19 +83,19 @@ function aggregateByEvent(params, options) {
         else {
             throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
-        const screeningRoom = yield repos.screeningRoom.findScreeningRoomsByBranchCode({
+        const screeningRoom = await repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
         // 予約集計
-        const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
+        const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = await aggregateReservationByEvent({
             aggregateDate: now,
             event: event,
             screeningRoom
         })(repos);
         // オファーごとの集計
-        const aggregateOffer = yield aggregateOfferByEvent({
+        const aggregateOffer = await aggregateOfferByEvent({
             aggregateDate: now,
             event,
             screeningRoom
@@ -113,27 +103,36 @@ function aggregateByEvent(params, options) {
         debug('offers aggregated', aggregateOffer);
         // 値がundefinedの場合に更新しないように注意
         const update = {
-            $set: Object.assign(Object.assign(Object.assign(Object.assign({ 
+            $set: {
                 // updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
                 aggregateReservation,
-                aggregateOffer }, (maximumAttendeeCapacity !== undefined) ? { maximumAttendeeCapacity: maximumAttendeeCapacity } : undefined), (remainingAttendeeCapacity !== undefined) ? { remainingAttendeeCapacity: remainingAttendeeCapacity } : undefined), (aggregateReservation.checkInCount !== undefined) ? { checkInCount: aggregateReservation.checkInCount } : undefined), (aggregateReservation.attendeeCount !== undefined) ? { attendeeCount: aggregateReservation.attendeeCount } : undefined),
-            $unset: Object.assign(Object.assign({ noExistingAttributeName: 1 }, (maximumAttendeeCapacity === undefined) ? { maximumAttendeeCapacity: '' } : undefined), (remainingAttendeeCapacity === undefined) ? { remainingAttendeeCapacity: '' } : undefined)
+                aggregateOffer,
+                ...(maximumAttendeeCapacity !== undefined) ? { maximumAttendeeCapacity: maximumAttendeeCapacity } : undefined,
+                ...(remainingAttendeeCapacity !== undefined) ? { remainingAttendeeCapacity: remainingAttendeeCapacity } : undefined,
+                ...(aggregateReservation.checkInCount !== undefined) ? { checkInCount: aggregateReservation.checkInCount } : undefined,
+                ...(aggregateReservation.attendeeCount !== undefined) ? { attendeeCount: aggregateReservation.attendeeCount } : undefined
+            },
+            $unset: {
+                noExistingAttributeName: 1, // $unsetは空だとエラーになるので
+                ...(maximumAttendeeCapacity === undefined) ? { maximumAttendeeCapacity: '' } : undefined,
+                ...(remainingAttendeeCapacity === undefined) ? { remainingAttendeeCapacity: '' } : undefined
+            }
         };
         debug('update:', update);
         // 保管
-        yield repos.event.updateAggregationById({ id: event.id }, update);
-        yield onAggregated({ event }, options)({
+        await repos.event.updateAggregationById({ id: event.id }, update);
+        await onAggregated({ event }, options)({
             task: repos.task
         }
         // settings
         );
-    });
+    };
 }
 /**
  * 集計後アクション
  */
 function onAggregated(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // dependent on project settings(2024-10-29~)
         if (options.useAggregateOffer) {
             // AggregateOffersタスクへ移行(2024-03-25~)
@@ -147,32 +146,30 @@ function onAggregated(params, options) {
                 executionResults: [],
                 data: { typeOf: factory.eventType.ScreeningEvent, id: params.event.id }
             };
-            yield repos.task.saveMany([aggregateOffersTaskAttributes], { emitImmediately: true });
+            await repos.task.saveMany([aggregateOffersTaskAttributes], { emitImmediately: true });
         }
-    });
+    };
 }
 function reservedSeatsAvailable(params) {
-    var _a, _b, _c, _d;
-    return ((_d = (_c = (_b = (_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.ticketedSeat) !== undefined;
+    return params.event.offers?.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
 }
 function aggregateOfferByEvent(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { offerCount } = yield calculateOfferCount({ event: params.event })(repos);
+    return async (repos) => {
+        const { offerCount } = await calculateOfferCount({ event: params.event })(repos);
         return {
             typeOf: factory.offerType.AggregateOffer,
             aggregateDate: params.aggregateDate,
             offerCount
         };
-    });
+    };
 }
 function calculateOfferCount(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         let offerCount = 0;
         try {
             const eventOffers = params.event.offers;
-            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = (yield repos.product.projectFields({
+            if (typeof eventOffers?.itemOffered?.id === 'string') {
+                const eventService = (await repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }
@@ -183,14 +180,14 @@ function calculateOfferCount(params) {
                     throw new factory.errors.NotFound(factory.product.ProductType.EventService);
                 }
                 // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-                const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+                const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
                 if (typeof firstCatalogIdOfProduct === 'string') {
-                    const catalogs = yield repos.offerCatalog.projectFields({
+                    const catalogs = await repos.offerCatalog.projectFields({
                         limit: 1,
                         page: 1,
                         id: { $in: [firstCatalogIdOfProduct] }
                     }, ['numberOfItems']);
-                    const numberOfItems = (_d = catalogs.shift()) === null || _d === void 0 ? void 0 : _d.numberOfItems;
+                    const numberOfItems = catalogs.shift()?.numberOfItems;
                     if (typeof numberOfItems === 'number') {
                         offerCount = numberOfItems;
                     }
@@ -201,10 +198,10 @@ function calculateOfferCount(params) {
             throw error;
         }
         return { offerCount };
-    });
+    };
 }
 function aggregateReservationByEvent(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 収容人数を集計
         let maximumAttendeeCapacity;
         let remainingAttendeeCapacity;
@@ -212,7 +209,7 @@ function aggregateReservationByEvent(params) {
         let checkInCount;
         let reservationCount;
         const reservationType = factory.reservationType.EventReservation;
-        reservationCount = yield repos.reservation.count({
+        reservationCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
@@ -238,7 +235,7 @@ function aggregateReservationByEvent(params) {
         // remainingAttendeeCapacityを決定
         if (typeof maximumAttendeeCapacity === 'number') {
             // 残席数を座席ロック数から計算
-            const unavailableOfferCount = yield repos.stockHolder.countUnavailableOffers({
+            const unavailableOfferCount = await repos.stockHolder.countUnavailableOffers({
                 project: { id: params.event.project.id },
                 event: {
                     id: params.event.id,
@@ -252,12 +249,12 @@ function aggregateReservationByEvent(params) {
                 remainingAttendeeCapacity = 0;
             }
         }
-        attendeeCount = yield repos.reservation.count({
+        attendeeCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
             attended: true
         });
-        checkInCount = yield repos.reservation.count({
+        checkInCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
             checkedIn: true
@@ -273,5 +270,5 @@ function aggregateReservationByEvent(params) {
                 reservationCount
             }
         };
-    });
+    };
 }

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findEventOffers = findEventOffers;
 const factory = require("../../../factory");
@@ -16,14 +7,13 @@ const factory = require("../../../factory");
  * NotFoundエラーをハンドリングする
  */
 function findEventOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         let availableOffers = [];
         try {
             // 興行設定があれば興行のカタログを参照する
             const eventOffers = params.event.offers;
-            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-                const eventService = (yield repos.product.projectFields({
+            if (typeof eventOffers?.itemOffered?.id === 'string') {
+                const eventService = (await repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventOffers.itemOffered.id }
@@ -34,17 +24,17 @@ function findEventOffers(params) {
                     throw new factory.errors.NotFound(factory.product.ProductType.EventService);
                 }
                 // const offerCatalogId = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-                const offerCatalogId = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+                const offerCatalogId = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
                 if (typeof offerCatalogId === 'string') {
                     // サブカタログIDを決定
                     let subOfferCatalogId = offerCatalogId;
                     let isOfferCatalogItem = false;
-                    const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
+                    const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
                     if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
                         subOfferCatalogId = offerCatalogFirstElement.id;
                         isOfferCatalogItem = true;
                     }
-                    const { offers } = yield repos.offer.searchAllByOfferCatalogId({
+                    const { offers } = await repos.offer.searchAllByOfferCatalogId({
                         subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem }
                     });
                     availableOffers = offers;
@@ -65,5 +55,5 @@ function findEventOffers(params) {
             }
         }
         return availableOffers;
-    });
+    };
 }