rez_core 3.1.182 → 3.1.183

package/package.json

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

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

@@ -148,7 +148,7 @@ export class FieldMapperService extends EntityServiceImpl {
 
             if (targetEntityIds.length > 0) {
               if (filterCode && filterCode !== 'default') {
-                inMemory[entityType][filterCode] =
+                let filterResponse =
                   await this.filterService.applyFilterWrapper({
                     entity_type: entityType,
                     savedFilterCode: filterCode,
@@ -164,6 +164,16 @@ export class FieldMapperService extends EntityServiceImpl {
                     loggedInUser: userData,
                     queryParams: {},
                   });
+
+                this.loggingService.log(
+                  'package',
+                  'fieldMapperService',
+                  'filterResponse',
+                  `${filterResponse}`,
+                );
+
+                inMemory[entityType][filterCode] =
+                  filterResponse?.data?.entity_list[0];
               } else {
                 const firstId = targetEntityIds[0];
                 inMemory[entityType][filterCode] =

package/src/module/meta/controller/entity.public.controller.ts

@@ -0,0 +1,75 @@
+import {
+  BadRequestException,
+  Controller,
+  Get,
+  Param,
+  Query,
+} from '@nestjs/common';
+import { WorkflowAutomationEngineService } from 'src/module/workflow-automation/service/workflow-automation-engine.service';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
+import { EntityMasterService } from '../service/entity-master.service';
+import { EntityServiceImpl } from '../service/entity-service-impl.service';
+
+@Controller('entity/public')
+export class EntityPublicController {
+  constructor(
+    private entityService: EntityServiceImpl,
+    private reflectionHelper: ReflectionHelper,
+    private entityMasterService: EntityMasterService,
+    private readonly workflowAutomationEngineService: WorkflowAutomationEngineService,
+  ) {}
+
+  @Get('getById/:id')
+  async getPublicById(
+    @Param('id') id: number,
+    @Query() queryParams: Record<string, string>,
+  ) {
+    const {
+      entity_type: entityType,
+      loggedInUser: loggedInUserParam,
+      ...params
+    } = queryParams;
+
+    if (!entityType) {
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
+    }
+
+    // Default user object (if organization_id or appcode is needed in service)
+    let loggedInUser: any = {};
+
+    if (typeof loggedInUserParam === 'string') {
+      try {
+        loggedInUser = JSON.parse(loggedInUserParam);
+      } catch (e) {
+        loggedInUser = {};
+      }
+    } else if (
+      typeof loggedInUserParam === 'object' &&
+      loggedInUserParam !== null
+    ) {
+      loggedInUser = loggedInUserParam;
+    } else {
+      loggedInUser = {};
+    }
+
+    if (!entityType) {
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
+    }
+    const entityMaster = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(
+        entityMaster.entity_service,
+      );
+
+    if (entityService) {
+      return await entityService.getEntityData(entityType, id, loggedInUser);
+    }
+  }
+}

package/src/module/meta/entity.module.ts

@@ -59,6 +59,7 @@ import { CommonService } from './service/common.service';
 import { EntityMasterRepository } from './repository/entity-master.repository';
 import { EntityMasterController } from './controller/entity-master.controller';
 import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
+import { EntityPublicController } from './controller/entity.public.controller';
 
 @Module({
   imports: [
@@ -78,7 +79,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
     UtilsModule,
-    WorkflowAutomationModule
+    WorkflowAutomationModule,
   ],
   providers: [
     EntityMasterService,
@@ -138,7 +139,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     ResolverService,
     EntityDynamicService,
     'CommonService',
-    'EntityRelationService'
+    'EntityRelationService',
   ],
   controllers: [
     EntityController,
@@ -151,6 +152,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     EntityDynamicController,
     EntityRelationController,
     EntityMasterController,
+    EntityPublicController,
   ],
 })
 export class EntityModule {}

package/src/module/workflow/service/stage-group.service.ts

@@ -1,3 +1,4 @@
+import { app } from 'firebase-admin';
 import { BadGatewayException, Inject, Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { StageGroupRepository } from '../repository/stage-group.repository';
@@ -10,6 +11,8 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { StageMovementData } from '../entity/stage-movement-data.entity';
 import * as moment from 'moment';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
+import axios from 'axios';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -23,6 +26,7 @@ export class StageGroupService extends EntityServiceImpl {
     @InjectRepository(StageMovementData)
     private readonly stageMovementRepo: Repository<StageMovementData>,
     private readonly mediaDataService: MediaDataService,
+    private readonly configService: ConfigService,
   ) {
     super();
   }
@@ -206,13 +210,39 @@ export class StageGroupService extends EntityServiceImpl {
     userId: number,
     loggedInUser: UserData,
   ): Promise<any> {
-    const user = await this.dataSource.query(
-      `SELECT eth_user_profile.name AS created_by_name,
-        eth_user_profile.profile_image AS profile_image
-      FROM eth_user_profile
-      WHERE eth_user_profile.id = ?;`,
-      [userId],
-    );
+    // const user = await this.dataSource.query(
+    //   `SELECT eth_user_profile.name AS created_by_name,
+    //     eth_user_profile.profile_image AS profile_image
+    //   FROM eth_user_profile
+    //   WHERE eth_user_profile.id = ?;`,
+    //   [userId],
+    // );
+
+    let user: any = [];
+
+    try {
+      const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+      // Prepare the query string
+      const queryParams = new URLSearchParams({
+        loggedInUser: JSON.stringify(loggedInUser),
+      }).toString();
+
+      // Make the GET request with query parameters
+      const response = await axios.get(
+        `${baseUrl}/entity/public/getById/${userId}?entity_type=UPR&${queryParams}`,
+        {
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+
+      console.log('✅ Internal Entity API response:', response.data);
+      user = [response.data];
+    } catch (error) {
+      console.error('⚠️ Internal Entity API call failed:', error.message);
+    }
 
     if (user.length === 0) return null;