rez_core 2.2.260 → 2.2.261

package/package.json

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

package/src/app.module.ts

@@ -19,7 +19,6 @@ import { DashboardModule } from './module/dashboard/dashboard.module';
 import { IntegrationModule } from './module/integration/integration.module';
 import { ScheduleModule } from '@nestjs/schedule';
 import { AuthModule } from './module/auth/auth.module';
-import { WorkflowAutomationModule } from './module/workflow-automation/workflow-automation.module';
 
 @Module({
   imports: [

package/src/module/integration/entity/integration-ivr-mapper.entity.ts

@@ -0,0 +1,14 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_integration_telephone_mapper' })
+export class IntegrationSource extends BaseEntity {
+  @Column({ name: 'did', type: 'varchar', length: 100 })
+  did: string;
+
+  @Column({ name: 'campaign_name', type: 'varchar', length: 100 })
+  campaign_name: string;
+
+  @Column({ name: 'mapped_entity_type', type: 'varchar', length: 20 })
+  mapped_entity_type: string;
+}

package/src/module/integration/entity/integration-source.entity.ts

@@ -3,7 +3,7 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'cr_integration_master' })
 export class IntegrationSource extends BaseEntity {
-  @Column({ name: 'logo', type: 'varchar', length: 100 })
+  @Column({ name: 'logo', type: 'varchar', length: 500 })
   logo: string;
 
   @Column({ name: 'base_url', type: 'varchar', length: 100 })
@@ -11,4 +11,7 @@ export class IntegrationSource extends BaseEntity {
 
   @Column({ name: 'integration_type', type: 'varchar', length: 20 })
   integration_type: string;
+
+  @Column({ name: 'description', type: 'varchar', length: 20 })
+  description: string;
 }

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

@@ -6,10 +6,14 @@ import {
 } from 'src/constant/global.constant';
 import { DataSource } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { MediaDataService } from './media-data.service';
 
 @Injectable()
 export class EntityDynamicService {
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly mediaDataService: MediaDataService,
+  ) {}
 
   // -----------------------------
   async createEntity(
@@ -60,17 +64,40 @@ export class EntityDynamicService {
     }
 
     const bypassColumn = [
-      { attribute_key: 'created_date', db_datatype: 'datetime' },
-      { attribute_key: 'created_by', db_datatype: 'int' },
-      { attribute_key: 'organization_id', db_datatype: 'datetime' },
-      { attribute_key: 'enterprise_id', db_datatype: 'int' },
-      { attribute_key: 'organization_id', db_datatype: 'int' },
-      { attribute_key: 'level_type', db_datatype: 'int' },
-      { attribute_key: 'level_id', db_datatype: 'varchar' },
-      { attribute_key: 'level_id', db_datatype: 'int' },
-      { attribute_key: 'status', db_datatype: 'varchar' },
-      { attribute_key: 'entity_type', db_datatype: 'varchar' },
-      { attribute_key: 'code', db_datatype: 'varchar' },
+      {
+        attribute_key: 'created_date',
+        db_datatype: 'datetime',
+        element_type: 'date',
+      },
+      {
+        attribute_key: 'created_by',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
+      {
+        attribute_key: 'organization_id',
+        db_datatype: 'datetime',
+        element_type: 'date',
+      },
+      {
+        attribute_key: 'enterprise_id',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
+      { attribute_key: 'level_type', db_datatype: 'int', element_type: 'text' },
+      {
+        attribute_key: 'level_id',
+        db_datatype: 'varchar',
+        element_type: 'text',
+      },
+      { attribute_key: 'level_id', db_datatype: 'int', element_type: 'number' },
+      { attribute_key: 'status', db_datatype: 'varchar', element_type: 'text' },
+      {
+        attribute_key: 'entity_type',
+        db_datatype: 'varchar',
+        element_type: 'text',
+      },
+      { attribute_key: 'code', db_datatype: 'varchar', element_type: 'text' },
     ];
 
     validAttributes.push(...bypassColumn);
@@ -400,17 +427,49 @@ export class EntityDynamicService {
     }
 
     const bypassColumn = [
-      { attribute_key: 'created_date', db_datatype: 'datetime' },
-      { attribute_key: 'created_by', db_datatype: 'int' },
-      { attribute_key: 'modified_date', db_datatype: 'datetime' },
-      { attribute_key: 'modified_by', db_datatype: 'int' },
-      { attribute_key: 'organization_id', db_datatype: 'int' },
-      { attribute_key: 'enterprise_id', db_datatype: 'int' },
-      { attribute_key: 'level_type', db_datatype: 'varchar' },
-      { attribute_key: 'level_id', db_datatype: 'int' },
-      { attribute_key: 'status', db_datatype: 'varchar' },
-      { attribute_key: 'entity_type', db_datatype: 'varchar' },
-      { attribute_key: 'code', db_datatype: 'varchar' },
+      {
+        attribute_key: 'created_date',
+        db_datatype: 'datetime',
+        element_type: 'date',
+      },
+      {
+        attribute_key: 'created_by',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
+      {
+        attribute_key: 'modified_date',
+        db_datatype: 'datetime',
+        element_type: 'date',
+      },
+      {
+        attribute_key: 'modified_by',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
+      {
+        attribute_key: 'organization_id',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
+      {
+        attribute_key: 'enterprise_id',
+        db_datatype: 'int',
+        element_type: 'number',
+      },
+      {
+        attribute_key: 'level_type',
+        db_datatype: 'varchar',
+        element_type: 'text',
+      },
+      { attribute_key: 'level_id', db_datatype: 'int', element_type: 'number' },
+      { attribute_key: 'status', db_datatype: 'varchar', element_type: 'text' },
+      {
+        attribute_key: 'entity_type',
+        db_datatype: 'varchar',
+        element_type: 'text',
+      },
+      { attribute_key: 'code', db_datatype: 'varchar', element_type: 'text' },
     ];
 
     validAttributes.push(...bypassColumn);
@@ -464,6 +523,26 @@ export class EntityDynamicService {
         row[attr.attribute_key] !== undefined
       ) {
         row[attr.attribute_key] = row[attr.attribute_key] == 1 ? true : false;
+      } else if (
+        attr.element_type == 'upload' &&
+        row[attr.attribute_key] !== undefined
+      ) {
+        // fetch media data
+        console.log(
+          'Fetching media for',
+          attr.attribute_key,
+          row[attr.attribute_key],
+        );
+
+        row[attr.attribute_key] =
+          row[attr.attribute_key] != null
+            ? await this.mediaDataService.getMediaDownloadUrl(
+                Number(row[attr.attribute_key]),
+                loggedInUser,
+              )
+            : null;
+
+        console.log('Fetched media:', row[attr.attribute_key]);
       }
     }
 
@@ -490,10 +569,12 @@ export class EntityDynamicService {
   private async getAttributeCodes(
     entityType: string,
     organizationId: string,
-  ): Promise<{ attribute_key: string; db_datatype: string }[]> {
+  ): Promise<
+    { attribute_key: string; db_datatype: string; element_type: string }[]
+  > {
     const result = await this.dataSource.query(
-      `SELECT attribute_key, db_datatype 
-     FROM cr_attribute_master 
+      `SELECT attribute_key, db_datatype, element_type
+     FROM cr_attribute_master
      WHERE mapped_entity_type = ? AND organization_id = ?`,
       [entityType, organizationId],
     );
@@ -507,6 +588,7 @@ export class EntityDynamicService {
     return result.map((row: any) => ({
       attribute_key: row.attribute_key,
       db_datatype: row.db_datatype,
+      element_type: row.element_type,
     }));
   }
 

package/src/module/user/controller/login.controller.ts

@@ -16,7 +16,6 @@ import { Request, Response } from 'express';
 import { UserSessionService } from '../service/user-session.service';
 import { ConfigService } from '@nestjs/config';
 import { IntegrationService } from '../../integration/service/integration.service';
-import { UAParser } from 'ua-parser-js';
 
 @Controller('auth')
 export class LoginController {
@@ -86,13 +85,12 @@ export class LoginController {
         const actualState = state.replace('gmail_config:', '');
 
         // Forward to communication service for Gmail config handling using already exchanged tokens
-        const result =
-          await this.integrationService.handleGmailTokensCallback(
-            email,
-            googleAccessToken,
-            googleRefreshToken,
-            actualState,
-          );
+        const result = await this.integrationService.handleGmailTokensCallback(
+          email,
+          googleAccessToken,
+          googleRefreshToken,
+          actualState,
+        );
 
         return res.send(
           `<html><body><script>

package/src/resources/dev.properties.yaml

@@ -1,9 +1,9 @@
-#DB_HOST: '13.234.25.234'
-PROFILE: 'dev'
+DB_HOST: '13.234.25.234'
+# PROFILE: 'dev'
 DB_HOST: 'localhost'
 DB_PORT: '3306'
 DB_USER: 'root'
-DB_PASS: 'root'
+DB_PASS: 'Rezolut@123'
 DB_NAME: 'package_core'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='