@chevre/domain 21.2.0-alpha.133 → 21.2.0-alpha.135

package/example/src/chevre/searchHoldReservations.ts

@@ -6,7 +6,7 @@ import * as redis from 'redis';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
     const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
         socket: {
             host: process.env.REDIS_HOST,

package/lib/chevre/repo/mongoose/schemas/holdReservation.js

@@ -60,6 +60,7 @@ schema.index({ 'reservationFor.startDate': -1 }, { name: 'searchByReservationFor
 schema.index({ 'reservationFor.id': 1 }, { name: 'uniqueReservationForId', unique: true });
 schema.index({ 'reservationFor.id': 1, 'reservationFor.startDate': -1 }, { name: 'searchByReservationForId' });
 schema.index({ 'project.id': 1, 'reservationFor.startDate': -1 }, { name: 'searchByProjectId' });
+schema.index({ reservationCount: 1, 'reservationFor.startDate': -1 }, { name: 'searchByReservationCount' });
 schema.index({ 'reservations.reservationNumber': 1, 'reservationFor.startDate': -1 }, {
     name: 'searchByReservationNumber',
     partialFilterExpression: {

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

@@ -48,17 +48,11 @@ export declare class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions & {
-        $projection?: {
-            [key: string]: 0;
-        };
-    }): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
+    searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions & {}, inclusion: string[], exclusion: string[]): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
     /**
      * 施設取得
+     * 廃止(2023-06-22~)
      */
-    findById(params: {
-        id: string;
-    }, inclusion: string[], exclusion: string[]): Promise<factory.place.movieTheater.IPlace>;
     deleteMovieTheaterById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/place.js

@@ -277,34 +277,12 @@ class MongoRepository {
     /**
      * 施設検索
      */
-    searchMovieTheaters(params) {
+    searchMovieTheaters(params, 
+    // projection明示指定化(2023-06-22~)
+    inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
-            // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
-            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0, containsPlace: 0 }, params.$projection));
-            if (typeof params.limit === 'number' && params.limit > 0) {
-                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                query.limit(params.limit)
-                    .skip(params.limit * (page - 1));
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
-                query.sort({ branchCode: params.sort.branchCode });
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
-        });
-    }
-    /**
-     * 施設取得
-     */
-    findById(params, 
-    // projection?: any
-    inclusion, exclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
             let projection = {};
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
@@ -315,7 +293,9 @@ class MongoRepository {
                 projection = {
                     __v: 0,
                     createdAt: 0,
-                    updatedAt: 0
+                    updatedAt: 0,
+                    // containsPlaceを含めるとデータサイズが大きくなるので、検索結果には含めない
+                    containsPlace: 0
                 };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
                     exclusion.forEach((field) => {
@@ -323,17 +303,61 @@ class MongoRepository {
                     });
                 }
             }
-            const doc = yield this.placeModel.findOne({
-                typeOf: { $eq: factory.placeType.MovieTheater },
-                _id: { $eq: params.id }
-            }, projection)
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.placeModel.modelName);
+            const query = this.placeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
             }
-            return doc.toObject();
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
+                query.sort({ branchCode: params.sort.branchCode });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    /**
+     * 施設取得
+     * 廃止(2023-06-22~)
+     */
+    // public async findById(
+    //     params: { id: string },
+    //     inclusion: string[],
+    //     exclusion: string[]
+    // ): Promise<factory.place.movieTheater.IPlace> {
+    //     let projection: { [key: string]: number } = {};
+    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
+    //         inclusion.forEach((field) => {
+    //             projection[field] = 1;
+    //         });
+    //     } else {
+    //         projection = {
+    //             __v: 0,
+    //             createdAt: 0,
+    //             updatedAt: 0
+    //         };
+    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
+    //             exclusion.forEach((field) => {
+    //                 projection[field] = 0;
+    //             });
+    //         }
+    //     }
+    //     const doc = await this.placeModel.findOne(
+    //         {
+    //             typeOf: { $eq: factory.placeType.MovieTheater },
+    //             _id: { $eq: params.id }
+    //         },
+    //         projection
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(this.placeModel.modelName);
+    //     }
+    //     return doc.toObject();
+    // }
     deleteMovieTheaterById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({

package/lib/chevre/repo/stockHolder.js

@@ -118,7 +118,7 @@ class StockHolderRepository {
                 }
                 yield this.checkIfConflicted({ key: '', eventId: lockKey.eventId, useMongoose });
                 // reservationCount<=nであれば$push+$incする
-                yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
+                const { id } = yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
                 const addedReservationCount = lockKey.offers.length;
                 const reservationCountLte = maximum - addedReservationCount;
                 const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, lockKey.hasTicketedSeat));
@@ -128,8 +128,9 @@ class StockHolderRepository {
                     subReservation: subReservations
                 };
                 yield this.holdReservationModel.findOneAndUpdate({
+                    _id: { $eq: id },
                     reservationCount: { $lte: reservationCountLte },
-                    'reservationFor.id': { $eq: lockKey.eventId },
+                    // 'reservationFor.id': { $eq: lockKey.eventId },
                     // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
                     'reservations.subReservation.identifier': {
                         $nin: subReservations.map((r) => r.identifier)
@@ -177,7 +178,7 @@ class StockHolderRepository {
             const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             yield this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
             if (useMongoose) {
-                yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
+                const { id } = yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
                 const addedReservationCount = lockKey.offers.length;
                 const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, lockKey.hasTicketedSeat));
                 const reservationPackage = {
@@ -186,7 +187,8 @@ class StockHolderRepository {
                     subReservation: subReservations
                 };
                 yield this.holdReservationModel.findOneAndUpdate({
-                    'reservationFor.id': { $eq: lockKey.eventId },
+                    _id: { $eq: id },
+                    // 'reservationFor.id': { $eq: lockKey.eventId },
                     // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
                     'reservations.subReservation.identifier': {
                         $nin: subReservations.map((r) => r.identifier)
@@ -727,11 +729,13 @@ class StockHolderRepository {
                 },
                 reservations: []
             };
-            const initializedResult = yield this.holdReservationModel.updateOne({ 'reservationFor.id': { $eq: params.eventId } }, {
+            const initializedResult = yield this.holdReservationModel.findOneAndUpdate({ 'reservationFor.id': { $eq: params.eventId } }, {
                 $setOnInsert: aggregateReservation
-            }, { upsert: true })
+            }, { new: true, upsert: true })
+                .select({ _id: 1 })
                 .exec();
             debug('holdReservation initialized', initializedResult, params.eventId);
+            return { id: initializedResult.id };
         });
     }
 }

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

@@ -59,15 +59,15 @@ function findEntranceGates(params) {
             const searchMovieTheatersResult = yield repos.place.searchMovieTheaters({
                 limit: 1,
                 page: 1,
-                id: { $eq: params.event.superEvent.location.id },
-                $projection: {
-                    containsPlace: 0,
-                    hasPOS: 0,
-                    offers: 0,
-                    parentOrganization: 0,
-                    name: 0
-                }
-            });
+                id: { $eq: params.event.superEvent.location.id }
+                // $projection: {
+                //     containsPlace: 0,
+                //     hasPOS: 0,
+                //     offers: 0,
+                //     parentOrganization: 0,
+                //     name: 0
+                // }
+            }, ['hasEntranceGate'], []);
             movieTheater = searchMovieTheatersResult.shift();
             // movieTheater = await repos.place.findById(
             //     { id: params.event.superEvent.location.id },

package/lib/chevre/service/task/onResourceUpdated.js

@@ -231,7 +231,12 @@ function createInformMovieTheaterTasks(params) {
         if (params.ids.length !== 1) {
             throw new factory.errors.Argument('id', 'id.length must be 1');
         }
-        const movieTheater = yield repos.place.findById({ id: params.ids[0] }, [
+        const movieTheaters = yield repos.place.searchMovieTheaters({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.project.id } },
+            id: { $eq: params.ids[0] }
+        }, [
             'additionalProperty',
             'branchCode',
             'hasEntranceGate',
@@ -249,8 +254,9 @@ function createInformMovieTheaterTasks(params) {
             // 'containsPlace.additionalProperty',
             // 'containsPlace.address'
         ], []);
-        if (movieTheater.project.id !== params.project.id) {
-            throw new factory.errors.Argument('project.id', 'project.id not matched');
+        const movieTheater = movieTheaters.shift();
+        if (movieTheater === undefined) {
+            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
         // ルームを検索
         const screeningRooms = yield repos.place.searchScreeningRooms({

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.133"
+  "version": "21.2.0-alpha.135"
 }