rez_core 2.0.60 → 2.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.0.60",
+  "version": "2.0.62",
   "description": "",
   "author": "",
   "private": false,

package/src/module/filter/controller/filter.controller.ts

@@ -7,9 +7,12 @@ import {
   Get,
   Param,
   Inject,
+  UseGuards,
+  Req,
 } from '@nestjs/common';
 import { FilterService } from '../service/filter.service';
 import { SavedFilterService } from '../service/saved-filter.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
 @Controller('filter')
 export class FilterController {
@@ -20,11 +23,14 @@ export class FilterController {
   ) {}
 
   @Post()
+  @UseGuards(JwtAuthGuard)
   async applyFilter(
     @Body() body: any,
     @Query('page', ParseIntPipe) page: number = 1,
     @Query('size', ParseIntPipe) size: number = 10,
+    @Req() req: Request & { user: any },
   ) {
+    const userData = req.user.userData;
     const {
       entity_type,
       quickFilter,
@@ -43,6 +49,8 @@ export class FilterController {
       sortby,
       page,
       size,
+      level_type: userData.level_type,
+      level_id: userData.level_id,
     });
   }
 

package/src/module/filter/dto/filter-request.dto.ts

@@ -23,4 +23,6 @@ export interface FilterRequestDto {
   tabs?: TabsConfig;
   page?: number;
   size?: number;
+  level_type?: string | null;
+  level_id?: string | null;
 }

package/src/module/filter/service/filter.service.ts

@@ -76,6 +76,8 @@ export class FilterService {
       attributeFilter,
       tabs,
       sortby,
+      level_type,
+      level_id,
     } = dto;
 
     // Fetch meta

package/src/module/meta/service/entity-service-impl.service.ts

@@ -82,6 +82,9 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         entityData.organization_id = loggedInUser.organization_id;
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
+      if (!entityData.level_type)
+        entityData.level_type = loggedInUser.level_type;
+      if (!entityData.level_id) entityData.level_id = loggedInUser.level_id;
     }
 
     return repo.save(entityData);

package/src/module/user/service/login.service.ts

@@ -87,14 +87,10 @@ export class LoginService {
       await this.userService.setDefaultLastAccess(user.id, appcode);
     }
 
-    const token = await this.userSessionService.createSession(
-      user,
-      appcode,
-      {
-        level_type: defaultAccess.level_type,
-        level_id: defaultAccess.level_id,
-      },
-    );
+    const token = await this.userSessionService.createSession(user, appcode, {
+      level_type: defaultAccess.level_type,
+      level_id: defaultAccess.level_id,
+    });
 
     if (user.is_firstlogin === 1) {
       user.invitation_status = 'ACCEPTED';
@@ -107,6 +103,8 @@ export class LoginService {
       success: true,
       accessToken: token,
       appcode,
+      level_type: defaultAccess.level_type,
+      level_id: defaultAccess.level_id,
     };
   }
 

package/src/module/user/service/user-session.service.ts

@@ -67,24 +67,15 @@ export class UserSessionService {
   async switchCurrentLevelService(
     currentUser: any,
     data: any,
-  ): Promise<{ success: boolean; access_token: string; appcode: string }> {
+  ): Promise<{
+    success: boolean;
+    access_token: string;
+    appcode: string;
+    level_type: string;
+    level_id: string;
+  }> {
     let payload;
 
-    // Step 1: App-level access check
-    // if (data.appcode) {
-    //   console.log('in appcode check', data.appcode);
-
-    //   const userApp = await this.userRoleMappingService.getUserByIdAndAppCode(
-    //     userId,
-    //     data.appcode,
-    //   );
-
-    //   if (!userApp) {
-    //     throw new BadRequestException(
-    //       'User does not have access to this appcode',
-    //     );
-    //   }
-
     payload = {
       ...currentUser,
       level_id: data.level_id,
@@ -97,97 +88,12 @@ export class UserSessionService {
       [data.appcode, currentUser.id],
     );
 
-    // }
-
-    // Step 2: Level switch logic
-    // if (data.level_id && data.level_type) {
-    // console.log(
-    //   'in level_id and level_type check',
-    //   data.level_id,
-    //   data.level_type,
-    // );
-
-    // console.log(
-    //   'Current User Level Type:',
-    //   currentUserLevelType,
-    //   'Current User Level ID:',
-    //   currentUserLevelId,
-    // );
-
-    // const hasAccess = await this.dataSource.query(
-    //   'SELECT * FROM cr_user_role_mapping WHERE user_id = ? AND level_type = ? AND level_id = ? AND appcode = ?',
-    //   [userId, data.level_type, data.level_id, data.appcode || null],
-    // );
-
-    // console.log('Has Access:', hasAccess);
-
-    // // check if hasAccess is non-empty
-    // if (hasAccess.length) {
-    //   payload = {
-    //     id: userId,
-    //     level_id: data.level_id,
-    //     level_type: data.level_type,
-    //     appcode: data.appcode || null,
-    //   };
-    // }
-    // } else if (currentUserLevelType === 'ORG') {
-    //   const school = await this.dataSource.query(
-    //     'SELECT * FROM cr_school WHERE id = ?',
-    //     [data.level_id],
-    //   );
-
-    //   console.log('Current User Org ID:', currentUserOrgId);
-    //   console.log('Data Level Type:', data.level_type);
-    //   console.log('School:', school);
-
-    //   if (!school.length || currentUserOrgId !== school[0].organization_id) {
-    //     throw new BadRequestException(
-    //       'You do not have access to this school',
-    //     );
-    //   }
-
-    //   payload = {
-    //     id: userId,
-    //     level_id: data.level_id,
-    //     level_type: data.level_type,
-    //     appcode: data.appcode || null,
-    //   };
-    // } else if (currentUserLevelType === 'BRN') {
-    //   console.log('Current User Level Type is BRN');
-
-    //   const school = await this.dataSource.query(
-    //     'SELECT * FROM cr_school WHERE id = ?',
-    //     [data.level_id],
-    //   );
-
-    //   console.log('school:', school);
-
-    //   if (!school.length || school[0].brand_id !== currentUserLevelId) {
-    //     throw new BadRequestException(
-    //       'You do not have access to this school',
-    //     );
-    //   }
-
-    //   payload = {
-    //     id: userId,
-    //     level_id: data.level_id,
-    //     level_type: data.level_type,
-    //     appcode: data.appcode || null,
-    //   };
-    // }
-    // else {
-    //   throw new BadRequestException('You do not have access to this level');
-    // }
-    // }
-
-    // if (!payload) {
-    //   throw new BadRequestException('Invalid request parameters');
-    // }
-
     return {
       success: true,
       access_token: this.jwtAuthService.generateJwt(payload),
       appcode: data.appcode,
+      level_type: data.level_type,
+      level_id: data.level_id,
     };
   }
 }