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

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/aggregation/event/aggregateScreeningEvent.js

@@ -81,7 +81,8 @@ function aggregateByEvent(params) {
         }
         const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
             branchCode: { $eq: event.location.branchCode },
-            containedInPlace: { id: { $eq: movieTheaterId } }
+            containedInPlace: { id: { $eq: movieTheaterId } },
+            useScreeningRoomType: settings_1.USE_READ_SCREENING_ROOM_TYPE
         });
         // 予約集計
         const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByEvent({

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

@@ -236,7 +236,7 @@ function searchEventSeatOffers(params) {
                     }
                 },
                 $projection: params.$projection
-            });
+            }, settings_1.USE_READ_SCREENING_ROOM_TYPE);
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
                     project: { id: params.event.project.id },

package/lib/chevre/service/event.js

@@ -21,6 +21,7 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 const offer_1 = require("./offer");
 const debug = createDebug('chevre-domain:service:event');
 const coaAuthClient = new COA.auth.RefreshToken({
@@ -120,7 +121,7 @@ function importFromCOA(params) {
             }
             const screeningRooms = yield repos.place.searchScreeningRooms({
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
-            });
+            }, settings_1.USE_READ_SCREENING_ROOM_TYPE);
             const targetImportFrom = moment(`${moment(params.importFrom)
                 .tz('Asia/Tokyo')
                 .format('YYYY-MM-DD')}T00:00:00+09:00`);

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/service/offer.js

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

package/lib/chevre/service/task/onResourceUpdated.js

@@ -252,11 +252,6 @@ function createInformMovieTheaterTasks(params) {
             'telephone',
             'url',
             'typeOf'
-            // 'containsPlace.branchCode',
-            // 'containsPlace.name',
-            // 'containsPlace.typeOf',
-            // 'containsPlace.additionalProperty',
-            // 'containsPlace.address'
         ], []);
         const movieTheater = movieTheaters.shift();
         if (movieTheater === undefined) {
@@ -265,7 +260,7 @@ function createInformMovieTheaterTasks(params) {
         // ルームを検索
         const screeningRooms = yield repos.place.searchScreeningRooms({
             containedInPlace: { id: { $eq: movieTheater.id } }
-        });
+        }, settings_1.USE_READ_SCREENING_ROOM_TYPE);
         const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
                     return {
                         branchCode: room.branchCode,

package/lib/chevre/settings.d.ts

@@ -41,6 +41,8 @@ export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
 export declare const USE_NEW_STOCK_HOLDER_REPO_FROM: moment.Moment;
 export declare const USE_NEW_STOCK_HOLDER_REPO_IDS: string[];
+export declare const USE_READ_SCREENING_ROOM_TYPE: boolean;
+export declare const USE_WRITE_SCREENING_ROOM_TYPE: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_STOCK_HOLDER_REPO_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_WRITE_SCREENING_ROOM_TYPE = exports.USE_READ_SCREENING_ROOM_TYPE = exports.USE_NEW_STOCK_HOLDER_REPO_IDS = exports.USE_NEW_STOCK_HOLDER_REPO_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -71,6 +71,8 @@ exports.USE_NEW_STOCK_HOLDER_REPO_FROM = (typeof process.env.USE_NEW_STOCK_HOLDE
 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(' ')
     : [];
+exports.USE_READ_SCREENING_ROOM_TYPE = process.env.USE_READ_SCREENING_ROOM_TYPE === '1';
+exports.USE_WRITE_SCREENING_ROOM_TYPE = process.env.USE_WRITE_SCREENING_ROOM_TYPE === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

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