rez_core 5.0.134 → 5.0.136

package/package.json

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

package/src/module/meta/controller/media.controller.ts

@@ -104,4 +104,32 @@ export class MediaController {
       body.parent_type,
     );
   }
+
+  // media.controller.ts
+  @Get('inline/:id')
+  async getInlineUrl(
+    @Param('id') id: number,
+    @Res() res: Response,
+    @Req() req: Request & { user: any },
+    @Query('expiresIn') expiresIn?: number,
+  ) {
+    const loggedInUser = req.user.userData;
+    try {
+      const inlineUrl = await this.mediaDataService.getMediaInlineUrl(
+        id,
+        loggedInUser,
+        expiresIn,
+      );
+      res.status(HttpStatus.OK).json({
+        message: 'Inline URL fetched successfully',
+        success: true,
+        data: { inlineUrl },
+      });
+    } catch (error) {
+      res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
+        message: error.message || 'Error fetching inline URL',
+        success: false,
+      });
+    }
+  }
 }

package/src/module/meta/service/media-data.service.ts

@@ -4,7 +4,10 @@ import { S3 } from 'aws-sdk';
 import axios from 'axios';
 import { EntityManager } from 'typeorm';
 import { v4 as uuidv4 } from 'uuid';
-import { ENTITYTYPE_MEDIA, STATUS_PENDING } from '../../../constant/global.constant';
+import {
+  ENTITYTYPE_MEDIA,
+  STATUS_PENDING,
+} from '../../../constant/global.constant';
 import { MediaData } from '../entity/media-data.entity';
 import { MediaDataRepository } from '../repository/media-data.repository';
 import { EntityServiceImpl } from './entity-service-impl.service';
@@ -154,7 +157,7 @@ export class MediaDataService extends EntityServiceImpl {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
         Expires: Number(expiresIn) || 60 * 5,
-        ResponseContentDisposition: 'inline'
+        ResponseContentDisposition: 'inline',
       });
       return {
         signedUrl,
@@ -168,6 +171,37 @@ export class MediaDataService extends EntityServiceImpl {
     }
   }
 
+  // media-data.service.ts
+  async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
+    try {
+      const entityData = await this.getEntityData(
+        ENTITYTYPE_MEDIA,
+        id,
+        loggedInUser,
+      );
+      const mediaData = entityData as MediaData;
+
+      if (!mediaData) {
+        throw new Error('Media not found');
+      }
+
+      const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
+        Bucket: this.bucketName,
+        Key: mediaData.media_url,
+        Expires: Number(expiresIn) || 60 * 5,
+        ResponseContentDisposition: 'inline',
+        ResponseContentType: this.getContentType(
+          mediaData.file_name.split('.').pop() || '',
+        ),
+      });
+
+      return signedUrl;
+    } catch (error) {
+      console.error('Error generating inline URL:', error);
+      throw new Error('Failed to generate inline URL');
+    }
+  }
+
   public async buildUploadPathGenericdd(
     mappedEntityType: string,
     loggedInUser,
@@ -195,7 +229,8 @@ export class MediaDataService extends EntityServiceImpl {
     const replacements: Record<string, string | null> = {};
 
     // --- ORG ---
-    const organizationRepo = this.reflectionHelper.getRepoService('OrganizationData');
+    const organizationRepo =
+      this.reflectionHelper.getRepoService('OrganizationData');
     let organizationData = await organizationRepo.findOne({
       where: {
         id: loggedInUser.organization_id,
@@ -222,7 +257,10 @@ export class MediaDataService extends EntityServiceImpl {
     }
 
     // Get entity data for level_code
-    const getEntityData = await this.entityMasterService.getEntityData(levelEntityType, loggedInUser);
+    const getEntityData = await this.entityMasterService.getEntityData(
+      levelEntityType,
+      loggedInUser,
+    );
 
     if (!getEntityData) return null;
     const levelEntityDataResult = await this.entityManager.query(
@@ -269,7 +307,10 @@ export class MediaDataService extends EntityServiceImpl {
       // );
 
       // Get entity data for level_code
-      const getEntityData = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
+      const getEntityData = await this.entityMasterService.getEntityData(
+        mappedEntityType,
+        loggedInUser,
+      );
 
       if (!getEntityData) return null;
       const levelEntityDataResult = await this.entityManager.query(
@@ -288,7 +329,10 @@ export class MediaDataService extends EntityServiceImpl {
         // If we have parent template, modify the path to include it
         pathTemplate = '${org_code}/template/${template_code}';
       } else {
-        const getEntityData = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
+        const getEntityData = await this.entityMasterService.getEntityData(
+          mappedEntityType,
+          loggedInUser,
+        );
 
         if (!getEntityData) return null;
         const levelEntityDataResult = await this.entityManager.query(
@@ -415,7 +459,9 @@ export class MediaDataService extends EntityServiceImpl {
           return null;
         });
     } else {
-      const organizationProfileRepo = this.reflectionHelper.getRepoService('OrganizationProfile');
+      const organizationProfileRepo = this.reflectionHelper.getRepoService(
+        'OrganizationProfile',
+      );
       organizationData = await organizationProfileRepo.find({
         where: {
           id: loggedInUser.organization_id,

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

@@ -71,6 +71,7 @@ export class UserSessionService {
     await this.userSessionRepository.saveSession(userSession);
   }
 
+
   async switchCurrentLevelService(
     currentUser: any,
     data: any,
@@ -122,82 +123,78 @@ export class UserSessionService {
   }
 
   async checkIfUserHasMapping(
-  userId: number,
-  appcode: string,
-  levelType: string,
-  levelId: string,
-): Promise<boolean> {
-  // Get repositories dynamically via reflectionHelper
-  const userRoleMappingRepo =
-    this.reflectionHelper.getRepoService('UserRoleMapping');
-  const appMasterRepo =
-    this.reflectionHelper.getRepoService('AppMaster');
-
-  // Use QueryBuilder with proper aliases
-  const count = await userRoleMappingRepo
-    .createQueryBuilder('urm')
-    .innerJoin(
-      appMasterRepo.metadata.tableName,
-      'app',
-      'app.appcode = urm.appcode',
-    )
-    .where('urm.user_id = :userId', { userId })
-    .andWhere('urm.appcode = :appcode', { appcode })
-    .andWhere('urm.level_type = :levelType', { levelType })
-    .andWhere('urm.level_id = :levelId', { levelId })
-    .andWhere('app.show_in_ui = true')
-    .getCount();
-
-  return count > 0;
-}
-
+    userId: number,
+    appcode: string,
+    levelType: string,
+    levelId: string,
+  ): Promise<boolean> {
+    // Get repositories dynamically via reflectionHelper
+    const userRoleMappingRepo =
+      this.reflectionHelper.getRepoService('UserRoleMapping');
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    // Use QueryBuilder with proper aliases
+    const count = await userRoleMappingRepo
+      .createQueryBuilder('urm')
+      .innerJoin(
+        appMasterRepo.metadata.tableName,
+        'app',
+        'app.appcode = urm.appcode',
+      )
+      .where('urm.user_id = :userId', { userId })
+      .andWhere('urm.appcode = :appcode', { appcode })
+      .andWhere('urm.level_type = :levelType', { levelType })
+      .andWhere('urm.level_id = :levelId', { levelId })
+      .andWhere('app.show_in_ui = true')
+      .getCount();
+
+    return count > 0;
+  }
 
   async getUserRoleMappingForApp(userId: number, appcode: string) {
-  // Get repos dynamically
-  const userRoleMappingRepo =
-    this.reflectionHelper.getRepoService('UserRoleMapping');
-
-  const appMasterRepo =
-    this.reflectionHelper.getRepoService('AppMaster');
-
-  // Build dynamic join using metadata
-  const mapping = await userRoleMappingRepo
-    .createQueryBuilder('urm')
-    .innerJoin(
-      appMasterRepo.metadata.tableName,
-      'app',
-      'app.appcode = urm.appcode',
-    )
-    .where('urm.user_id = :userId', { userId })
-    .andWhere('urm.appcode = :appcode', { appcode })
-    .andWhere('app.show_in_ui = true')
-    .getOne();
-
-  // If not found or level_type is not BRN → return
-  if (!mapping || mapping.level_type !== 'BRN') {
-    return mapping;
-  }
+    const userRoleMappingRepo =
+      this.reflectionHelper.getRepoService('UserRoleMapping');
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    const mapping = await userRoleMappingRepo
+      .createQueryBuilder('urm')
+      .innerJoin(
+        appMasterRepo.metadata.tableName,
+        'app',
+        'app.appcode = urm.appcode',
+      )
+      .where('urm.user_id = :userId', { userId })
+      .andWhere('urm.appcode = :appcode', { appcode })
+      .andWhere('app.show_in_ui = true')
+      .getOne();
+
+    if (!mapping) {
+      throw new BadRequestException(
+        `User does not have visible access to app ${appcode}`,
+      );
+    }
 
-  // Resolve SCH under BRN
-  const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    if (mapping.level_type !== 'BRN') {
+      return mapping;
+    }
 
-  const school = await schoolRepo.findOne({
-    where: {
-      brand_id: mapping.level_id,
-    },
-    order: { id: 'ASC' },
-  });
+    // Resolve SCH under brand
+    const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+    const school = await schoolRepo.findOne({
+      where: { brand_id: mapping.level_id },
+      order: { id: 'ASC' },
+    });
+
+    if (!school) {
+      throw new BadRequestException(
+        `No schools found under brand ${mapping.level_id}`,
+      );
+    }
 
-  if (school) {
     return {
       ...mapping,
       level_type: 'SCH',
       level_id: school.id,
     };
   }
-
-  // If no SCH found
-  return null;
-}
-
 }