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

package/example/src/chevre/findScreeningRoomsByBranchCode.ts

@@ -8,7 +8,7 @@ async function main() {
 
     const placeRepo = new chevre.repository.Place(mongoose.connection);
 
-    const event = await placeRepo.findScreeningRoomsByBranchCode({
+    const screeningRoom = await placeRepo.findScreeningRoomsByBranchCode({
         branchCode: {
             $eq: '20'
         },
@@ -16,9 +16,10 @@ async function main() {
             id: {
                 $eq: '5bfb841d5a78d7948369979a'
             }
-        }
+        },
+        useScreeningRoomType: true
     });
-    console.log('room found', event);
+    console.log('room found', screeningRoom);
 
 }
 

package/example/src/chevre/searchPermissions.ts

@@ -0,0 +1,54 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+const memberId = 'xxx';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const memberRepo = new chevre.repository.Member(mongoose.connection);
+    const roleRepo = new chevre.repository.Role(mongoose.connection);
+
+    let now: Date;
+
+    // let now = new Date();
+    // const aggregateRoleNamesResult = await memberRepo.aggregateRoleNames({
+    //     project: { id: { $eq: PROJECT_ID } },
+    //     member: { id: { $eq: memberId } }
+    // });
+
+    // const aggregatePermissionsResult = await roleRepo.aggregatePermissions({
+    //     roleName: {
+    //         $in: aggregateRoleNamesResult.map((r) => r.roleName)
+    //     }
+    // });
+    // console.log('time cost:', moment()
+    //     .diff(now));
+
+    now = new Date();
+    const searchPermissionsResult = await chevre.service.iam.searchPermissions({
+        project: { id: PROJECT_ID },
+        member: { id: memberId }
+    })({
+        member: memberRepo,
+        role: roleRepo
+    });
+    console.log('time cost:', moment()
+        .diff(now));
+
+    console.log(searchPermissionsResult);
+    console.log(searchPermissionsResult.permissions.length);
+
+    // console.log(aggregateRoleNamesResult);
+    // console.log(aggregateRoleNamesResult.length);
+    // console.log(aggregatePermissionsResult);
+    // console.log(aggregatePermissionsResult.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/searchScreeningRooms.ts

@@ -24,7 +24,8 @@ async function main() {
 
     const screeningRoom = await placeRepo.findScreeningRoomsByBranchCode({
         branchCode: { $eq: rooms[0].branchCode },
-        containedInPlace: { id: { $eq: String(rooms[0].containedInPlace?.id) } }
+        containedInPlace: { id: { $eq: String(rooms[0].containedInPlace?.id) } },
+        useScreeningRoomType: true
     });
     console.log('screeningRoom found', screeningRoom);
 }

package/example/src/chevre/syncScreeningRoomsAll.ts

@@ -30,7 +30,7 @@ async function main() {
             doc.toObject();
 
         console.log('syncing...', project.id, typeOf, id, name.ja, i);
-        // await placeRepo.syncScreeningRooms({ id });
+        await placeRepo.syncScreeningRooms({ id });
         console.log('synced.', project.id, typeOf, id, name.ja, i);
     });
 

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

@@ -9,6 +9,20 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): any[];
     count(params: factory.iam.ISearchConditions): Promise<number>;
     search(params: factory.iam.ISearchConditions): Promise<factory.iam.IMember[]>;
+    aggregateRoleNames(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        member: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<{
+        roleName: string;
+    }[]>;
     findById(params: {
         id: string;
     }): Promise<factory.iam.IMember>;

package/lib/chevre/repo/member.js

@@ -132,6 +132,33 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    aggregateRoleNames(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+                { $match: { 'project.id': { $eq: params.project.id.$eq } } },
+                { $match: { 'member.id': { $eq: params.member.id.$eq } } }
+            ];
+            const aggregate = this.memberModel.aggregate([
+                // ...(typeof params.sort?.productID === 'number')
+                //     ? [{ $sort: { productID: params.sort.productID } }]
+                //     : [],
+                ...matchStages,
+                {
+                    $unwind: {
+                        path: '$member.hasRole'
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        roleName: '$member.hasRole.roleName'
+                    }
+                }
+            ]);
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.memberModel.findOne({

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

@@ -50,7 +50,7 @@ export declare class MongoRepository {
     deleteMovieTheaterById(params: {
         id: string;
     }): Promise<void>;
-    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>): Promise<{
+    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
@@ -61,7 +61,7 @@ export declare class MongoRepository {
         containedInPlace: {
             branchCode: string;
         };
-    }, $unset: any): Promise<{
+    }, $unset: any, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
@@ -82,7 +82,7 @@ export declare class MongoRepository {
              */
             branchCode: string;
         };
-    }): Promise<{
+    }, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
@@ -100,7 +100,7 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace): Promise<{
+    createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
@@ -114,7 +114,7 @@ export declare class MongoRepository {
                 branchCode: string;
             };
         };
-    }, $unset: any): Promise<{
+    }, $unset: any, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
@@ -125,7 +125,7 @@ export declare class MongoRepository {
         $projection?: {
             [key: string]: number;
         };
-    }, useScreeningRoomType?: boolean): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
+    }, useScreeningRoomType: boolean): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
     deleteScreeningRoomSection(screeningRoomSection: {
         project: {
             id: string;
@@ -146,14 +146,14 @@ export declare class MongoRepository {
                 branchCode: string;
             };
         };
-    }): Promise<{
+    }, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
     }>;
-    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions, useScreeningRoomType?: boolean): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>[]>;
+    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions, useScreeningRoomType: boolean): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>[]>;
     findScreeningRoomsByBranchCode(params: {
         branchCode: {
             $eq: string;
@@ -163,8 +163,9 @@ export declare class MongoRepository {
                 $eq: string;
             };
         };
+        useScreeningRoomType: boolean;
     }): Promise<IScreeningRoomFoundByBranchCode>;
-    createSeat(seat: factory.place.seat.IPlace): Promise<{
+    createSeat(seat: factory.place.seat.IPlace, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
@@ -181,14 +182,14 @@ export declare class MongoRepository {
                 };
             };
         };
-    }, $unset: any): Promise<{
+    }, $unset: any, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
     }>;
-    searchSeats(params: factory.place.seat.ISearchConditions, useScreeningRoomType?: boolean): Promise<factory.place.seat.IPlace[]>;
+    searchSeats(params: factory.place.seat.ISearchConditions, useScreeningRoomType: boolean): Promise<factory.place.seat.IPlace[]>;
     deleteSeat(seat: {
         project: {
             id: string;
@@ -215,7 +216,7 @@ export declare class MongoRepository {
                 };
             };
         };
-    }): Promise<{
+    }, useScreeningRoomType?: boolean): Promise<{
         /**
          * 施設ID
          */