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

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;
-    });
+    };
 }

package/lib/chevre/service/aggregation/event/importFromCOA.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.importFromCOA = importFromCOA;
 const createDebug = require("debug");
@@ -18,10 +9,10 @@ const debug = createDebug('chevre-domain:service');
  * イベント席数を更新する
  */
 function importFromCOA(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         try {
             // COAから空席状況取得
-            const countFreeSeatResult = yield repos.reserveService.countFreeSeat({
+            const countFreeSeatResult = await repos.reserveService.countFreeSeat({
                 theaterCode: params.locationBranchCode,
                 begin: moment(params.importFrom)
                     .tz('Asia/Tokyo')
@@ -66,7 +57,7 @@ function importFromCOA(params) {
             }
             debug(bulkWriteOps.length, 'ops writing...');
             if (bulkWriteOps.length > 0) {
-                const res = yield repos.event.bulkWrite(bulkWriteOps);
+                const res = await repos.event.bulkWrite(bulkWriteOps);
                 // const res = await repos.event.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
                 debug('bulkWrite res:', res);
             }
@@ -85,5 +76,5 @@ function importFromCOA(params) {
                 throw error;
             }
         }
-    });
+    };
 }

package/lib/chevre/service/aggregation/project.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.aggregate = aggregate;
 /**
@@ -18,15 +9,15 @@ const moment = require("moment");
 const factory = require("../../factory");
 const debug = createDebug('chevre-domain:service');
 function aggregate(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
         // 集計対象プロジェクト検索
-        const project = yield repos.project.findById({
+        const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['typeOf']
         });
         // 予約集計
-        const { aggregateReservation } = yield aggregateReservationOnProject({
+        const { aggregateReservation } = await aggregateReservationOnProject({
             aggregateDate: now,
             project: { id: project.id, typeOf: project.typeOf },
             reservationFor: {
@@ -38,14 +29,14 @@ function aggregate(params) {
         })(repos);
         debug('aggregated. aggregateReservation:', aggregateReservation);
         // 保管
-        yield repos.project.updateAggregateReservation({
+        await repos.project.updateAggregateReservation({
             id: project.id,
             aggregateReservation
         });
-    });
+    };
 }
 function aggregateReservationOnProject(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let attendeeCount = 0;
         let checkInCount = 0;
         let reservationCount = 0;
@@ -65,20 +56,20 @@ function aggregateReservationOnProject(params) {
                 .add(-1, 'millisecond')
                 .toDate();
             debug('counting...', reservationForConditions);
-            reservationCount += yield repos.reservation.count({
+            reservationCount += await repos.reservation.count({
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory.reservationType.EventReservation,
                 reservationFor: reservationForConditions,
                 reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
             });
-            attendeeCount += yield repos.reservation.count({
+            attendeeCount += await repos.reservation.count({
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory.reservationType.EventReservation,
                 reservationFor: reservationForConditions,
                 // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
                 attended: true
             });
-            checkInCount += yield repos.reservation.count({
+            checkInCount += await repos.reservation.count({
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory.reservationType.EventReservation,
                 reservationFor: reservationForConditions,
@@ -100,5 +91,5 @@ function aggregateReservationOnProject(params) {
                 reservationCount
             }
         };
-    });
+    };
 }