@chevre/domain 20.2.0-alpha.29 → 20.2.0-alpha.30

package/example/src/chevre/searchEventIds.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = process.env.PROJECT_ID;
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+
+    const ids = await eventRepo.searchIds({
+        typeOf: chevre.factory.eventType.ScreeningEvent,
+        project: { id: { $eq: PROJECT_ID } },
+        id: { $in: ['al6afe7ad', 'al6afe7ae'] }
+    });
+    console.log(ids);
+    console.log(ids.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchEvents.ts

@@ -11,47 +11,27 @@ async function main() {
 
     const eventRepo = new chevre.repository.Event(mongoose.connection);
 
-    const events = await eventRepo.search({
-        limit: 100,
-        page: 1,
-        sort: { startDate: 1 },
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        project: { id: { $eq: PROJECT_ID } },
-        offers: {
-            seller: {
-                makesOffer: {
-                    $elemMatch: {
-                        'availableAtOrFrom.id': { $eq: '5h3gs22mu9j3ok7o63uog9o9i3' },
-                        availabilityEnds: {
-                            $gte: moment('2022-11-18T02:20:00.000Z')
-                                .toDate(),
-                            $lte: moment('2022-11-18T02:20:00.000Z')
-                                .toDate()
-                        },
-                        availabilityStarts: {
-                            $gte: moment('2022-11-15T15:00:00.000Z')
-                                .toDate(),
-                            $lte: moment('2022-11-15T15:00:00.000Z')
-                                .toDate()
-                        },
-                        validFrom: {
-                            $gte: moment('2022-11-15T15:00:00.000Z')
-                                .toDate(),
-                            $lte: moment('2022-11-15T15:00:00.000Z')
-                                .toDate()
-                        },
-                        validThrough: {
-                            $gte: moment('2022-11-18T02:20:00.000Z')
-                                .toDate(),
-                            $lte: moment('2022-11-18T02:20:00.000Z')
-                                .toDate()
-                        }
-                    }
-                }
-            }
+    const event = await eventRepo.findById(
+        { id: 'al6aff83y' },
+        {
+            name: 1
+        }
+    );
+    console.log('event found', event);
+
+    const events = await eventRepo.search(
+        {
+            limit: 100,
+            page: 1,
+            sort: { startDate: 1 },
+            typeOf: chevre.factory.eventType.ScreeningEvent,
+            project: { id: { $eq: PROJECT_ID } },
+            id: { $in: ['al6aff83y'] }
         },
-        id: { $in: ['al6aff83y'] }
-    });
+        {
+            name: 1
+        }
+    );
     console.log(events);
     console.log(events.length);
 }

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

@@ -52,7 +52,11 @@ interface IStatus {
 export interface IAggregateEvent {
     statuses: IStatus[];
 }
+interface IProjection {
+    [key: string]: number;
+}
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
+export declare const PROJECTION_MINIMIZED_EVENT: IProjection;
 /**
  * イベントリポジトリ
  */
@@ -77,17 +81,13 @@ export declare class MongoRepository {
     save<T extends factory.eventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: {
-            [key: string]: number;
-        };
+        $unset?: IProjection;
         upsert?: boolean;
     }): Promise<factory.event.IEvent<T>>;
     saveMany<T extends factory.eventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: {
-            [key: string]: number;
-        };
+        $unset?: IProjection;
         upsert?: boolean;
     }[]): Promise<void>;
     save4ttts(params: {
@@ -98,14 +98,11 @@ export declare class MongoRepository {
     /**
      * イベントを検索する
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: {
-        [key: string]: number;
-    }): Promise<factory.event.IEvent<T>[]>;
+    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection): Promise<factory.event.IEvent<T>[]>;
+    searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     findById<T extends factory.eventType>(params: {
         id: string;
-    }, projection?: {
-        [key: string]: number;
-    }): Promise<factory.event.IEvent<T>>;
+    }, projection?: IProjection): Promise<factory.event.IEvent<T>>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;
     }): Promise<IMinimizedIndividualEvent<T>>;

package/lib/chevre/repo/event.js

@@ -20,10 +20,26 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = void 0;
+exports.MongoRepository = exports.PROJECTION_MINIMIZED_EVENT = void 0;
 const uniqid = require("uniqid");
 const factory = require("../factory");
 const event_1 = require("./mongoose/model/event");
+exports.PROJECTION_MINIMIZED_EVENT = {
+    project: 1,
+    _id: 1,
+    typeOf: 1,
+    additionalProperty: 1,
+    name: 1,
+    doorTime: 1,
+    endDate: 1,
+    eventStatus: 1,
+    location: 1,
+    startDate: 1,
+    superEvent: 1,
+    offers: 1,
+    coaInfo: 1,
+    identifier: 1
+};
 /**
  * イベントリポジトリ
  */
@@ -588,7 +604,15 @@ class MongoRepository {
     search(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.eventModel.find({ $and: conditions }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            const positiveProjectionExists = (projection !== undefined && projection !== null)
+                ? Object.keys(projection)
+                    .some((key) => projection[key] !== 0)
+                : false;
+            const query = this.eventModel.find({ $and: conditions }, 
+            // :1対応(2023-01-25~)
+            (positiveProjectionExists)
+                ? projection
+                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)
@@ -612,9 +636,25 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    searchIds(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const query = this.eventModel.distinct('_id', { $and: conditions });
+            return query.setOptions({ maxTimeMS: 10000 })
+                .exec();
+        });
+    }
     findById(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne({ _id: params.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            const positiveProjectionExists = (projection !== undefined && projection !== null)
+                ? Object.keys(projection)
+                    .some((key) => projection[key] !== 0)
+                : false;
+            const doc = yield this.eventModel.findOne({ _id: params.id }, 
+            // :1対応(2023-01-25~)
+            (positiveProjectionExists)
+                ? projection
+                : Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
@@ -624,22 +664,7 @@ class MongoRepository {
     }
     findMinimizedIndividualEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne({ _id: params.id }, {
-                project: 1,
-                _id: 1,
-                typeOf: 1,
-                additionalProperty: 1,
-                name: 1,
-                doorTime: 1,
-                endDate: 1,
-                eventStatus: 1,
-                location: 1,
-                startDate: 1,
-                superEvent: 1,
-                offers: 1,
-                coaInfo: 1,
-                identifier: 1
-            })
+            const doc = yield this.eventModel.findOne({ _id: params.id }, exports.PROJECTION_MINIMIZED_EVENT)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
@@ -652,9 +677,7 @@ class MongoRepository {
      */
     cancel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.findOneAndUpdate({
-                _id: params.id
-            }, { eventStatus: factory.eventStatusType.EventCancelled }, { new: true })
+            yield this.eventModel.findOneAndUpdate({ _id: params.id }, { eventStatus: factory.eventStatusType.EventCancelled })
                 .exec();
         });
     }

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

@@ -15,6 +15,7 @@ exports.aggregateByEvent = exports.aggregateScreeningEvent = void 0;
  */
 const createDebug = require("debug");
 const moment = require("moment-timezone");
+const event_1 = require("../../../repo/event");
 const factory = require("../../../factory");
 const debug = createDebug('chevre-domain:service');
 /**
@@ -38,6 +39,7 @@ function aggregateScreeningEvent(params) {
                 .add(1, 'hour')
                 .add(-1, 'second')
                 .toDate();
+            // 取得属性最適化(2023-01-25~)
             aggregatingEvents = yield repos.event.search({
                 limit: 100,
                 page: 1,
@@ -47,7 +49,7 @@ function aggregateScreeningEvent(params) {
                 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];

package/lib/chevre/service/event.js

@@ -356,8 +356,19 @@ function createScreeningEvents(params) {
 }
 function cancelDeletedEvents(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // distinctでidのみ取得(2023-01-25~)
         // COAから削除されたイベントをキャンセル済ステータスへ変更
-        const ids = yield repos.event.search({
+        // const ids = await repos.event.search<factory.eventType.ScreeningEvent>({
+        //     project: { id: { $eq: params.project.id } },
+        //     typeOf: factory.eventType.ScreeningEvent,
+        //     superEvent: {
+        //         locationBranchCodes: [params.locationBranchCode]
+        //     },
+        //     startFrom: params.targetImportFrom,
+        //     startThrough: params.targetImportThrough
+        // })
+        //     .then((events) => events.map((e) => e.id));
+        const ids = yield repos.event.searchIds({
             project: { id: { $eq: params.project.id } },
             typeOf: factory.eventType.ScreeningEvent,
             superEvent: {
@@ -365,8 +376,7 @@ function cancelDeletedEvents(params) {
             },
             startFrom: params.targetImportFrom,
             startThrough: params.targetImportThrough
-        })
-            .then((events) => events.map((e) => e.id));
+        });
         const idsShouldBe = params.idsShouldBe;
         const cancelledIds = difference(ids, idsShouldBe);
         debug(`cancelling ${cancelledIds.length} events...`);

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -16,7 +16,7 @@ declare type IAcceptedPaymentMethod = factory.paymentMethod.paymentCard.movieTic
 /**
  * 興行オファー検索
  */
-export declare function searchEventTicketOffers(params: {
+declare function searchEventTicketOffers(params: {
     /**
      * どのイベントに対して
      */
@@ -73,4 +73,4 @@ export declare function searchEventTicketOffers(params: {
         kbnEisyahousiki: string;
     };
 }): ISearchEventTicketOffersOperation<factory.product.ITicketOffer[]>;
-export {};
+export { searchEventTicketOffers };

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

@@ -20,8 +20,7 @@ function searchTransportationEventTicketOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        // const screeningEvent = await repos.event.findById<factory.eventType.Event>({ id: params.eventId });
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.eventId });
+        const screeningEvent = params.event;
         const soundFormatTypes = [];
         const videoFormatTypes = [];
         let availableOffers = [];
@@ -129,8 +128,9 @@ function searchScreeningEventTicketOffers(params) {
         var _a, _b, _c;
         // イベント取得属性最適化(2023-01-23~)
         // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.eventId });
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: params.eventId });
-        const superEvent = yield repos.event.findById({ id: screeningEvent.superEvent.id });
+        const screeningEvent = params.event;
+        // 取得属性最適化(2023-01-25~)
+        const superEvent = yield repos.event.findById({ id: screeningEvent.superEvent.id }, { soundFormat: 1, videoFormat: 1 });
         const soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
         const videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
         let availableOffers = [];
@@ -149,10 +149,6 @@ function searchScreeningEventTicketOffers(params) {
             throw new factory.errors.NotFound('event.offers.itemOffered.id');
         }
         const { soundFormatChargeSpecifications, videoFormatChargeSpecifications, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({ project: { id: screeningEvent.project.id }, soundFormatTypes, videoFormatTypes })(repos);
-        const screeningEventOfferSettings = screeningEvent.offers;
-        if (screeningEventOfferSettings === undefined) {
-            throw new factory.errors.NotFound('event.offers');
-        }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event: screeningEvent });
         // 不許可決済方法があれば、該当オファーを除外
         if (Array.isArray(unacceptedPaymentMethod) && unacceptedPaymentMethod.length > 0) {
@@ -204,7 +200,7 @@ function searchScreeningEventTicketOffers(params) {
         });
         let offers4event = availableOffers.map((availableOffer) => {
             return (0, factory_1.createCompoundPriceSpec4event)({
-                eligibleQuantity: screeningEventOfferSettings.eligibleQuantity,
+                eligibleQuantity: eventOffers.eligibleQuantity,
                 offer: availableOffer,
                 videoFormatChargeSpecifications,
                 soundFormatChargeSpecifications,
@@ -371,10 +367,10 @@ function searchEventTicketOffers(params) {
             default:
                 // Chevreで券種オファーを検索
                 if (event.typeOf === factory.eventType.ScreeningEvent) {
-                    offers = yield searchScreeningEventTicketOffers({ eventId: params.event.id })(repos);
+                    offers = yield searchScreeningEventTicketOffers({ event })(repos);
                 }
                 else if (event.typeOf === factory.eventType.Event) {
-                    offers = yield searchTransportationEventTicketOffers({ eventId: params.event.id })(repos);
+                    offers = yield searchTransportationEventTicketOffers({ event })(repos);
                 }
                 else {
                     throw new factory.errors.NotImplemented(`'${event.typeOf}' not implemented`);

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.283.0",
-    "@cinerino/sdk": "3.135.0",
+    "@cinerino/sdk": "3.136.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.29"
+  "version": "20.2.0-alpha.30"
 }