rez_core 5.0.285 → 5.0.286

package/package.json

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

package/src/module/meta/service/view-master.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from './entity-service-impl.service';
 import { BaseEntity } from '../entity/base-entity.entity';
 import { UserData } from '../../user/entity/user.entity';
@@ -12,6 +12,8 @@ import { ViewMaterRespository } from '../repository/view-master.repository';
 import { get } from 'http';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
+import { IMicroserviceClients } from 'src/module/microservice-client/service/microservice-clients';
+import { firstValueFrom } from 'rxjs';
 @Injectable()
 export class ViewMasterService extends EntityServiceImpl {
   constructor(
@@ -20,6 +22,8 @@ export class ViewMasterService extends EntityServiceImpl {
     private readonly viewMasterRepoService: ViewMaterRespository,
     private readonly dataSource: DataSource,
     private readonly configService: ConfigService,
+    @Inject('MICROSERVICE_CLIENT_FACTORY')
+    private readonly factory: IMicroserviceClients,
   ) {
     super();
   }
@@ -81,39 +85,48 @@ export class ViewMasterService extends EntityServiceImpl {
   async getEntityData(
     entityType: string,
     id: number,
-    loggedInUserData?: UserData | null,
+    loggedInUser?: UserData | null,
   ) {
     let getTheme = null as any;
 
-    try {
-      const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+    const client = this.factory.getClient('ADM');
 
-      // Make the GET request with query parameters
-      const response = await axios.get<any>(
-        `${baseUrl}/school/public/theme_json/${loggedInUserData?.level_id}`,
-
-        {
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        },
-      );
-
-      getTheme = response.data;
-    } catch (error) {
-      console.error('Internal Entity API call failed:', error.message);
+    if (!client) {
+      return null;
     }
 
-    const viewMaster = await super.getEntityData(
-      entityType,
-      id,
-      loggedInUserData,
+    getTheme = await firstValueFrom(
+      client.send('FRM.entity.getById', {
+        entityType: 'SCH',
+        id: loggedInUser?.level_id,
+        loggedInUser,
+      }),
     );
 
+    // try {
+    //   const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+    //   // Make the GET request with query parameters
+    //   const response = await axios.get<any>(
+    //     `${baseUrl}/school/public/theme_json/${loggedInUserData?.level_id}`,
+
+    //     {
+    //       headers: {
+    //         'Content-Type': 'application/json',
+    //       },
+    //     },
+    //   );
+
+    //   getTheme = response.data;
+    // } catch (error) {
+    //   console.error('Internal Entity API call failed:', error.message);
+    // }
+
+    const viewMaster = await super.getEntityData(entityType, id, loggedInUser);
+
     return {
       ...viewMaster,
-      theme_json:
-        getTheme && getTheme[0]?.theme_json ? getTheme[0].theme_json : null,
+      theme_json: getTheme && getTheme?.theme_json ? getTheme.theme_json : null,
     };
   }
 

package/src/module/workflow-automation/service/workflow-automation.service.ts

@@ -78,7 +78,9 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     workflow_automation_id: number,
   ): Promise<WorkflowAutomationActionEntity[]> {
     return this.actionRepo.find({
-      where: { workflow_automation_id },
+      where: { workflow_automation_id,
+        status: 'ACTIVE',
+       },
     });
   }