rez_core 3.1.44 → 3.1.46

package/package.json

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

package/src/module/integration/controller/integration.controller.ts

@@ -478,6 +478,24 @@ export class IntegrationController {
           },
         };
       }
+    } else if (integration_type === 'WA' && integration_provider) {
+      if (integration_provider.toLowerCase() == 'tubelight') {
+        return {
+          success: true,
+          data: {
+            baseUrl: 'https://portal.tubelightcommunications.com',
+            agentLoginUrl: 'https://dashboard.hellotubelight.com/sign-in',
+          },
+        };
+      } else if (integration_provider.toLowerCase() == 'gupshup') {
+        return {
+          success: true,
+          data: {
+            baseUrl: 'https://api.gupshup.io',
+            agentLoginUrl: 'https://login.gupshup.io/u/login',
+          },
+        };
+      }
     }
   }
 
@@ -486,7 +504,8 @@ export class IntegrationController {
     @Query('level_id', ParseIntPipe) levelId: number,
     @Query('level_type') levelType: string,
     @Query('app_code') appCode: string,
-    @Query('integration_type') integrationType: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE',
+    @Query('integration_type')
+    integrationType: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE',
   ) {
     try {
       const config = await this.integrationService.getSingleActiveConfig(

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

@@ -72,4 +72,11 @@ export class MetaController {
       await this.populateMetaService.populateMetaData(organizationId);
     return response.status(HttpStatus.OK).json(result);
   }
+
+  @Post('operation-list')
+  async getOperationList(@Req() req: Request & { user: any }) {
+    const loggedInUser = req.user.userData;
+    const result = await this.entityMaster.getOperationList(loggedInUser);
+    return result;
+  }
 }

package/src/module/meta/repository/entity-master.repository.ts

@@ -1,7 +1,8 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { EntityMaster } from '../entity/entity-master.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository, DataSource } from 'typeorm';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 
 @Injectable()
 export class EntityMasterRepository {
@@ -9,6 +10,8 @@ export class EntityMasterRepository {
     @InjectRepository(EntityMaster)
     private readonly entityMasterRepository: Repository<EntityMaster>,
     private readonly dataSource: DataSource,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
   ) {}
 
   async getEntityById(id: number): Promise<EntityMaster | null> {
@@ -26,4 +29,17 @@ export class EntityMasterRepository {
       },
     });
   }
+
+  async getOperationList(loggedInUser: any) {
+    const [text, number, date, select, multiselect, year] = await Promise.all([
+      this.listMasterService.getDropdownOptions('OPT', {}, [], loggedInUser),
+      this.listMasterService.getDropdownOptions('OPN', {}, [], loggedInUser),
+      this.listMasterService.getDropdownOptions('OPD', {}, [], loggedInUser),
+      this.listMasterService.getDropdownOptions('OPS', {}, [], loggedInUser),
+      this.listMasterService.getDropdownOptions('OPM', {}, [], loggedInUser),
+      this.listMasterService.getDropdownOptions('OPY', {}, [], loggedInUser),
+    ]);
+
+    return { text, number, date, select, multiselect, year };
+  }
 }

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

@@ -335,6 +335,7 @@ export class EntityDynamicService {
               item.id,
               item,
               loggedInUser,
+              Number(id), // pass main entity id as parent_id
             );
             targetEntityId = item.id;
             entityData = await this.getEntity(
@@ -397,6 +398,7 @@ export class EntityDynamicService {
     id: number | string,
     entityData: Record<string, any>,
     loggedInUser: any,
+    mainID?: number,
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
 
@@ -433,6 +435,11 @@ export class EntityDynamicService {
       entityData.code = `${entityData.entity_type}${maxSeqNo}`;
     }
 
+    // Set parent_id if mainID is provided
+    if (mainID) {
+      entityData.parent_id = mainID;
+    }
+
     const bypassColumn = [
       {
         attribute_key: 'created_date',
@@ -477,6 +484,11 @@ export class EntityDynamicService {
         element_type: 'text',
       },
       { attribute_key: 'code', db_datatype: 'varchar', element_type: 'text' },
+      {
+        attribute_key: 'parent_id',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
     ];
 
     validAttributes.push(...bypassColumn);

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

@@ -150,4 +150,8 @@ export class EntityMasterService {
 
     return entityMasterData;
   }
+
+  async getOperationList(loggedInUser: any) {
+    return await this.entityMasterRepo.getOperationList(loggedInUser);
+  }
 }

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

@@ -28,5 +28,5 @@ export class WorkflowAutomation extends BaseEntity {
   trigger_type: string;
 
   @Column({ type: 'json', nullable: true })
-  schedule: JSON;
+  schedule: string;
 }