@chevre/domain 28.0.0-alpha.6 → 28.0.0-alpha.7

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

@@ -84,7 +84,23 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<mongo.DeleteResult>;
-    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    projectRoomFields(params: Pick<factory.place.screeningRoom.ISearchConditions, '$projection' | 'branchCode' | 'containedInPlace' | 'parentOrganization'> & {
+        /**
+         * プロジェクト指定は必須
+         */
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        limit: number;
+        page: number;
+    }): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'containedInPlace' | 'maximumAttendeeCapacity' | 'name' | 'openSeatingAllowed' | 'typeOf' | 'seatCount' | 'sectionCount'>[]>;
     findRooms(params: Omit<factory.place.screeningRoom.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed' | 'maximumAttendeeCapacity'>[]>;
     /**
      * セクションと座席も含めたひとつのルームを取得する

package/lib/chevre/repo/place/screeningRoom.js

@@ -379,10 +379,14 @@ class ScreeningRoomRepo {
         })
             .exec();
     }
-    async searchScreeningRooms(searchConditions) {
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    async projectRoomFields(params) {
         const aggregate = this.placeModel.aggregate([
-            { $sort: { branchCode: factory_1.factory.sortType.Ascending } },
-            ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(searchConditions),
+            ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(params),
             {
                 $project: {
                     _id: 0,
@@ -399,7 +403,7 @@ class ScreeningRoomRepo {
                     openSeatingAllowed: '$openSeatingAllowed',
                     additionalProperty: '$additionalProperty',
                     maximumAttendeeCapacity: '$maximumAttendeeCapacity',
-                    ...(searchConditions.$projection?.sectionCount === 1)
+                    ...(params.$projection?.sectionCount === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -410,7 +414,7 @@ class ScreeningRoomRepo {
                             }
                         }
                         : undefined,
-                    ...(searchConditions.$projection?.seatCount === 1)
+                    ...(params.$projection?.seatCount === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -429,14 +433,16 @@ class ScreeningRoomRepo {
                         }
                         : undefined
                 }
-            }
+            },
+            { $sort: { branchCode: factory_1.factory.sortType.Ascending } }
         ]);
-        /* istanbul ignore else */
-        if (typeof searchConditions.limit === 'number' && searchConditions.limit > 0) {
-            const page = (typeof searchConditions.page === 'number' && searchConditions.page > 0) ? searchConditions.page : 1;
-            aggregate.limit(searchConditions.limit * page)
-                .skip(searchConditions.limit * (page - 1));
+        const { limit, page } = params;
+        if (typeof limit !== 'number' || limit === 0) {
+            throw new factory_1.factory.errors.ArgumentNull('limit', 'must be number > 0');
         }
+        const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+        aggregate.skip(limit * (pageMustBePositive - 1))
+            .limit(limit);
         return aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.6"
+  "version": "28.0.0-alpha.7"
 }