@chevre/domain 21.27.0-alpha.9 → 21.27.0

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateByEvent = exports.aggregateScreeningEvent = void 0;
 /**
- * イベント集計サービス
+ * イベントの予約集計サービス
  */
 const createDebug = require("debug");
 const moment = require("moment-timezone");
@@ -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,25 +106,23 @@ function aggregateByEvent(params) {
             screeningRoom
         })(repos);
         // オファーごとの集計
-        let aggregateOffer;
-        aggregateOffer = yield aggregateOfferByEvent({
+        const aggregateOffer = yield aggregateOfferByEvent({
             aggregateDate: now,
-            event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
-                remainingAttendeeCapacity }),
-            screeningRoom: screeningRoom
+            event,
+            screeningRoom
         })(repos);
         debug('offers aggregated', aggregateOffer);
         // 値がundefinedの場合に更新しないように注意
         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)
+            $set: Object.assign(Object.assign(Object.assign(Object.assign({ 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)
         };
         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,37 +156,12 @@ 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
-            };
-        }
-        else {
-            const { offerCount } = yield calculateOfferCount({ event: params.event })(repos);
-            return {
-                typeOf: factory.offerType.AggregateOffer,
-                offerCount
-            };
-        }
+        const { offerCount } = yield calculateOfferCount({ event: params.event })(repos);
+        return {
+            typeOf: factory.offerType.AggregateOffer,
+            aggregateDate: params.aggregateDate,
+            offerCount
+        };
     });
 }
 function calculateOfferCount(params) {
@@ -186,8 +171,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 +198,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* () {
         // 収容人数を集計
@@ -405,7 +212,6 @@ function aggregateReservationByEvent(params) {
         }
         reservationCount = yield repos.reservation.count({
             typeOf: reservationType,
-            // reservationFor: { ids: [params.event.id] },
             reservationFor: { id: { $eq: params.event.id } },
             reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
         });
@@ -418,13 +224,6 @@ function aggregateReservationByEvent(params) {
         if (hasTicketedSeat) {
             // seatCountを利用する(2023-06-24~)
             const screeningRoomSeatCount = (typeof params.screeningRoom.seatCount === 'number') ? params.screeningRoom.seatCount : 0;
-            // const screeningRoomSeatCount = (Array.isArray(params.screeningRoom.containsPlace))
-            //     // b.containsPlaceがundefinedの場合があるので注意(座席未登録)
-            //     ? params.screeningRoom.containsPlace.reduce(
-            //         (a, b) => a + ((Array.isArray(b.containsPlace)) ? b.containsPlace.length : 0),
-            //         0
-            //     )
-            //     : 0;
             maximumAttendeeCapacity = screeningRoomSeatCount;
             // イベントのキャパシティ設定がスクリーン座席数より小さければmaximumAttendeeCapacityを上書き
             if (typeof eventLocationMaximumAttendeeCapacity === 'number' && eventLocationMaximumAttendeeCapacity < screeningRoomSeatCount) {
@@ -449,16 +248,12 @@ function aggregateReservationByEvent(params) {
         }
         attendeeCount = yield repos.reservation.count({
             typeOf: reservationType,
-            // reservationFor: { ids: [params.event.id] },
             reservationFor: { id: { $eq: params.event.id } },
-            // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             attended: true
         });
         checkInCount = yield repos.reservation.count({
             typeOf: reservationType,
-            // reservationFor: { ids: [params.event.id] },
             reservationFor: { id: { $eq: params.event.id } },
-            // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
             checkedIn: true
         });
         return {

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

@@ -1,4 +1,5 @@
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { MongoRepository as AggregateReservationRepo } from '../../../repo/aggregateReservation';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -6,6 +7,7 @@ import type { MongoRepository as PlaceRepo } from '../../../repo/place';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 export type IAggregateOperation<T> = (repos: {
     action: ActionRepo;
+    aggregateReservation: AggregateReservationRepo;
     event: EventRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

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

@@ -14,6 +14,7 @@ exports.aggregateUseActionsOnEvent = 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');
@@ -22,7 +23,6 @@ function aggregateUseActionsOnEvent(params) {
         const now = new Date();
         // 集計対象イベント検索
         // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>(params);
         const event = yield repos.event.findMinimizedIndividualEventById(params);
         // 入場ゲート検索
         const entranceGates = yield findEntranceGates({ event })(repos);
@@ -33,19 +33,28 @@ function aggregateUseActionsOnEvent(params) {
             entranceGates
         })(repos);
         debug('entrances aggregated', aggregateEntranceGate);
-        // 値がundefinedの場合に更新しないように注意
         const update = {
             $set: {
-                updatedAt: new Date(),
+                // updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
                 aggregateEntranceGate
-            },
-            $unset: {
-                noExistingAttributeName: 1 // $unsetは空だとエラーになるので
             }
+            // $unset: {
+            //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
+            // }
         };
         debug('update:', update);
-        // 保管
-        yield repos.event.updateAggregationById({ id: event.id }, update);
+        // 廃止(2024-03-28~)
+        // await repos.event.updateAggregationById({ id: event.id }, update);
+        // aggregateReservationsにも保管(2024-03-25~)
+        yield repos.aggregateReservation.save({
+            project: event.project,
+            reservationFor: {
+                id: event.id,
+                typeOf: event.typeOf,
+                startDate: moment(event.startDate)
+                    .toDate()
+            }
+        }, { $set: { aggregateEntranceGate } });
     });
 }
 exports.aggregateUseActionsOnEvent = aggregateUseActionsOnEvent;
@@ -63,12 +72,6 @@ function findEntranceGates(params) {
                 id: { $eq: params.event.superEvent.location.id }
             }, ['hasEntranceGate'], []);
             movieTheater = searchMovieTheatersResult.shift();
-            // movieTheater = await repos.place.findById(
-            //     { id: params.event.superEvent.location.id },
-            //     // 不要な属性を取得しない
-            //     ['hasEntranceGate'],
-            //     []
-            // );
         }
         catch (error) {
             let throwsError = true;
@@ -112,7 +115,7 @@ function aggregateEntranceGateByEvent(params) {
                     debug('useActionCount:', useActionCount, entranceGateIdentifier, offer.id);
                     return Object.assign(Object.assign({ typeOf: offer.typeOf, id: offer.id, identifier: offer.identifier }, (typeof ((_b = offer.category) === null || _b === void 0 ? void 0 : _b.codeValue) === 'string') ? { category: offer.category } : undefined), { aggregateReservation: {
                             typeOf: 'AggregateReservation',
-                            aggregateDate: params.aggregateDate,
+                            // aggregateDate: params.aggregateDate, // 最適化につき廃止(2024-03-26~)
                             useActionCount
                         } });
                 })));
@@ -129,6 +132,7 @@ function aggregateEntranceGateByEvent(params) {
         debug('AggregatePlace created,', places);
         return {
             typeOf: factory.placeType.AggregatePlace,
+            aggregateDate: params.aggregateDate,
             places: places
         };
     });

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

@@ -1,5 +1,5 @@
 import type { IMinimizedIndividualEvent } from '../../../repo/event';
-import type { MongoRepository as OfferRepo } from '../../../repo/offer';
+import type { IUnitPriceOfferFromAggregateOffer, MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { MongoRepository as ProductRepo } from '../../../repo/product';
 import * as factory from '../../../factory';
@@ -13,4 +13,4 @@ export declare function findEventOffers(params: {
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     product: ProductRepo;
-}) => Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
+}) => Promise<IUnitPriceOfferFromAggregateOffer[]>;

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

@@ -23,8 +23,6 @@ function findEventOffers(params) {
             // 興行設定があれば興行のカタログを参照する
             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,

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/assetTransaction/pay.d.ts

@@ -55,6 +55,7 @@ export type ICheckOperation<T> = (repos: {
     paymentServiceProvider: PaymentServiceProviderRepo;
 }) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    action: ActionRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -75,7 +76,9 @@ export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransacti
 /**
  * 外部決済ロケーション発行
  */
-export declare function publishPaymentUrl(params: factory.assetTransaction.pay.IStartParamsWithoutDetail): IPublishPaymentUrlOperation<IPublishPaymentUrlResult>;
+export declare function publishPaymentUrl(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, purposeAsTransaction?: {
+    id: string;
+}): IPublishPaymentUrlOperation<IPublishPaymentUrlResult>;
 /**
  * 決済ロケーションを無効化する
  * 実質、外部で実行された決済に対する返金処理

package/lib/chevre/service/assetTransaction/pay.js

@@ -22,7 +22,8 @@ const debug = createDebug('chevre-domain:service:assetTransaction');
 /**
  * 外部決済ロケーション発行
  */
-function publishPaymentUrl(params) {
+// tslint:disable-next-line:max-func-body-length
+function publishPaymentUrl(params, purposeAsTransaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
@@ -38,34 +39,59 @@ function publishPaymentUrl(params) {
         yield validateSeller(params)(repos);
         // 決済サービス確認
         const paymentServiceId = getPaymentServiceId(params);
+        // 決済受入アクション生成(2024-03-28~)
+        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.AcceptAction, agent: params.agent, object: {
+                object: params.object,
+                transactionNumber,
+                typeOf: params.typeOf
+            } }, (typeof (purposeAsTransaction === null || purposeAsTransaction === void 0 ? void 0 : purposeAsTransaction.id) === 'string')
+            ? { purpose: { typeOf: factory.transactionType.PlaceOrder, id: purposeAsTransaction.id } }
+            : undefined);
+        const action = yield repos.action.start(actionAttributes);
         let result;
-        switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { processPublishPaymentUrl: true })(repos);
-                let paymentUrl;
-                // 3DS拡張(2024-01-02~)
-                const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
-                if (typeof retUrl === 'string' && retUrl.length > 0) {
-                    paymentUrl = authorizeResult.execTranResult.redirectUrl;
-                }
-                else {
-                    paymentUrl = authorizeResult.execTranResult.acsUrl;
-                }
-                if (typeof paymentUrl !== 'string' || paymentUrl.length === 0) {
-                    throw new factory.errors.ServiceUnavailable(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
-                }
-                result = {
-                    paymentMethodId: transactionNumber,
-                    paymentUrl,
-                    entryTranArgs: authorizeResult.entryTranArgs,
-                    entryTranResult: authorizeResult.entryTranResult,
-                    execTranArgs: authorizeResult.execTranArgs,
-                    execTranResult: authorizeResult.execTranResult
-                };
-                break;
-            default:
-                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
+        try {
+            switch (paymentServiceType) {
+                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                    const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { processPublishPaymentUrl: true })(repos);
+                    let paymentUrl;
+                    // 3DS拡張(2024-01-02~)
+                    const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
+                    if (typeof retUrl === 'string' && retUrl.length > 0) {
+                        paymentUrl = authorizeResult.execTranResult.redirectUrl;
+                    }
+                    else {
+                        paymentUrl = authorizeResult.execTranResult.acsUrl;
+                    }
+                    if (typeof paymentUrl !== 'string' || paymentUrl.length === 0) {
+                        throw new factory.errors.ServiceUnavailable(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
+                    }
+                    result = {
+                        paymentMethodId: transactionNumber,
+                        paymentUrl,
+                        entryTranArgs: authorizeResult.entryTranArgs,
+                        entryTranResult: authorizeResult.entryTranResult,
+                        execTranArgs: authorizeResult.execTranArgs,
+                        execTranResult: authorizeResult.execTranResult
+                    };
+                    break;
+                default:
+                    throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
+            }
         }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        const actionResult = {
+            paymentMethodId: result.paymentMethodId,
+            paymentUrl: result.paymentUrl
+        };
+        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult });
         return result;
     });
 }

package/lib/chevre/service/assetTransaction/reserve.js

@@ -17,6 +17,7 @@ const moment = require("moment");
 const pecorinoapi = require("../../pecorinoapi");
 const factory = require("../../factory");
 const OfferService = require("../offer");
+const onEventChanged_1 = require("../offer/onEventChanged");
 const cancelReservation_1 = require("../reserve/cancelReservation");
 const confirmReservation_1 = require("../reserve/confirmReservation");
 const settings_1 = require("../../settings");
@@ -838,7 +839,7 @@ function processLockSeats(params) {
 function onReservationsCreated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 集計タスク
-        yield OfferService.createAggregateScreeningEventIfNotExist({
+        yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
             project: params.event.project,
             reservationFor: [{ id: params.event.id }],
             force: false,