@chevre/domain 20.4.0-alpha.8 → 20.4.0

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

@@ -30,5 +30,16 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params: {
+        project?: {
+            id?: string;
+        };
+    }): Promise<{
+        ok?: number | undefined;
+        n?: number | undefined;
+    } & {
+        deletedCount?: number | undefined;
+    }>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    reIndex(): Promise<any>;
 }

package/lib/chevre/repo/priceSpecification.js

@@ -32,37 +32,23 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d, _e, _f, _g;
         const andConditions = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined && params.project !== null) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.id !== undefined && params.id !== null) {
             if (typeof params.id.$eq === 'string') {
-                andConditions.push({
-                    _id: {
-                        $eq: params.id.$eq
-                    }
-                });
+                andConditions.push({ _id: { $eq: params.id.$eq } });
             }
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.typeOf !== undefined) {
-            andConditions.push({
-                typeOf: params.typeOf
-            });
+            andConditions.push({ typeOf: params.typeOf });
         }
         if (params.appliesToCategoryCode !== undefined && params.appliesToCategoryCode !== null) {
             if (params.appliesToCategoryCode.$elemMatch !== undefined && params.appliesToCategoryCode.$elemMatch !== null) {
@@ -122,15 +108,23 @@ class MongoRepository {
                 }
             });
         }
-        if (params.appliesToMovieTicket !== undefined) {
-            if (Array.isArray(params.appliesToMovieTicket.serviceTypes)) {
-                andConditions.push({
-                    'appliesToMovieTicket.serviceType': {
-                        $exists: true,
-                        $in: params.appliesToMovieTicket.serviceTypes
-                    }
-                });
-            }
+        const appliesToMovieTicketServiceTypeIn = (_c = params.appliesToMovieTicket) === null || _c === void 0 ? void 0 : _c.serviceTypes;
+        if (Array.isArray(appliesToMovieTicketServiceTypeIn)) {
+            andConditions.push({
+                'appliesToMovieTicket.serviceType': {
+                    $exists: true,
+                    $in: appliesToMovieTicketServiceTypeIn
+                }
+            });
+        }
+        const appliesToMovieTicketServiceOutputTypeOfEq = (_f = (_e = (_d = params.appliesToMovieTicket) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.typeOf) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof appliesToMovieTicketServiceOutputTypeOfEq === 'string') {
+            andConditions.push({
+                'appliesToMovieTicket.serviceOutput.typeOf': {
+                    $exists: true,
+                    $eq: appliesToMovieTicketServiceOutputTypeOfEq
+                }
+            });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -152,45 +146,12 @@ class MongoRepository {
                 }
             });
         }
+        const priceEq = (_g = params.price) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof priceEq === 'number') {
+            andConditions.push({ price: { $eq: priceEq } });
+        }
         return andConditions;
     }
-    // public async countCompoundPriceSpecifications<T extends factory.priceSpecificationType>(
-    //     params: factory.compoundPriceSpecification.ISearchConditions<T>
-    // ): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_COMPOUND_PRICE_SPECIFICATION_MONGO_CONDITIONS(params);
-    //     return this.priceSpecificationModel.countDocuments(
-    //         { $and: conditions }
-    //     )
-    //         .setOptions({ maxTimeMS: 10000 })
-    //         .exec();
-    // }
-    // public async searchCompoundPriceSpecifications<T extends factory.priceSpecificationType>(
-    //     params: factory.compoundPriceSpecification.ISearchConditions<T>
-    // ): Promise<factory.compoundPriceSpecification.IPriceSpecification<T>[]> {
-    //     const conditions = MongoRepository.CREATE_COMPOUND_PRICE_SPECIFICATION_MONGO_CONDITIONS(params);
-    //     const query = this.priceSpecificationModel.find(
-    //         { $and: conditions },
-    //         {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         }
-    //     );
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.limit !== undefined && params.page !== undefined) {
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (params.page - 1));
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.sort !== undefined) {
-    //         query.sort(params.sort);
-    //     }
-    //     return query.setOptions({ maxTimeMS: 10000 })
-    //         .exec()
-    //         .then((docs) => docs.map((doc) => doc.toObject()));
-    // }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
@@ -277,10 +238,27 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.priceSpecificationModel.deleteMany(Object.assign({ typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification }, price: { $eq: 0 } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'project.id': { $eq: params.project.id } }
+                : undefined))
+                .exec();
+        });
+    }
     getCursor(conditions, projection) {
         return this.priceSpecificationModel.find(conditions, projection)
             .sort({ price: factory.sortType.Ascending })
             .cursor();
     }
+    reIndex() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // return this.priceSpecificationModel.collection.name;
+            return this.priceSpecificationModel.db.db.command({
+                reIndex: this.priceSpecificationModel.collection.name
+            });
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -55,6 +55,14 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
+    deleteByName(params: {
+        name: factory.taskName;
+    }): Promise<{
+        ok?: number | undefined;
+        n?: number | undefined;
+    } & {
+        deletedCount?: number | undefined;
+    }>;
     aggregateTask(params: {
         project?: {
             id?: {

package/lib/chevre/repo/task.js

@@ -29,9 +29,13 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const andConditions = [];
-        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = (_c = (_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
@@ -39,11 +43,11 @@ class MongoRepository {
             andConditions.push({ name: { $eq: params.name } });
         }
         else {
-            const nameIn = (_c = params.name) === null || _c === void 0 ? void 0 : _c.$in;
+            const nameIn = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$in;
             if (Array.isArray(nameIn)) {
                 andConditions.push({ name: { $in: nameIn } });
             }
-            const nameNin = (_d = params.name) === null || _d === void 0 ? void 0 : _d.$nin;
+            const nameNin = (_e = params.name) === null || _e === void 0 ? void 0 : _e.$nin;
             if (Array.isArray(nameNin)) {
                 andConditions.push({ name: { $nin: nameNin } });
             }
@@ -89,7 +93,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedGte = (_e = params.dateAborted) === null || _e === void 0 ? void 0 : _e.$gte;
+        const dateAbortedGte = (_f = params.dateAborted) === null || _f === void 0 ? void 0 : _f.$gte;
         if (dateAbortedGte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -98,7 +102,7 @@ class MongoRepository {
                 }
             });
         }
-        const dateAbortedLte = (_f = params.dateAborted) === null || _f === void 0 ? void 0 : _f.$lte;
+        const dateAbortedLte = (_g = params.dateAborted) === null || _g === void 0 ? void 0 : _g.$lte;
         if (dateAbortedLte instanceof Date) {
             andConditions.push({
                 dateAborted: {
@@ -107,7 +111,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectTransactionNumberEq = (_j = (_h = (_g = params.data) === null || _g === void 0 ? void 0 : _g.object) === null || _h === void 0 ? void 0 : _h.transactionNumber) === null || _j === void 0 ? void 0 : _j.$eq;
+        const objectTransactionNumberEq = (_k = (_j = (_h = params.data) === null || _h === void 0 ? void 0 : _h.object) === null || _j === void 0 ? void 0 : _j.transactionNumber) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({
                 'data.object.transactionNumber': {
@@ -116,7 +120,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeIdEq = (_m = (_l = (_k = params.data) === null || _k === void 0 ? void 0 : _k.purpose) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$eq;
+        const objectPurposeIdEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.purpose) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof objectPurposeIdEq === 'string') {
             andConditions.push({
                 'data.purpose.id': {
@@ -125,7 +129,7 @@ class MongoRepository {
                 }
             });
         }
-        const objectPurposeOrderNumberEq = (_q = (_p = (_o = params.data) === null || _o === void 0 ? void 0 : _o.purpose) === null || _p === void 0 ? void 0 : _p.orderNumber) === null || _q === void 0 ? void 0 : _q.$eq;
+        const objectPurposeOrderNumberEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.purpose) === null || _q === void 0 ? void 0 : _q.orderNumber) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {
@@ -306,6 +310,14 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteByName(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.taskModel.deleteMany({
+                name: { $eq: params.name }
+            })
+                .exec();
+        });
+    }
     aggregateTask(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -1,6 +1,7 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { RedisRepository as EventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
@@ -12,6 +13,7 @@ export declare type IAggregateScreeningEventOperation<T> = (repos: {
     event: EventRepo;
     eventAvailability: EventAvailabilityRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;
     place: PlaceRepo;
     product: ProductRepo;

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

@@ -17,6 +17,7 @@ const createDebug = require("debug");
 const moment = require("moment-timezone");
 const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
+const settings_1 = require("../../../settings");
 const debug = createDebug('chevre-domain:service');
 /**
  * イベントデータをID指定で集計する
@@ -28,31 +29,34 @@ function aggregateScreeningEvent(params) {
         // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>(params);
         const event = yield repos.event.findMinimizedIndividualEventById(params);
         let aggregatingEvents = [event];
-        const availableOffers = yield findOffers({ event })(repos);
-        const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
-        if (offerRateLimitExists) {
-            // 同location、かつ同時間帯、のイベントに関しても集計する(ttts暫定対応)
-            const startFrom = moment(event.startDate)
-                .startOf('hour')
-                .toDate();
-            const startThrough = moment(startFrom)
-                .add(1, 'hour')
-                .add(-1, 'second')
-                .toDate();
-            // 取得属性最適化(2023-01-25~)
-            aggregatingEvents = yield repos.event.search({
-                limit: 100,
-                page: 1,
-                project: { id: { $eq: event.project.id } },
-                typeOf: event.typeOf,
-                eventStatuses: [factory.eventStatusType.EventScheduled],
-                startFrom: startFrom,
-                startThrough: startThrough,
-                location: { branchCode: { $eq: event.location.branchCode } }
-            }, event_1.PROJECTION_MINIMIZED_EVENT);
-            // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
-            aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
-            aggregatingEvents = [event, ...aggregatingEvents];
+        // プロジェクト限定(2023-02-22~)
+        if (settings_1.settings.useOfferRateLimitProjects.includes(event.project.id)) {
+            const availableOffers = yield findOffers({ event })(repos);
+            const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
+            if (offerRateLimitExists) {
+                // 同location、かつ同時間帯、のイベントに関しても集計する(ttts暫定対応)
+                const startFrom = moment(event.startDate)
+                    .startOf('hour')
+                    .toDate();
+                const startThrough = moment(startFrom)
+                    .add(1, 'hour')
+                    .add(-1, 'second')
+                    .toDate();
+                // 取得属性最適化(2023-01-25~)
+                aggregatingEvents = yield repos.event.search({
+                    limit: 100,
+                    page: 1,
+                    project: { id: { $eq: event.project.id } },
+                    typeOf: event.typeOf,
+                    eventStatuses: [factory.eventStatusType.EventScheduled],
+                    startFrom: startFrom,
+                    startThrough: startThrough,
+                    location: { branchCode: { $eq: event.location.branchCode } }
+                }, event_1.PROJECTION_MINIMIZED_EVENT);
+                // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
+                aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
+                aggregatingEvents = [event, ...aggregatingEvents];
+            }
         }
         debug(aggregatingEvents.length, 'aggregatingEvents found', aggregatingEvents.map((e) => e.id));
         for (const aggregatingEvent of aggregatingEvents) {
@@ -79,20 +83,6 @@ function aggregateByEvent(params) {
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });
-        // 施設取得
-        // const movieTheater = await findLocation(params)(repos);
-        // // 万が一施設が存在しなければ処理終了
-        // if (movieTheater === undefined) {
-        //     return;
-        // }
-        // const screeningRoom = <factory.place.screeningRoom.IPlace | undefined>
-        //     movieTheater.containsPlace.find((p) => p.branchCode === event.location.branchCode);
-        // if (screeningRoom === undefined) {
-        //     // 基本的にありえないはずだが、万が一スクリーンが見つからなければcapacityは0のまま
-        //     // tslint:disable-next-line:no-console
-        //     console.error(new Error(`Screening room not found. branchCode: ${event.location.branchCode}`));
-        //     return;
-        // }
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
             aggregateDate: now,
@@ -100,7 +90,8 @@ function aggregateByEvent(params) {
             screeningRoom: screeningRoom
         })(repos);
         // オファーごとの集計
-        const aggregateOffer = yield aggregateOfferByEvent({
+        let aggregateOffer;
+        aggregateOffer = yield aggregateOfferByEvent({
             aggregateDate: now,
             event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
                 remainingAttendeeCapacity }),
@@ -109,11 +100,9 @@ function aggregateByEvent(params) {
         debug('offers aggregated', aggregateOffer);
         // 値がundefinedの場合に更新しないように注意
         const update = {
-            $set: Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
-                // aggregateEntranceGate,
-                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)
+            $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)
         };
         debug('update:', update);
         // 保管
@@ -125,37 +114,6 @@ function aggregateByEvent(params) {
     });
 }
 exports.aggregateByEvent = aggregateByEvent;
-/**
- * イベントロケーション取得
- * NotFoundエラーをハンドリングする
- */
-// function findLocation(params: {
-//     event: factory.event.screeningEvent.IEvent | factory.event.event.IEvent;
-// }) {
-//     return async (repos: {
-//         place: PlaceRepo;
-//     }): Promise<factory.place.movieTheater.IPlace | undefined> => {
-//         let movieTheater: factory.place.movieTheater.IPlace | undefined;
-//         try {
-//             if (params.event.typeOf === factory.eventType.ScreeningEvent) {
-//                 movieTheater = await repos.place.findById({ id: params.event.superEvent.location.id });
-//             } else {
-//                 const movieTheaterId: string =
-//                     String(params.event.offers?.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
-//                 movieTheater = await repos.place.findById({ id: movieTheaterId });
-//             }
-//         } catch (error) {
-//             let throwsError = true;
-//             if (error instanceof factory.errors.NotFound) {
-//                 throwsError = false;
-//             }
-//             if (throwsError) {
-//                 throw error;
-//             }
-//         }
-//         return movieTheater;
-//     };
-// }
 /**
  * 集計後アクション
  */
@@ -172,26 +130,36 @@ function reservedSeatsAvailable(params) {
 function aggregateOfferByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const availableOffers = yield findOffers(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));
+        // プロジェクト限定(2023-02-22~)
+        if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
+            const availableOffers = yield findOffers(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
+            };
         }
-        return {
-            typeOf: factory.offerType.AggregateOffer,
-            offerCount: availableOffers.length,
-            offers: offersWithAggregateReservation
-        };
     });
 }
 /**
@@ -208,10 +176,12 @@ function findOffers(params) {
             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.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        excludeAppliesToMovieTicket: false,
                         sort: false // ソート不要(2023-01-27~)
                     });
+                    availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }
             }
             else {
@@ -231,6 +201,33 @@ function findOffers(params) {
         return availableOffers;
     });
 }
+function calculateOfferCount(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        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.findById({ id: eventOffers.itemOffered.id });
+                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                    const catalogs = yield repos.offerCatalog.search({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: [eventService.hasOfferCatalog.id] }
+                    });
+                    const numberOfItems = (_c = catalogs.shift()) === null || _c === void 0 ? void 0 : _c.numberOfItems;
+                    if (typeof numberOfItems === 'number') {
+                        offerCount = numberOfItems;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            throw error;
+        }
+        return { offerCount };
+    });
+}
 function aggregateReservationByOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let reservationCount4offer;

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

@@ -91,10 +91,12 @@ function findOffers(params) {
             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.findById({ id: eventOffers.itemOffered.id });
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-                    availableOffers = yield repos.offer.findOffersByOfferCatalogId({
+                    const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
+                        excludeAppliesToMovieTicket: false,
                         sort: false // ソート不要(2023-01-27~)
                     });
+                    availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }
             }
             else {

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

@@ -62,20 +62,29 @@ function start(params) {
             recipient: params.recipient,
             object: Object.assign(Object.assign({ amount,
                 fromLocation,
-                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, id: '', transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
+                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
             expires: params.expires
         };
         // 取引開始
         let transaction;
         try {
             transaction = yield repos.assetTransaction.start(startParams);
-            const pendingTransaction = yield authorizeAccount({ transaction })(repos);
-            yield repos.assetTransaction.findByIdAndUpdate({
-                id: transaction.id,
-                update: {
-                    'object.pendingTransaction': Object.assign({ typeOf: pendingTransaction.typeOf, id: pendingTransaction.id, transactionNumber: pendingTransaction.transactionNumber }, (typeof pendingTransaction.identifier === 'string') ? { identifier: pendingTransaction.identifier } : undefined)
-                }
-            });
+            // const pendingTransaction = await authorizeAccount({ transaction })(repos);
+            yield authorizeAccount({ transaction })(repos);
+            // 更新不要(2023-02-20~)
+            // await repos.assetTransaction.findByIdAndUpdate<factory.assetTransactionType.MoneyTransfer>({
+            //     id: transaction.id,
+            //     update: {
+            //         'object.pendingTransaction': {
+            //             typeOf: pendingTransaction.typeOf,
+            //             id: pendingTransaction.id,
+            //             transactionNumber: pendingTransaction.transactionNumber,
+            //             ...(typeof pendingTransaction.identifier === 'string')
+            //                 ? { identifier: pendingTransaction.identifier }
+            //                 : undefined
+            //         }
+            //     }
+            // });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -113,13 +122,12 @@ function authorizeAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const transaction = params.transaction;
-        let pendingTransaction;
         const fromLocation = transaction.object.fromLocation;
         const toLocation = transaction.object.toLocation;
         if (typeof ((_a = transaction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
             throw new factory.errors.NotFound('transaction.object.pendingTransaction.typeOf');
         }
-        pendingTransaction = yield MoneyTransferService.authorize({
+        yield MoneyTransferService.authorize({
             typeOf: transaction.object.pendingTransaction.typeOf,
             identifier: transaction.object.pendingTransaction.identifier,
             transactionNumber: transaction.object.pendingTransaction.transactionNumber,
@@ -143,7 +151,7 @@ function authorizeAccount(params) {
             recipient: transaction.recipient,
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         })(repos);
-        return pendingTransaction;
+        // return pendingTransaction;
     });
 }
 function fixMonetaryAmount(params, product) {

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

@@ -269,11 +269,10 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId) {
 }
 function processAuthorizeMovieTicket(params, transaction, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const authorizeResult = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
+        const { accountId, checkResult, payAction } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId)(repos);
         return saveAuthorizeResult({
             id: transaction.id,
-            update: Object.assign({ 'object.accountId': (_a = authorizeResult.checkResult) === null || _a === void 0 ? void 0 : _a.movieTickets[0].identifier, 'object.paymentMethod.accountId': (_b = authorizeResult.checkResult) === null || _b === void 0 ? void 0 : _b.movieTickets[0].identifier, 'object.checkResult': authorizeResult.checkResult }, (authorizeResult.payAction !== undefined) ? { 'object.payAction': authorizeResult.payAction } : undefined)
+            update: Object.assign({ 'object.accountId': accountId, 'object.paymentMethod.accountId': accountId, 'object.payAction': payAction }, (checkResult !== undefined) ? { 'object.checkResult': checkResult } : undefined)
         })(repos);
     });
 }