@chevre/domain 21.2.0-alpha.145 → 21.2.0-alpha.147

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/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,23 +50,39 @@ export declare class MongoRepository {
     deleteMovieTheaterById(params: {
         id: string;
     }): Promise<void>;
-    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>, useScreeningRoomType?: boolean): Promise<{
+    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace'> & {
+        containedInPlace: {
+            branchCode: string;
+        };
+    }, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        /**
+         * ルームID
+         */
+        id: string;
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace'> & {
         containedInPlace: {
             branchCode: string;
         };
-    }, $unset: any, useScreeningRoomType?: boolean): Promise<{
+    }, $unset: any, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        /**
+         * ルームコード
+         */
+        branchCode: string;
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     deleteScreeningRoom(screeningRoom: {
         project: {
@@ -82,12 +98,14 @@ export declare class MongoRepository {
              */
             branchCode: string;
         };
-    }, useScreeningRoomType?: boolean): Promise<{
+    }, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     deleteScreeningRoomsByMovieTheaterId(params: {
         project: {

package/lib/chevre/repo/place.js

@@ -416,24 +416,45 @@ class MongoRepository {
     }
     createScreeningRoom(screeningRoom, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+            // 施設存在確認
+            let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                'project.id': { $eq: screeningRoom.project.id },
+                branchCode: { $eq: screeningRoom.containedInPlace.branchCode }
+            }, { _id: 1, typeOf: 1, branchCode: 1, name: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            else {
-                // 施設存在確認
-                let doc = yield this.placeModel.findOne({
-                    typeOf: { $eq: factory.placeType.MovieTheater },
-                    'project.id': { $eq: screeningRoom.project.id },
-                    branchCode: screeningRoom.containedInPlace.branchCode
-                }, {
-                    _id: 1
-                })
+            if (useScreeningRoomType === true) {
+                const movieTheater = doc.toObject();
+                const creatingScreeningRoom = Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name, address: screeningRoom.address, additionalProperty: (Array.isArray(screeningRoom.additionalProperty)) ? screeningRoom.additionalProperty : [], containedInPlace: {
+                        id: movieTheater.id,
+                        typeOf: movieTheater.typeOf,
+                        branchCode: movieTheater.branchCode,
+                        name: movieTheater.name
+                    }, containsPlace: [], project: screeningRoom.project }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
+                    ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
+                    : undefined);
+                const upsertScreeningRoomResult = yield this.placeModel.updateOne({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: creatingScreeningRoom.project.id },
+                    'containedInPlace.id': { $exists: true, $eq: creatingScreeningRoom.containedInPlace.id },
+                    branchCode: { $eq: creatingScreeningRoom.branchCode }
+                }, 
+                // 既存であれば何もしない
+                { $setOnInsert: creatingScreeningRoom }, { upsert: true })
                     .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound('containedInPlace');
+                // 既存であればコード重複
+                if (upsertScreeningRoomResult.matchedCount > 0) {
+                    throw new factory.errors.AlreadyInUse(factory.placeType.ScreeningRoom, ['branchCode']);
                 }
+                return {
+                    id: upsertScreeningRoomResult.upsertedId.toString(),
+                    typeOf: factory.placeType.ScreeningRoom
+                };
+            }
+            else {
                 // ルームコードが存在しなければ追加する
                 doc = yield this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.MovieTheater },
@@ -454,7 +475,6 @@ class MongoRepository {
                     new: true,
                     projection: {
                         _id: 1,
-                        // 'project.id': 1,
                         branchCode: 1,
                         typeOf: 1
                     }
@@ -471,9 +491,36 @@ class MongoRepository {
     updateScreeningRoom(screeningRoom, $unset, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
             if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+                const doc = yield this.placeModel.findOneAndUpdate({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: screeningRoom.project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+                    branchCode: screeningRoom.branchCode
+                }, Object.assign(Object.assign(Object.assign(Object.assign({ name: screeningRoom.name }, (screeningRoom.address !== undefined && screeningRoom.address !== null)
+                    ? { address: screeningRoom.address }
+                    : undefined), (typeof screeningRoom.openSeatingAllowed === 'boolean')
+                    ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
+                    : undefined), (Array.isArray(screeningRoom.additionalProperty))
+                    ? { additionalProperty: screeningRoom.additionalProperty }
+                    : undefined), (($unset === null || $unset === void 0 ? void 0 : $unset['containsPlace.$[screeningRoom].openSeatingAllowed']) === 1
+                    || $unset.openSeatingAllowed === 1)
+                    ? {
+                        $unset: {
+                            openSeatingAllowed: 1
+                        }
+                    }
+                    : undefined), {
+                    new: true,
+                    projection: { _id: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+                }
+                return {
+                    branchCode: screeningRoom.branchCode,
+                    typeOf: factory.placeType.ScreeningRoom
+                };
             }
             else {
                 const doc = yield this.placeModel.findOneAndUpdate({
@@ -496,7 +543,6 @@ class MongoRepository {
                     ],
                     projection: {
                         _id: 1,
-                        // 'project.id': 1,
                         branchCode: 1,
                         typeOf: 1
                     }
@@ -512,9 +558,17 @@ class MongoRepository {
     deleteScreeningRoom(screeningRoom, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
             if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+                const doc = yield this.placeModel.findOneAndDelete({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: screeningRoom.project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+                    branchCode: screeningRoom.branchCode
+                }, { projection: { _id: 1 } })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+                }
+                return { typeOf: factory.placeType.ScreeningRoom };
             }
             else {
                 const doc = yield this.placeModel.findOneAndUpdate({
@@ -671,7 +725,7 @@ class MongoRepository {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         return __awaiter(this, void 0, void 0, function* () {
             if (useScreeningRoomType === true) {
-                const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoomSection } } }];
+                const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
                 const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
                 if (typeof projectIdEq === 'string') {
                     matchStages.push({
@@ -1270,8 +1324,6 @@ class MongoRepository {
     findScreeningRoomsByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
                 const matchStages = [
                     { $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } },
                     {

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

@@ -17,6 +17,13 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.iam.IRoleSearchConditions): any[];
     count(params: factory.iam.IRoleSearchConditions): Promise<number>;
     search(params: factory.iam.IRoleSearchConditions): Promise<IRole[]>;
+    aggregatePermissions(params: {
+        roleName: {
+            $in: string[];
+        };
+    }): Promise<{
+        _id: string;
+    }[]>;
     findById(params: {
         id: string;
     }): Promise<IRole>;

package/lib/chevre/repo/role.js

@@ -97,6 +97,42 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    aggregatePermissions(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+                { $match: { roleName: { $in: params.roleName.$in } } }
+            ];
+            const aggregate = this.roleModel.aggregate([
+                // ...(typeof params.sort?.productID === 'number')
+                //     ? [{ $sort: { productID: params.sort.productID } }]
+                //     : [],
+                ...matchStages,
+                {
+                    $unwind: {
+                        path: '$permissions'
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        permission: '$permissions'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$permission'
+                    }
+                }
+            ]);
+            // if (typeof params.limit === 'number' && params.limit > 0) {
+            //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            //     aggregate.limit(params.limit * page)
+            //         .skip(params.limit * (page - 1));
+            // }
+            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.roleModel.findOne({

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

@@ -18,6 +18,10 @@ export declare function searchPermissions(params: {
     member: MemberRepo;
     role: RoleRepo;
 }) => Promise<{
-    roleNames: string[];
-    permissions: IPermission[];
+    hasRole: {
+        roleName: string;
+    }[];
+    permissions: {
+        _id: string;
+    }[];
 }>;

package/lib/chevre/service/iam.js

@@ -16,18 +16,32 @@ exports.searchPermissions = void 0;
 function searchPermissions(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let permissions = [];
-        // プロジェクトメンバーを検索
-        const projectMembers = yield repos.member.search({
+        const hasRole = yield repos.member.aggregateRoleNames({
             project: { id: { $eq: params.project.id } },
             member: { id: { $eq: params.member.id } }
         });
-        // 持っているロールを検索
-        const roleNames = projectMembers.reduce((a, b) => [...a, ...(Array.isArray(b.member.hasRole)) ? b.member.hasRole.map((r) => r.roleName) : []], []);
-        const roles = yield repos.role.search({ roleName: { $in: roleNames } });
-        // 権限をまとめる
-        permissions = roles.reduce((a, b) => [...a, ...b.permissions], []);
-        permissions = [...new Set(permissions)];
-        return { roleNames, permissions };
+        if (hasRole.length > 0) {
+            permissions = yield repos.role.aggregatePermissions({ roleName: { $in: hasRole.map((r) => r.roleName) } });
+        }
+        return { hasRole, permissions };
+        // let permissions: IPermission[] = [];
+        // const projectMembers = await repos.member.search({
+        //     project: { id: { $eq: params.project.id } },
+        //     member: { id: { $eq: params.member.id } }
+        // });
+        // // 持っているロールを検索
+        // const roleNames = projectMembers.reduce<string[]>(
+        //     (a, b) => [...a, ...(Array.isArray(b.member.hasRole)) ? b.member.hasRole.map((r) => r.roleName) : []],
+        //     []
+        // );
+        // const roles = await repos.role.search({ roleName: { $in: roleNames } });
+        // // 権限をまとめる
+        // permissions = roles.reduce<string[]>(
+        //     (a, b) => [...a, ...b.permissions],
+        //     []
+        // );
+        // permissions = [...new Set(permissions)];
+        // return { roleNames, permissions };
     });
 }
 exports.searchPermissions = searchPermissions;

package/lib/chevre/settings.js

@@ -67,7 +67,7 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
     : moment('2023-08-31T15:00:00Z');
 exports.USE_NEW_STOCK_HOLDER_REPO_FROM = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_FROM === 'string')
     ? moment(process.env.USE_NEW_STOCK_HOLDER_REPO_FROM)
-    : moment('2023-11-30T15:00:00Z');
+    : moment('2024-11-30T15:00:00Z');
 exports.USE_NEW_STOCK_HOLDER_REPO_IDS = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
     : [];

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