@chevre/domain 21.13.0-alpha.11 → 21.13.0-alpha.12

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

@@ -22,10 +22,11 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import type { AnyExpression, 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' | 'seatCount' | 'parentOrganization'>;
+export type IKeyOfSearchSeatsProjection = 'typeOf' | 'branchCode' | 'name' | 'seatingType' | 'additionalProperty' | 'containedInPlace.containedInPlace';
 /**
  * 施設リポジトリ
  */
@@ -34,6 +35,11 @@ export declare class MongoRepository {
     constructor(connection: Connection);
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params: factory.place.busStop.ISearchConditions): any[];
     static CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params: factory.place.movieTheater.ISearchConditions): any[];
+    static CREATE_SEARCH_SEATS_PROJECTION(params: {
+        [key in IKeyOfSearchSeatsProjection]?: 0;
+    }): {
+        [field: string]: AnyExpression;
+    };
     /**
      * 施設を保管する
      */
@@ -242,7 +248,11 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
+    searchSeats(params: Omit<factory.place.seat.ISearchConditions, '$projection'> & {
+        $projection: {
+            [key in IKeyOfSearchSeatsProjection]?: 0;
+        };
+    }): Promise<factory.place.seat.IPlace[]>;
     deleteSeat(seat: {
         project: {
             id: string;

package/lib/chevre/repo/place.js

@@ -209,6 +209,43 @@ class MongoRepository {
         }
         return andConditions;
     }
+    static CREATE_SEARCH_SEATS_PROJECTION(params) {
+        let includeScreeningRooms = true;
+        if (params['containedInPlace.containedInPlace'] === 0) {
+            includeScreeningRooms = false;
+        }
+        const projectStage = {
+            _id: 0,
+            typeOf: '$containsPlace.containsPlace.typeOf',
+            branchCode: '$containsPlace.containsPlace.branchCode',
+            name: '$containsPlace.containsPlace.name',
+            seatingType: '$containsPlace.containsPlace.seatingType',
+            containedInPlace: Object.assign({ typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name' }, (includeScreeningRooms)
+                ? {
+                    containedInPlace: {
+                        typeOf: '$typeOf',
+                        branchCode: '$branchCode',
+                        name: '$name',
+                        containedInPlace: {
+                            id: '$containedInPlace.id',
+                            typeOf: '$containedInPlace.typeOf',
+                            branchCode: '$containedInPlace.branchCode',
+                            name: '$containedInPlace.name'
+                        }
+                    }
+                }
+                : undefined),
+            additionalProperty: '$containsPlace.containsPlace.additionalProperty'
+        };
+        Object.keys(params)
+            .forEach((field) => {
+            if (typeof projectStage[field] === 'string') {
+                // tslint:disable-next-line:no-dynamic-delete
+                delete projectStage[field];
+            }
+        });
+        return projectStage;
+    }
     /**
      * 施設を保管する
      */
@@ -1193,11 +1230,6 @@ class MongoRepository {
                     }
                 });
             }
-            let includeScreeningRooms = true;
-            if (params.$projection !== undefined && params.$projection !== null
-                && params.$projection['containedInPlace.containedInPlace'] === 0) {
-                includeScreeningRooms = false;
-            }
             const additionalPropertyElemMatch = (_o = params.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
@@ -1209,36 +1241,12 @@ class MongoRepository {
                     }
                 });
             }
+            const projectStage = MongoRepository.CREATE_SEARCH_SEATS_PROJECTION(Object.assign({}, params.$projection));
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
                 { $unwind: '$containsPlace.containsPlace' },
-                // { $unwind: '$containsPlace.containsPlace.containsPlace' },
                 ...matchStages,
-                {
-                    $project: {
-                        _id: 0,
-                        typeOf: '$containsPlace.containsPlace.typeOf',
-                        branchCode: '$containsPlace.containsPlace.branchCode',
-                        name: '$containsPlace.containsPlace.name',
-                        seatingType: '$containsPlace.containsPlace.seatingType',
-                        containedInPlace: Object.assign({ typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name' }, (includeScreeningRooms)
-                            ? {
-                                containedInPlace: {
-                                    typeOf: '$typeOf',
-                                    branchCode: '$branchCode',
-                                    name: '$name',
-                                    containedInPlace: {
-                                        id: '$containedInPlace.id',
-                                        typeOf: '$containedInPlace.typeOf',
-                                        branchCode: '$containedInPlace.branchCode',
-                                        name: '$containedInPlace.name'
-                                    }
-                                }
-                            }
-                            : undefined),
-                        additionalProperty: '$containsPlace.containsPlace.additionalProperty'
-                    }
-                }
+                { $project: projectStage }
             ]);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

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

@@ -223,7 +223,7 @@ function searchEventSeatOffers(params) {
                         }
                     }
                 },
-                $projection: params.$projection
+                $projection: Object.assign({}, params.$projection)
             });
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({

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

@@ -1,5 +1,5 @@
 import type { MongoRepository as EventRepo } from '../repo/event';
-import type { MongoRepository as PlaceRepo } from '../repo/place';
+import type { IKeyOfSearchSeatsProjection, MongoRepository as PlaceRepo } from '../repo/place';
 import type { MongoRepository as PriceSpecificationRepo } from '../repo/priceSpecification';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { StockHolderRepository as StockHolderRepo } from '../repo/stockHolder';
@@ -39,14 +39,14 @@ export declare function searchEventSeatOffersWithPaging(params: {
         id: string;
     };
     $projection?: {
-        [key: string]: number;
+        [key in IKeyOfSearchSeatsProjection]?: 0;
     };
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
     stockHolder: StockHolderRepo;
     place: PlaceRepo;
-}) => Promise<factory.place.seat.IPlaceWithOffer[]>;
+}) => Promise<Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf'>[]>;
 /**
  * イベント変更時処理
  */

package/lib/chevre/service/offer.js

@@ -88,7 +88,7 @@ function searchEventSeatOffersWithPaging(params) {
                             branchCode: { $eq: movieTheaterBranchCode }
                         }
                     }
-                } }));
+                }, $projection: Object.assign({}, params.$projection) }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
                     project: { id: event.project.id },

package/package.json

@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.13.0-alpha.11"
+  "version": "21.13.0-alpha.12"
 }