@chevre/domain 21.2.0-alpha.143 → 21.2.0-alpha.144

package/example/src/chevre/searchScreeningRooms.ts

@@ -6,16 +6,27 @@ import { chevre } from '../../../lib/index';
 // const PROJECT_ID = String(process.env.PROJECT_ID);
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const placeRepo = new chevre.repository.Place(mongoose.connection);
 
-    const rooms = await placeRepo.searchScreeningRooms({
-        $projection: { sectionCount: 1 }
-    });
+    const rooms = await placeRepo.searchScreeningRooms(
+        {
+            limit: 10,
+            page: 1,
+            $projection: { sectionCount: 1 }
+        },
+        true
+    );
     console.log('place found', rooms);
     const filteredRooms = rooms.filter((room) => typeof room.sectionCount === 'number' && room.sectionCount > 1);
     console.log(filteredRooms.length, 'filteredRooms found');
+
+    const screeningRoom = await placeRepo.findScreeningRoomsByBranchCode({
+        branchCode: { $eq: rooms[0].branchCode },
+        containedInPlace: { id: { $eq: String(rooms[0].containedInPlace?.id) } }
+    });
+    console.log('screeningRoom found', screeningRoom);
 }
 
 main()

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

@@ -25,7 +25,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
-export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace'>;
+export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount'>;
 /**
  * 施設リポジトリ
  */
@@ -89,6 +89,17 @@ export declare class MongoRepository {
         id: string;
         typeOf: factory.placeType.MovieTheater;
     }>;
+    deleteScreeningRoomsByMovieTheaterId(params: {
+        project: {
+            id: string;
+        };
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+    }): Promise<void>;
     createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace): Promise<{
         /**
          * 施設ID

package/lib/chevre/repo/place.js

@@ -519,6 +519,16 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    deleteScreeningRoomsByMovieTheaterId(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.placeModel.deleteMany({
+                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                'project.id': { $eq: params.project.id },
+                'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id }
+            })
+                .exec();
+        });
+    }
     createScreeningRoomSection(screeningRoomSection) {
         return __awaiter(this, void 0, void 0, function* () {
             const screeningRoom = screeningRoomSection.containedInPlace;
@@ -844,7 +854,8 @@ class MongoRepository {
                                 branchCode: '$containsPlace.branchCode',
                                 name: '$containsPlace.name',
                                 containedInPlace: {
-                                    id: '$_id',
+                                    id: { $toString: '$_id' },
+                                    // id: '$_id',
                                     typeOf: '$typeOf',
                                     branchCode: '$branchCode',
                                     name: '$name'
@@ -1013,6 +1024,7 @@ class MongoRepository {
                     });
                 }
                 const aggregate = this.placeModel.aggregate([
+                    { $sort: { branchCode: factory.sortType.Ascending } },
                     // { $unwind: '$containsPlace' },
                     ...matchStages,
                     {
@@ -1167,7 +1179,8 @@ class MongoRepository {
                     ...matchStages,
                     {
                         $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', address: '$containsPlace.address', containedInPlace: {
-                                id: '$_id',
+                                id: { $toString: '$_id' },
+                                // id: '$_id',
                                 typeOf: '$typeOf',
                                 branchCode: '$branchCode',
                                 name: '$name'
@@ -1232,16 +1245,21 @@ class MongoRepository {
                         typeOf: '$containsPlace.typeOf',
                         branchCode: '$containsPlace.branchCode',
                         name: '$containsPlace.name',
-                        // address: '$containsPlace.address',
-                        // containedInPlace: {
-                        //     id: '$_id',
-                        //     typeOf: '$typeOf',
-                        //     branchCode: '$branchCode',
-                        //     name: '$name'
-                        // },
-                        // openSeatingAllowed: '$containsPlace.openSeatingAllowed',
-                        // additionalProperty: '$containsPlace.additionalProperty',
-                        containsPlace: '$containsPlace.containsPlace'
+                        containsPlace: '$containsPlace.containsPlace',
+                        seatCount: {
+                            $sum: {
+                                $map: {
+                                    input: '$containsPlace.containsPlace',
+                                    in: {
+                                        $cond: {
+                                            if: { $isArray: '$$this.containsPlace' },
+                                            then: { $size: '$$this.containsPlace' },
+                                            else: 0
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             ]);
@@ -1717,7 +1735,8 @@ class MongoRepository {
                                         branchCode: '$containsPlace.branchCode',
                                         name: '$containsPlace.name',
                                         containedInPlace: {
-                                            id: '$_id',
+                                            id: { $toString: '$_id' },
+                                            // id: '$_id',
                                             typeOf: '$typeOf',
                                             branchCode: '$branchCode',
                                             name: '$name'

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

@@ -87,7 +87,7 @@ function aggregateByEvent(params) {
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({
             aggregateDate: now,
             event: event,
-            screeningRoom: screeningRoom
+            screeningRoom
         })(repos);
         // オファーごとの集計
         let aggregateOffer;
@@ -429,10 +429,15 @@ function aggregateReservationByEvent(params) {
         }
         const hasTicketedSeat = reservedSeatsAvailable({ event: params.event });
         if (hasTicketedSeat) {
-            const screeningRoomSeatCount = (Array.isArray(params.screeningRoom.containsPlace))
-                // b.containsPlaceがundefinedの場合があるので注意(座席未登録)
-                ? params.screeningRoom.containsPlace.reduce((a, b) => a + ((Array.isArray(b.containsPlace)) ? b.containsPlace.length : 0), 0)
-                : 0;
+            // seatCountを利用する(2023-06-24~)
+            const screeningRoomSeatCount = (typeof params.screeningRoom.seatCount === 'number') ? params.screeningRoom.seatCount : 0;
+            // const screeningRoomSeatCount = (Array.isArray(params.screeningRoom.containsPlace))
+            //     // b.containsPlaceがundefinedの場合があるので注意(座席未登録)
+            //     ? params.screeningRoom.containsPlace.reduce(
+            //         (a, b) => a + ((Array.isArray(b.containsPlace)) ? b.containsPlace.length : 0),
+            //         0
+            //     )
+            //     : 0;
             maximumAttendeeCapacity = screeningRoomSeatCount;
             // イベントのキャパシティ設定がスクリーン座席数より小さければmaximumAttendeeCapacityを上書き
             if (typeof eventLocationMaximumAttendeeCapacity === 'number' && eventLocationMaximumAttendeeCapacity < screeningRoomSeatCount) {

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.143"
+  "version": "21.2.0-alpha.144"
 }