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

package/example/src/chevre/searchMinimizedEvent.ts

@@ -0,0 +1,37 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+const startTime = process.hrtime();
+import { chevre } from '../../../lib/index';
+const diff = process.hrtime(startTime);
+console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
+
+// const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const event = await eventRepo.findMinimizedIndividualEventById(
+        {
+            id: '120162210202407171202250'
+            // id: 'blxonxv1m'
+        },
+        [
+            'project', 'typeOf', 'startDate',
+            // 'superEvent.id',
+            // 'offers.itemOffered',
+            'offers.itemOffered.id',
+            'offers.offeredThrough',
+            'offers.eligibleQuantity',
+            'offers.unacceptedPaymentMethod'
+        ]
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(event, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -69,6 +69,11 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.id' | 'offers.itemOffered.id' | 'offers.offeredThrough';
+/**
+ * minimizedEvent検索時のprojection候補
+ * add(2024-07-18~)
+ */
+type IKeyOfProjection4minimizedEvent = 'project' | 'typeOf' | 'startDate' | 'superEvent.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity';
 type IUnset<T extends factory.eventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };
@@ -161,7 +166,7 @@ export declare class EventRepo {
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;
-    }): Promise<IMinimizedIndividualEvent<T>>;
+    }, inclusion: IKeyOfProjection4minimizedEvent[]): Promise<IMinimizedIndividualEvent<T>>;
     /**
      * イベントをキャンセルする
      */

package/lib/chevre/repo/event.js

@@ -906,9 +906,19 @@ class EventRepo {
                 .exec();
         });
     }
-    findMinimizedIndividualEventById(params) {
+    findMinimizedIndividualEventById(params, inclusion // add projection(2024-07-18~)
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne({ _id: params.id }, PROJECTION_MINIMIZED_EVENT)
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = PROJECTION_MINIMIZED_EVENT;
+            }
+            const doc = yield this.eventModel.findOne({ _id: { $eq: params.id } }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);

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

@@ -21,7 +21,7 @@ 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 event = yield repos.event.findMinimizedIndividualEventById({ id: params.id }, []);
         const eventCapacity = (yield repos.event.search({
             limit: 1,
             page: 1,

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

@@ -25,7 +25,7 @@ const debug = createDebug('chevre-domain:service:aggregation');
 function aggregateScreeningEvent(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         // 集計対象イベント検索
-        const event = yield repos.event.findMinimizedIndividualEventById(params);
+        const event = yield repos.event.findMinimizedIndividualEventById(params, []);
         let aggregatingEvents = [event];
         // プロジェクト限定(2023-02-22~)
         if (settings.useOfferRateLimitProjects.includes(event.project.id)) {

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

@@ -23,7 +23,7 @@ function aggregateUseActionsOnEvent(params) {
         const now = new Date();
         // 集計対象イベント検索
         // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById(params);
+        const event = yield repos.event.findMinimizedIndividualEventById(params, []);
         // 入場ゲート検索
         const entranceGates = yield findEntranceGates({ event })(repos);
         // 入場ゲートごとの集計

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

@@ -91,7 +91,7 @@ function fixEvent(params) {
         // } else {
         //     event = await repos.event.findMinimizedIndividualEventById({ id: reservationForId });
         // }
-        event = yield repos.event.findMinimizedIndividualEventById({ id: reservationForId });
+        event = yield repos.event.findMinimizedIndividualEventById({ id: reservationForId }, []);
         let offeredThrough = (_b = event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (offeredThrough === undefined) {
             offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -311,27 +311,13 @@ function checkAvailability(params) {
  */
 function searchEventTicketOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // optimize projection(2024-07-17~)
-        let event;
-        // event = await repos.event.findMinimizedIndividualEventById({ id: params.event.id });
         const eventType = params.event.typeOf;
-        if (eventType === factory.eventType.Event) {
-            event = (yield repos.event.search({
-                limit: 1, page: 1,
-                id: { $eq: params.event.id },
-                typeOf: eventType
-            }, ['_id', 'project', 'typeOf', 'startDate', 'offers.itemOffered.id', 'offers.offeredThrough'], [])).shift();
-        }
-        else if (eventType === factory.eventType.ScreeningEvent) {
-            event = (yield repos.event.search({
-                limit: 1, page: 1,
-                id: { $eq: params.event.id },
-                typeOf: eventType
-            }, ['_id', 'project', 'typeOf', 'startDate', 'superEvent.id', 'offers.itemOffered.id', 'offers.offeredThrough'], [])).shift();
-        }
-        if (event === undefined) {
-            throw new factory.errors.NotFound(params.event.typeOf);
-        }
+        // optimize projection(2024-07-17~)
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id }, [
+            'project', 'typeOf', 'startDate',
+            'superEvent.id',
+            'offers.itemOffered.id', 'offers.offeredThrough', 'offers.unacceptedPaymentMethod', 'offers.eligibleQuantity'
+        ]);
         let offers;
         let unitPriceOffers;
         const eventOffers = event.offers;
@@ -371,7 +357,8 @@ exports.searchEventTicketOffers = searchEventTicketOffers;
 function searchOfferAppliesToMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
@@ -449,7 +436,8 @@ function searchOfferCatalogItems(params) {
             throw new factory.errors.Argument('page', 'must be number');
         }
         let offerCatalogItems = [];
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id }, ['offers.itemOffered.id']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
@@ -518,7 +506,8 @@ function searchOfferCatalogItemAvailability(params) {
             throw new factory.errors.Argument('page', 'must be number');
         }
         let availabilities = [];
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id }, ['project', 'offers.itemOffered.id']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -50,7 +50,7 @@ function authorize(params) {
         try {
             // イベント取得属性最適化(2023-01-23~)
             screeningEvent =
-                yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
+                yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id }, []);
             const availablePaymentMethodTypes = yield repos.categoryCode.search({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -72,9 +72,7 @@ function changeOffers(params) {
             return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd1, spseatAdd2: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd2, spseatKbn: originalAcceptedOfferBySeatNumber.ticketInfo.spseatKbn }) });
         });
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
-            id: params.object.event.id
-        });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id }, []);
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }

package/lib/chevre/service/offer.js

@@ -60,12 +60,13 @@ exports.addOffers2Seat = addOffers2Seat;
 /**
  * イベントに対する座席オファーを検索する
  */
+// tslint:disable-next-line:max-func-body-length
 function searchEventSeatOffersWithPaging(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
-        // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
         const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -55,7 +55,7 @@ function checkMovieTicket(params) {
             }
             // イベント取得属性最適化(2023-01-23~)
             let screeningEvent;
-            screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
+            screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
             const sellerId = (_f = optimizedCheckObject[0]) === null || _f === void 0 ? void 0 : _f.seller.id;
             const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -112,7 +112,7 @@ function payActionParams2seatInfoSyncIn(params) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
         const sellerId = String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id);
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -45,9 +45,7 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
-            id: eventIds[0]
-        });
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
         // 販売者からムビチケ決済情報取得
         const sellerId = (_c = params.recipient) === null || _c === void 0 ? void 0 : _c.id;
         if (typeof sellerId !== 'string') {

package/package.json

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