@chevre/domain 20.4.0-alpha.14 → 20.4.0-alpha.15

package/example/src/chevre/aggregateEventReservation.ts

@@ -16,7 +16,7 @@ async function main() {
 
     // const now = new Date();
     await chevre.service.aggregation.event.aggregateScreeningEvent({
-        id: 'alb35u7m4'
+        id: 'blaqxj0ak'
     })({
         event: new chevre.repository.Event(mongoose.connection),
         eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),

package/example/src/chevre/deleteMovieTicketCategoryChargePriceSpecs.ts

@@ -0,0 +1,21 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const priceSpecificationRepo = new chevre.repository.PriceSpecification(mongoose.connection);
+
+    const result = await priceSpecificationRepo.deleteUnnecessaryMovieTicketTypeChargePriceSpecs({
+        project: { id: 'cinerino' }
+    });
+    console.log('deleted', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchEventTicketOffers.ts

@@ -22,7 +22,7 @@ async function main() {
     const productRepo = new chevre.repository.Product(mongoose.connection);
 
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
-        event: { id: 'ale6qiedf' },
+        event: { id: 'ale5c99n2' },
         onlyValid: true,
         sort: false,
         validateOfferRateLimit: true,

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

@@ -10,7 +10,7 @@ export interface IUpdateAggregateReservationParams {
     $set: {
         updatedAt: Date;
         aggregateReservation: factory.event.screeningEvent.IAggregateReservation;
-        aggregateOffer: factory.event.screeningEvent.IAggregateOffer;
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
         maximumAttendeeCapacity?: number;
         remainingAttendeeCapacity?: number;
         checkInCount?: number;

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

@@ -30,5 +30,15 @@ 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>;
 }

package/lib/chevre/repo/priceSpecification.js

@@ -277,6 +277,16 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteUnnecessaryMovieTicketTypeChargePriceSpecs(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.priceSpecificationModel.deleteMany({
+                'project.id': { $eq: params.project.id },
+                typeOf: { $eq: factory.priceSpecificationType.MovieTicketTypeChargeSpecification },
+                price: { $eq: 0 }
+            })
+                .exec();
+        });
+    }
     getCursor(conditions, projection) {
         return this.priceSpecificationModel.find(conditions, projection)
             .sort({ price: factory.sortType.Ascending })

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,41 +83,29 @@ 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,
             event: event,
             screeningRoom: screeningRoom
         })(repos);
+        // プロジェクト限定(2023-02-22~)
         // オファーごとの集計
-        const aggregateOffer = yield aggregateOfferByEvent({
-            aggregateDate: now,
-            event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
-                remainingAttendeeCapacity }),
-            screeningRoom: screeningRoom
-        })(repos);
-        debug('offers aggregated', aggregateOffer);
+        let aggregateOffer;
+        if (settings_1.settings.useAggregateOfferProjects.includes(event.project.id)) {
+            aggregateOffer = yield aggregateOfferByEvent({
+                aggregateDate: now,
+                event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
+                    remainingAttendeeCapacity }),
+                screeningRoom: screeningRoom
+            })(repos);
+            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 +117,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;
-//     };
-// }
 /**
  * 集計後アクション
  */

package/lib/chevre/settings.d.ts

@@ -24,6 +24,8 @@ export declare type ISettings = factory.project.ISettings & {
     useEventWorkPerformed: boolean;
     useOffersAppliedToMovieTicketWithoutChargeSpecification: boolean;
     useAggregateEntranceGateProjects: string[];
+    useAggregateOfferProjects: string[];
+    useOfferRateLimitProjects: string[];
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -96,4 +96,8 @@ exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrder
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }
     : undefined), { useEventWorkPerformed: process.env.USE_EVENT_WORK_PERFORMED === '1', useOffersAppliedToMovieTicketWithoutChargeSpecification: process.env.USE_OFFERS_APPLIED_TO_MOVIE_TICKET_WITHOUT_PRICE_SPEC === '1', useAggregateEntranceGateProjects: (typeof process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS === 'string')
         ? process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS.split(',')
+        : [], useAggregateOfferProjects: (typeof process.env.USE_AGGREGATE_OFFER_PROJECTS === 'string')
+        ? process.env.USE_AGGREGATE_OFFER_PROJECTS.split(',')
+        : [], useOfferRateLimitProjects: (typeof process.env.USE_OFFER_RATE_LIMIT_PROJECTS === 'string')
+        ? process.env.USE_OFFER_RATE_LIMIT_PROJECTS.split(',')
         : [] });

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.14"
+  "version": "20.4.0-alpha.15"
 }