rez_core 4.0.21 → 4.0.23

package/package.json

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

package/src/module/mapper/controller/mapper.controller.ts

@@ -1,15 +1,20 @@
-import { Controller, Get, Inject, Query } from '@nestjs/common';
+import { Controller, Get, Inject, Query, Req, Res, UseGuards } from '@nestjs/common';
 import { MapperService } from '../service/mapper.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { Response } from 'express';
 
 @Controller('mapper')
+@UseGuards(JwtAuthGuard)
 export class MapperController {
   constructor(@Inject('MapperService') private readonly mapperService: MapperService) {}
 
   @Get('all')
   async getByMappedEntityType(@Query('mapped_entity_type') mappedEntityType: string,
+  @Req() req: Request & { user: any },
                               @Query('filter') filter?: string,
-                              @Query('status') status?: string
+                              @Query('status') status?: string,
                               ) {
-    return this.mapperService.getByMappedEntityType(mappedEntityType, filter, status);
+                                const loggedInUser = req.user.userData;
+    return this.mapperService.getByMappedEntityType(mappedEntityType,loggedInUser, filter, status);
   }
 }

package/src/module/mapper/service/mapper.service.ts

@@ -16,14 +16,14 @@ export class MapperService extends EntityServiceImpl {
     super();
   }
 
-  async getByMappedEntityType(mappedEntityType: string, filter?: string, status?: string) {
+  async getByMappedEntityType(mappedEntityType: string,loggedInUser, filter?: string, status?: string) {
     if (!mappedEntityType) return [];
 
     const mappers = await this.dataSource.query(
       `SELECT id, name, code, status
        FROM frm_mapper_master
-       WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`,
-      [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`],
+       WHERE mapped_entity_type = ? AND organization_id = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`,
+      [mappedEntityType,loggedInUser.organization_id, filter || -1, `%${filter}%`, `%${filter}%`],
     );
 
     const distinctStatuses = [

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

@@ -65,19 +65,21 @@ export class EntityValidationService {
           .where(`${db_table_name}.${attr.attribute_key} = :value`, { value });
 
         // Add AND condition for organization_id/level_type/level_id if present
-        const orgId = loggedInUser.organization_id;
-        const level_type = loggedInUser.level_type;
-        const level_id = loggedInUser.level_id;
-
-        if (orgId !== undefined && orgId !== null) {
-          qb = qb.andWhere(
-            `${db_table_name}.organization_id = :organization_id AND ${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
-            {
-              organization_id: orgId,
-              level_type,
-              level_id,
-            },
-          );
+        if (entityType !== 'ORG' && entityType !== 'ORGP') {
+          const orgId = loggedInUser.organization_id;
+          const level_type = loggedInUser.level_type;
+          const level_id = loggedInUser.level_id;
+
+          if (orgId !== undefined && orgId !== null) {
+            qb = qb.andWhere(
+              `${db_table_name}.organization_id = :organization_id AND ${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
+              {
+                organization_id: orgId,
+                level_type,
+                level_id,
+              },
+            );
+          }
         }
 
         // Skip the current record when checking for uniqueness during update

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

@@ -400,7 +400,9 @@ export class MediaDataService extends EntityServiceImpl {
       }).toString();
 
       organizationData = await axios
-        .get(`${baseUrl}/organization/public/?${queryParams}`)
+        .get(
+          `${baseUrl}/organization/public/${loggedInUser.organization_id}?${queryParams}`,
+        )
         .then((res) => res.data)
         .catch((err) => {
           console.error('Error fetching organization data:', err.message);

package/src/module/workflow/repository/action-data.repository.ts

@@ -68,8 +68,15 @@ export class ActionDataRepository extends EntityServiceImpl {
             loggedInUser,
           );
 
+          const viewMaster = await super.getEntityData(
+            'VMS',
+            Number(act.form_id),
+            loggedInUser,
+          );
+
           const data = {
             entity_type: 'LFRM',
+            name: viewMaster?.name,
             stage_id: act.stage_id,
             mapped_entity_type,
             mapped_entity_id,