@chevre/domain 21.27.0-alpha.13 → 21.27.0-alpha.14

package/example/src/chevre/{aggregateEventReservation.ts → aggregation/aggregateEventReservation.ts}

@@ -2,12 +2,12 @@
 import * as mongoose from 'mongoose';
 import * as redis from 'redis';
 
-import { chevre } from '../../../lib/index';
+import { chevre } from '../../../../lib/index';
 
 // const project = { id: <string>process.env.PROJECT_ID };
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
     const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
         socket: {
             port: Number(<string>process.env.REDIS_PORT),
@@ -28,7 +28,6 @@ async function main() {
         offerRateLimit: await chevre.repository.rateLimit.Offer.createInstance(client),
         place: await chevre.repository.Place.createInstance(mongoose.connection),
         product: await chevre.repository.Product.createInstance(mongoose.connection),
-        project: await chevre.repository.Project.createInstance(mongoose.connection),
         reservation: await chevre.repository.Reservation.createInstance(mongoose.connection),
         task: await chevre.repository.Task.createInstance(mongoose.connection)
     });

package/example/src/chevre/aggregation/aggregateOffersOnEvent.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import * as redis from 'redis';
+
+import { chevre } from '../../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+        socket: {
+            port: Number(<string>process.env.REDIS_PORT),
+            host: <string>process.env.REDIS_HOST
+        },
+        password: <string>process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    await (await chevre.service.aggregation.createService()).event.aggregateOffers({
+        id: String(process.env.EVENT_ID),
+        typeOf: chevre.factory.eventType.ScreeningEvent
+    })({
+        event: await chevre.repository.Event.createInstance(mongoose.connection),
+        stockHolder: await chevre.repository.StockHolder.createInstance(client, mongoose.connection),
+        offer: await chevre.repository.Offer.createInstance(mongoose.connection),
+        offerCatalog: await chevre.repository.OfferCatalog.createInstance(mongoose.connection),
+        offerRateLimit: await chevre.repository.rateLimit.Offer.createInstance(client),
+        place: await chevre.repository.Place.createInstance(mongoose.connection),
+        product: await chevre.repository.Product.createInstance(mongoose.connection),
+        reservation: await chevre.repository.Reservation.createInstance(mongoose.connection),
+        task: await chevre.repository.Task.createInstance(mongoose.connection)
+    });
+    console.log('aggregateReserveAction processed.');
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -46,6 +46,15 @@ export interface IUpdateAggregateReservationParams {
         remainingAttendeeCapacity?: '';
     };
 }
+export interface IUpdateAggregateOfferParams {
+    $set: {
+        updatedAt: Date;
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
+    };
+    $unset: {
+        noExistingAttributeName: 1;
+    };
+}
 export interface IUpdateAggregateUseActionsParams {
     $set: {
         updatedAt: Date;
@@ -295,7 +304,7 @@ export declare class MongoRepository {
      */
     updateAggregationById<T extends factory.eventType>(params: {
         id: string;
-    }, update: IUpdateAggregateReservationParams | IUpdateAggregateUseActionsParams): Promise<factory.event.IEvent<T>>;
+    }, update: IUpdateAggregateReservationParams | IUpdateAggregateOfferParams | IUpdateAggregateUseActionsParams): Promise<Pick<factory.event.IEvent<T>, 'id' | 'typeOf' | 'project'>>;
     bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteResult & {
         mongoose?: {
             validationErrors: import("mongoose").Error[];

package/lib/chevre/repo/event.js

@@ -1071,7 +1071,13 @@ class MongoRepository {
      */
     updateAggregationById(params, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOneAndUpdate({ _id: params.id }, update, { new: true })
+            const doc = yield this.eventModel.findOneAndUpdate({ _id: params.id }, update, {
+                new: true,
+                projection: {
+                    typeOf: 1,
+                    project: 1
+                }
+            })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);

package/lib/chevre/service/aggregation/event/aggregateOffers.d.ts

@@ -0,0 +1,29 @@
+import { MongoRepository as EventRepo } from '../../../repo/event';
+import type { MongoRepository as OfferRepo } from '../../../repo/offer';
+import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
+import { MongoRepository as PlaceRepo } from '../../../repo/place';
+import type { MongoRepository as ProductRepo } from '../../../repo/product';
+import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
+import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+type IAggregateOffersOperation<T> = (repos: {
+    event: EventRepo;
+    stockHolder: StockHolderRepo;
+    offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
+    offerRateLimit: OfferRateLimitRepo;
+    place: PlaceRepo;
+    product: ProductRepo;
+    reservation: ReservationRepo;
+    task: TaskRepo;
+}) => Promise<T>;
+/**
+ * イベントに対するオファー集計
+ */
+declare function aggregateOffers(params: {
+    id: string;
+    typeOf: factory.eventType.ScreeningEvent | factory.eventType.Event;
+}): IAggregateOffersOperation<void>;
+export { aggregateOffers };

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

@@ -0,0 +1,285 @@
+"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 = void 0;
+const createDebug = require("debug");
+const moment = require("moment-timezone");
+const factory = require("../../../factory");
+const findEventOffers_1 = require("./findEventOffers");
+const debug = createDebug('chevre-domain:service:aggregation');
+/**
+ * イベントに対するオファー集計
+ */
+function aggregateOffers(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 集計対象イベント検索
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.id });
+        const eventCapacity = (yield repos.event.search({
+            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)
+        })(repos);
+    });
+}
+exports.aggregateOffers = aggregateOffers;
+function aggregateOffersByEvent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const now = new Date();
+        const event = params.event;
+        // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
+        let movieTheaterId;
+        if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+            movieTheaterId = params.event.superEvent.location.id;
+        }
+        else {
+            movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
+        }
+        const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
+            project: { id: event.project.id },
+            branchCode: { $eq: event.location.branchCode },
+            containedInPlace: { id: { $eq: movieTheaterId } }
+        });
+        // オファーごとの集計
+        const aggregateOffer = yield aggregateOfferByEvent({
+            aggregateDate: now,
+            event,
+            screeningRoom: screeningRoom
+        })(repos);
+        debug('offers aggregated', aggregateOffer);
+        // 値がundefinedの場合に更新しないように注意
+        const update = {
+            $set: Object.assign({ updatedAt: new Date() }, (typeof (aggregateOffer === null || aggregateOffer === void 0 ? void 0 : aggregateOffer.typeOf) === 'string') ? { aggregateOffer: aggregateOffer } : undefined),
+            $unset: {
+                noExistingAttributeName: 1 // $unsetは空だとエラーになるので
+            }
+        };
+        debug('update:', update);
+        // 保管
+        const saveResult = yield repos.event.updateAggregationById({ id: event.id }, update);
+        debug('aggregateOffersByEvent processd', saveResult);
+    });
+}
+function reservedSeatsAvailable(params) {
+    var _a, _b, _c;
+    const eventOffers = params.event.offers;
+    return ((_c = (_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) !== undefined;
+}
+function aggregateOfferByEvent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
+        // オファーごとの予約集計
+        const offersWithAggregateReservation = [];
+        for (const o of availableOffers) {
+            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
+                aggregateDate: params.aggregateDate,
+                event: params.event,
+                screeningRoom: params.screeningRoom,
+                offer: o
+            })(repos);
+            offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation, name: {
+                    en: (_a = o.name) === null || _a === void 0 ? void 0 : _a.en,
+                    ja: (_b = o.name) === null || _b === void 0 ? void 0 : _b.ja
+                } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_c = o.category) === null || _c === void 0 ? void 0 : _c.codeValue) === 'string') ? { category: o.category } : undefined));
+        }
+        return {
+            typeOf: factory.offerType.AggregateOffer,
+            offerCount: availableOffers.length,
+            offers: offersWithAggregateReservation
+        };
+    });
+}
+function aggregateReservationByOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let reservationCount4offer;
+        let attendeeCount4offer;
+        let checkInCount4offer;
+        let reservationType = factory.reservationType.EventReservation;
+        if (params.event.typeOf === factory.eventType.Event) {
+            reservationType = factory.reservationType.BusReservation;
+        }
+        reservationCount4offer = yield repos.reservation.count({
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
+            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            reservedTicket: { ticketType: { ids: [params.offer.id] } }
+        });
+        attendeeCount4offer = yield repos.reservation.count({
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
+            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            reservedTicket: { ticketType: { ids: [params.offer.id] } },
+            attended: true
+        });
+        checkInCount4offer = yield repos.reservation.count({
+            typeOf: reservationType,
+            // reservationFor: { ids: [params.event.id] },
+            reservationFor: { id: { $eq: params.event.id } },
+            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+            reservedTicket: { ticketType: { ids: [params.offer.id] } },
+            checkedIn: true
+        });
+        const { maximumAttendeeCapacity, remainingAttendeeCapacity } = yield calculateCapacityByOffer(params)(repos);
+        return Object.assign(Object.assign({ aggregateReservation: {
+                typeOf: 'AggregateReservation',
+                aggregateDate: params.aggregateDate,
+                reservationCount: reservationCount4offer,
+                attendeeCount: attendeeCount4offer,
+                checkInCount: checkInCount4offer
+            } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined);
+    });
+}
+/**
+ * オファーごとのキャパシティを算出する
+ */
+function calculateCapacityByOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let maximumAttendeeCapacity;
+        let remainingAttendeeCapacity;
+        if (reservedSeatsAvailable({ event: params.event })) {
+            // 基本的にはイベントのキャパシティに同じ
+            maximumAttendeeCapacity = params.event.maximumAttendeeCapacity;
+            remainingAttendeeCapacity = params.event.remainingAttendeeCapacity;
+            // 座席タイプ制約のあるオファーの場合
+            const eligibleSeatingTypes = params.offer.eligibleSeatingType;
+            if (Array.isArray(eligibleSeatingTypes)) {
+                const filterByEligibleSeatingTypeResult = yield filterByEligibleSeatingType({
+                    event: params.event,
+                    screeningRoom: params.screeningRoom,
+                    eligibleSeatingTypes: eligibleSeatingTypes.map((e) => e.codeValue)
+                })(repos);
+                maximumAttendeeCapacity = filterByEligibleSeatingTypeResult.maximumAttendeeCapacity;
+                remainingAttendeeCapacity = filterByEligibleSeatingTypeResult.remainingAttendeeCapacity;
+            }
+            // 適用サブ予約がある場合
+            const eligibleSubReservation = params.offer.eligibleSubReservation;
+            if (Array.isArray(eligibleSubReservation)) {
+                // 適用サブ予約の座席タイプごとにキャパシティ算出
+                const capacities = yield 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({
+                        event: params.event,
+                        screeningRoom: params.screeningRoom,
+                        eligibleSeatingTypes: [subReservation.typeOfGood.seatingType]
+                    })(repos);
+                    return {
+                        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;
+            if (typeof referenceQuantityValue === 'number' && referenceQuantityValue > 1) {
+                if (typeof maximumAttendeeCapacity === 'number') {
+                    maximumAttendeeCapacity -= maximumAttendeeCapacity % referenceQuantityValue;
+                }
+                if (typeof remainingAttendeeCapacity === 'number') {
+                    remainingAttendeeCapacity -= remainingAttendeeCapacity % referenceQuantityValue;
+                }
+            }
+        }
+        // レート制限がある場合、考慮する
+        if (yield 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;
+        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;
+        if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
+            const rateLimitKey = {
+                reservedTicket: {
+                    ticketType: {
+                        validRateLimit: { scope: scope, unitInSeconds: unitInSeconds }
+                    }
+                },
+                reservationFor: {
+                    startDate: moment(params.event.startDate)
+                        .toDate()
+                },
+                reservationNumber: ''
+            };
+            const holder = yield 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* () {
+        // 適用座席タイプに絞る
+        const eligibleSeatOffers = (Array.isArray(params.screeningRoom.containsPlace))
+            ? params.screeningRoom.containsPlace.reduce((a, b) => {
+                return [
+                    ...a,
+                    ...(Array.isArray(b.containsPlace))
+                        ? b.containsPlace.filter((place) => {
+                            const seatingTypes = (Array.isArray(place.seatingType)) ? place.seatingType
+                                : (typeof place.seatingType === 'string') ? [place.seatingType]
+                                    : [];
+                            return seatingTypes.some((seatingTypeCodeValue) => params.eligibleSeatingTypes.some((eligibleSeatingType) => eligibleSeatingType === seatingTypeCodeValue));
+                        })
+                            .map((place) => {
+                            return {
+                                seatSection: b.branchCode,
+                                seatNumber: place.branchCode
+                            };
+                        })
+                        : []
+                ];
+            }, [])
+            : [];
+        const maximumAttendeeCapacity = eligibleSeatOffers.length;
+        let remainingAttendeeCapacity;
+        if (maximumAttendeeCapacity > 0) {
+            const availabilities = yield repos.stockHolder.searchHolders({
+                project: { id: params.event.project.id },
+                eventId: params.event.id,
+                startDate: moment(params.event.startDate)
+                    .toDate(),
+                hasTicketedSeat: true,
+                offers: eligibleSeatOffers
+            });
+            // remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
+            remainingAttendeeCapacity = availabilities.filter((holder) => typeof holder !== 'string').length;
+        }
+        else {
+            remainingAttendeeCapacity = 0;
+        }
+        return { maximumAttendeeCapacity, remainingAttendeeCapacity };
+    });
+}

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -3,7 +3,6 @@ import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
@@ -17,7 +16,6 @@ export type IAggregateScreeningEventOperation<T> = (repos: {
     offerRateLimit: OfferRateLimitRepo;
     place: PlaceRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<T>;

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

@@ -19,7 +19,7 @@ const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const findEventOffers_1 = require("./findEventOffers");
-const debug = createDebug('chevre-domain:service');
+const debug = createDebug('chevre-domain:service:aggregation');
 /**
  * イベントデータをID指定で集計する
  */
@@ -85,8 +85,7 @@ function aggregateByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = new Date();
-        // 集計対象イベント検索
-        let event = params.event;
+        const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
         let movieTheaterId;
         if (params.event.typeOf === factory.eventType.ScreeningEvent) {
@@ -107,8 +106,7 @@ function aggregateByEvent(params) {
             screeningRoom
         })(repos);
         // オファーごとの集計
-        let aggregateOffer;
-        aggregateOffer = yield aggregateOfferByEvent({
+        const aggregateOffer = yield aggregateOfferByEvent({
             aggregateDate: now,
             event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
                 remainingAttendeeCapacity }),
@@ -119,13 +117,12 @@ function aggregateByEvent(params) {
         const update = {
             $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
                 aggregateReservation }, (typeof (aggregateOffer === null || aggregateOffer === void 0 ? void 0 : aggregateOffer.typeOf) === 'string') ? { aggregateOffer: aggregateOffer } : undefined), (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(Object.assign({ noExistingAttributeName: 1 }, (typeof (aggregateOffer === null || aggregateOffer === void 0 ? void 0 : aggregateOffer.typeOf) !== 'string') ? { aggregateOffer: '' } : undefined), (maximumAttendeeCapacity === undefined) ? { maximumAttendeeCapacity: '' } : undefined), (remainingAttendeeCapacity === undefined) ? { remainingAttendeeCapacity: '' } : undefined)
+            $unset: Object.assign(Object.assign({ noExistingAttributeName: 1 }, (maximumAttendeeCapacity === undefined) ? { maximumAttendeeCapacity: '' } : undefined), (remainingAttendeeCapacity === undefined) ? { remainingAttendeeCapacity: '' } : undefined)
         };
         debug('update:', update);
         // 保管
-        event = yield repos.event.updateAggregationById({ id: event.id }, update);
+        yield repos.event.updateAggregationById({ id: event.id }, update);
         yield onAggregated({ event })({
-            project: repos.project,
             task: repos.task
         });
     });
@@ -134,9 +131,22 @@ exports.aggregateByEvent = aggregateByEvent;
 /**
  * 集計後アクション
  */
-function onAggregated(__1) {
-    return (__2) => __awaiter(this, void 0, void 0, function* () {
-        // const event = params.event;
+function onAggregated(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
+            // AggregateOffersタスクへ移行(2024-03-25~)
+            const aggregateOffersTaskAttributes = {
+                project: params.event.project,
+                name: factory.taskName.AggregateOffers,
+                status: factory.taskStatus.Ready,
+                runsAt: new Date(),
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: { typeOf: factory.eventType.ScreeningEvent, id: params.event.id }
+            };
+            yield repos.task.saveMany([aggregateOffersTaskAttributes], { emitImmediately: true });
+        }
     });
 }
 function reservedSeatsAvailable(params) {
@@ -146,29 +156,39 @@ function reservedSeatsAvailable(params) {
 }
 function aggregateOfferByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
         // プロジェクト限定(2023-02-22~)
         if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
-            const availableOffers = yield (0, findEventOffers_1.findEventOffers)(params)(repos);
-            // オファーごとの予約集計
-            const offersWithAggregateReservation = [];
-            for (const o of availableOffers) {
-                const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
-                    aggregateDate: params.aggregateDate,
-                    event: params.event,
-                    screeningRoom: params.screeningRoom,
-                    offer: o
-                })(repos);
-                offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation, name: {
-                        en: (_a = o.name) === null || _a === void 0 ? void 0 : _a.en,
-                        ja: (_b = o.name) === null || _b === void 0 ? void 0 : _b.ja
-                    } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_c = o.category) === null || _c === void 0 ? void 0 : _c.codeValue) === 'string') ? { category: o.category } : undefined));
-            }
-            return {
-                typeOf: factory.offerType.AggregateOffer,
-                offerCount: availableOffers.length,
-                offers: offersWithAggregateReservation
-            };
+            // AggregateOffersタスクへ移行(2024-03-25~)
+            // const availableOffers: factory.unitPriceOffer.IUnitPriceOffer[] = await findEventOffers(params)(repos);
+            // // オファーごとの予約集計
+            // const offersWithAggregateReservation: factory.event.screeningEvent.IOfferWithAggregateReservation[] = [];
+            // for (const o of availableOffers) {
+            //     const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = await aggregateReservationByOffer({
+            //         aggregateDate: params.aggregateDate,
+            //         event: params.event,
+            //         screeningRoom: params.screeningRoom,
+            //         offer: o
+            //     })(repos);
+            //     offersWithAggregateReservation.push({
+            //         typeOf: <factory.offerType.Offer>o.typeOf,
+            //         id: o.id,
+            //         identifier: o.identifier,
+            //         aggregateReservation: aggregateReservation,
+            //         name: {
+            //             en: (<factory.multilingualString | undefined>o.name)?.en,
+            //             ja: (<factory.multilingualString | undefined>o.name)?.ja
+            //         },
+            //         ...(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,
+            //     offerCount: availableOffers.length,
+            //     offers: offersWithAggregateReservation
+            // };
         }
         else {
             const { offerCount } = yield calculateOfferCount({ event: params.event })(repos);
@@ -186,8 +206,6 @@ function calculateOfferCount(params) {
         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 = <Pick<factory.product.IProduct, 'hasOfferCatalog'>>
-                //     await repos.product.findProductById({ id: eventOffers.itemOffered.id }, ['hasOfferCatalog'], []);
                 const eventService = (yield repos.product.searchProducts({
                     limit: 1,
                     page: 1,
@@ -215,182 +233,6 @@ function calculateOfferCount(params) {
         return { offerCount };
     });
 }
-function aggregateReservationByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let reservationCount4offer;
-        let attendeeCount4offer;
-        let checkInCount4offer;
-        let reservationType = factory.reservationType.EventReservation;
-        if (params.event.typeOf === factory.eventType.Event) {
-            reservationType = factory.reservationType.BusReservation;
-        }
-        reservationCount4offer = yield repos.reservation.count({
-            typeOf: reservationType,
-            // reservationFor: { ids: [params.event.id] },
-            reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            reservedTicket: { ticketType: { ids: [params.offer.id] } }
-        });
-        attendeeCount4offer = yield repos.reservation.count({
-            typeOf: reservationType,
-            // reservationFor: { ids: [params.event.id] },
-            reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            reservedTicket: { ticketType: { ids: [params.offer.id] } },
-            attended: true
-        });
-        checkInCount4offer = yield repos.reservation.count({
-            typeOf: reservationType,
-            // reservationFor: { ids: [params.event.id] },
-            reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
-            reservedTicket: { ticketType: { ids: [params.offer.id] } },
-            checkedIn: true
-        });
-        const { maximumAttendeeCapacity, remainingAttendeeCapacity } = yield calculateCapacityByOffer(params)(repos);
-        return Object.assign(Object.assign({ aggregateReservation: {
-                typeOf: 'AggregateReservation',
-                aggregateDate: params.aggregateDate,
-                reservationCount: reservationCount4offer,
-                attendeeCount: attendeeCount4offer,
-                checkInCount: checkInCount4offer
-            } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined);
-    });
-}
-/**
- * オファーごとのキャパシティを算出する
- */
-function calculateCapacityByOffer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let maximumAttendeeCapacity;
-        let remainingAttendeeCapacity;
-        if (reservedSeatsAvailable({ event: params.event })) {
-            // 基本的にはイベントのキャパシティに同じ
-            maximumAttendeeCapacity = params.event.maximumAttendeeCapacity;
-            remainingAttendeeCapacity = params.event.remainingAttendeeCapacity;
-            // 座席タイプ制約のあるオファーの場合
-            const eligibleSeatingTypes = params.offer.eligibleSeatingType;
-            if (Array.isArray(eligibleSeatingTypes)) {
-                const filterByEligibleSeatingTypeResult = yield filterByEligibleSeatingType({
-                    event: params.event,
-                    screeningRoom: params.screeningRoom,
-                    eligibleSeatingTypes: eligibleSeatingTypes.map((e) => e.codeValue)
-                })(repos);
-                maximumAttendeeCapacity = filterByEligibleSeatingTypeResult.maximumAttendeeCapacity;
-                remainingAttendeeCapacity = filterByEligibleSeatingTypeResult.remainingAttendeeCapacity;
-            }
-            // 適用サブ予約がある場合
-            const eligibleSubReservation = params.offer.eligibleSubReservation;
-            if (Array.isArray(eligibleSubReservation)) {
-                // 適用サブ予約の座席タイプごとにキャパシティ算出
-                const capacities = yield 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({
-                        event: params.event,
-                        screeningRoom: params.screeningRoom,
-                        eligibleSeatingTypes: [subReservation.typeOfGood.seatingType]
-                    })(repos);
-                    return {
-                        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;
-            if (typeof referenceQuantityValue === 'number' && referenceQuantityValue > 1) {
-                if (typeof maximumAttendeeCapacity === 'number') {
-                    maximumAttendeeCapacity -= maximumAttendeeCapacity % referenceQuantityValue;
-                }
-                if (typeof remainingAttendeeCapacity === 'number') {
-                    remainingAttendeeCapacity -= remainingAttendeeCapacity % referenceQuantityValue;
-                }
-            }
-        }
-        // レート制限がある場合、考慮する
-        if (yield 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;
-        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;
-        if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
-            const rateLimitKey = {
-                reservedTicket: {
-                    ticketType: {
-                        validRateLimit: { scope: scope, unitInSeconds: unitInSeconds }
-                    }
-                },
-                reservationFor: {
-                    startDate: moment(params.event.startDate)
-                        .toDate()
-                },
-                reservationNumber: ''
-            };
-            const holder = yield 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* () {
-        // 適用座席タイプに絞る
-        const eligibleSeatOffers = (Array.isArray(params.screeningRoom.containsPlace))
-            ? params.screeningRoom.containsPlace.reduce((a, b) => {
-                return [
-                    ...a,
-                    ...(Array.isArray(b.containsPlace))
-                        ? b.containsPlace.filter((place) => {
-                            const seatingTypes = (Array.isArray(place.seatingType)) ? place.seatingType
-                                : (typeof place.seatingType === 'string') ? [place.seatingType]
-                                    : [];
-                            return seatingTypes.some((seatingTypeCodeValue) => params.eligibleSeatingTypes.some((eligibleSeatingType) => eligibleSeatingType === seatingTypeCodeValue));
-                        })
-                            .map((place) => {
-                            return {
-                                seatSection: b.branchCode,
-                                seatNumber: place.branchCode
-                            };
-                        })
-                        : []
-                ];
-            }, [])
-            : [];
-        const maximumAttendeeCapacity = eligibleSeatOffers.length;
-        let remainingAttendeeCapacity;
-        if (maximumAttendeeCapacity > 0) {
-            const availabilities = yield repos.stockHolder.searchHolders({
-                project: { id: params.event.project.id },
-                eventId: params.event.id,
-                startDate: moment(params.event.startDate)
-                    .toDate(),
-                hasTicketedSeat: true,
-                offers: eligibleSeatOffers
-            });
-            // remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
-            remainingAttendeeCapacity = availabilities.filter((holder) => typeof holder !== 'string').length;
-        }
-        else {
-            remainingAttendeeCapacity = 0;
-        }
-        return { maximumAttendeeCapacity, remainingAttendeeCapacity };
-    });
-}
 function aggregateReservationByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 収容人数を集計

package/lib/chevre/service/aggregation/event.d.ts

@@ -1,7 +1,8 @@
 /**
  * イベント集計サービス
  */
+import { aggregateOffers } from './event/aggregateOffers';
 import { aggregateScreeningEvent } from './event/aggregateScreeningEvent';
 import { aggregateUseActionsOnEvent } from './event/aggregateUseActionsOnEvent';
 import { importFromCOA } from './event/importFromCOA';
-export { aggregateScreeningEvent, aggregateUseActionsOnEvent, importFromCOA };
+export { aggregateOffers, aggregateScreeningEvent, aggregateUseActionsOnEvent, importFromCOA };

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importFromCOA = exports.aggregateUseActionsOnEvent = exports.aggregateScreeningEvent = void 0;
+exports.importFromCOA = exports.aggregateUseActionsOnEvent = exports.aggregateScreeningEvent = exports.aggregateOffers = void 0;
 /**
  * イベント集計サービス
  */
+const aggregateOffers_1 = require("./event/aggregateOffers");
+Object.defineProperty(exports, "aggregateOffers", { enumerable: true, get: function () { return aggregateOffers_1.aggregateOffers; } });
 const aggregateScreeningEvent_1 = require("./event/aggregateScreeningEvent");
 Object.defineProperty(exports, "aggregateScreeningEvent", { enumerable: true, get: function () { return aggregateScreeningEvent_1.aggregateScreeningEvent; } });
 const aggregateUseActionsOnEvent_1 = require("./event/aggregateUseActionsOnEvent");

package/lib/chevre/service/task/aggregateOffers.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.aggregateOffers.IData): IOperation<void>;

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

@@ -0,0 +1,45 @@
+"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.call = void 0;
+const factory = require("../../factory");
+const event_1 = require("../../repo/event");
+const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
+const place_1 = require("../../repo/place");
+const product_1 = require("../../repo/product");
+const offer_2 = require("../../repo/rateLimit/offer");
+const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
+const task_1 = require("../../repo/task");
+const aggregateOffers_1 = require("../aggregation/event/aggregateOffers");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, aggregateOffers_1.aggregateOffers)(data)({
+            event: new event_1.MongoRepository(settings.connection),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+            offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
+            offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
+            place: new place_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

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

@@ -16,7 +16,6 @@ const offer_1 = require("../../repo/offer");
 const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
-const project_1 = require("../../repo/project");
 const offer_2 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
@@ -38,7 +37,6 @@ function call(data) {
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
-            project: new project_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection)
         });

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.364.0-alpha.1",
+    "@chevre/factory": "4.364.0-alpha.2",
     "@cinerino/sdk": "5.15.0-alpha.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.13"
+  "version": "21.27.0-alpha.14"
 }