rez_core 3.1.204 → 3.1.206

package/package.json

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

package/src/module/enterprise/repository/school.repository.ts

@@ -62,8 +62,8 @@ export class SchoolRepository {
           'org.status AS org_status',
 
           'brn.id AS brand_id',
-          'brand_profile.name AS brand_name',
-          'brand_profile.status AS brand_status',
+          'brn.name AS brand_name',
+          'brn.status AS brand_status',
 
           'school.id AS school_id',
           'school.name AS school_name',
@@ -72,11 +72,11 @@ export class SchoolRepository {
         ])
         .from('sso_organization', 'org')
         .innerJoin('sso_organization', 'brn', "brn.type = 'BRN'")
-        .innerJoin(
-          'eth_brand_profile',
-          'brand_profile',
-          'brand_profile.parent_id = brn.id AND brand_profile.organization_id = org.id',
-        )
+        // .innerJoin(
+        //   'eth_brand_profile',
+        //   'brand_profile',
+        //   'brand_profile.parent_id = brn.id AND brand_profile.organization_id = org.id',
+        // )
         .innerJoin('sso_school', 'school', 'school.brand_id = brn.id')
         .leftJoin('eth_address', 'address', 'address.parent_id = school.id')
         .where('org.id = :orgId', { orgId: currentORGLevel_id })

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

@@ -47,7 +47,7 @@ export class ActionDataEntity extends BaseEntity {
   @Column({ nullable: true, default: 0 })
   resubmit_count: number;
 
-  @Column({ type: 'int', nullable: true })
+  @Column({ nullable: true })
   dependent_action_id: number;
 
   @Column({ type: 'varchar', nullable: true })

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

@@ -3,10 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { ActionDataEntity } from '../entity/action-data.entity';
 import { DataSource, LessThan, Repository } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
-import { FormDataEntity } from '../entity/form.entity';
 import { TaskDataEntity } from '../entity/task-data.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { FORM_STATUS_TO_BE_SENT } from 'src/constant/global.constant';
+import { ConfigService } from '@nestjs/config';
+import axios from 'axios';
 
 @Injectable()
 export class ActionDataRepository extends EntityServiceImpl {
@@ -18,6 +19,7 @@ export class ActionDataRepository extends EntityServiceImpl {
     // private readonly formRepo: Repository<FormDataEntity>,
     @InjectRepository(TaskDataEntity)
     private readonly TaskRepository: Repository<TaskDataEntity>,
+    private readonly configService: ConfigService,
   ) {
     super();
   }
@@ -59,12 +61,20 @@ export class ActionDataRepository extends EntityServiceImpl {
         // SEND ANY FORM
         // if the action_category_code is 'SDFM', create a entry in crm_lead_form table
         if (act?.action_category_code === 'SDFM') {
+          const dynamicFormURL = await this.generateFormURL(
+            mapped_entity_type,
+            mapped_entity_id,
+            act.form_id,
+            loggedInUser,
+          );
+
           const data = {
             entity_type: 'LFRM',
             stage_id: act.stage_id,
             mapped_entity_type,
             mapped_entity_id,
             view_id: act.form_id,
+            form_url: dynamicFormURL,
             status: FORM_STATUS_TO_BE_SENT,
             action_id: act.id,
           };
@@ -239,4 +249,65 @@ export class ActionDataRepository extends EntityServiceImpl {
       updated: currentAction,
     };
   }
+
+  // method to dynamically generate form URL
+  async generateFormURL(
+    mapped_entity_type: string,
+    mapped_entity_id: number,
+    view_id: number,
+    loggedInUser: any,
+  ) {
+    let organizationData;
+
+    try {
+      const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+      // Prepare query params
+      const queryParams = new URLSearchParams({
+        loggedInUser: JSON.stringify(loggedInUser),
+      }).toString();
+
+      const { level_id } = loggedInUser;
+
+      const url = `${baseUrl}/entity/public/getById/${level_id}?entity_type=ORG&${queryParams}`;
+
+      const response = await axios.get(url);
+      console.log('Internal Entity API response:', response.data);
+
+      organizationData = response.data;
+
+      // The API response is likely a JSON object, not an array
+    } catch (error) {
+      console.error('Internal Entity API call failed:', error.message);
+    }
+
+    const org_slug = organizationData?.slug;
+
+    // fetch required var from config or env
+    const profile = this.configService.get('PROFILE');
+    const baseUrl = this.configService.get('BASE_URL');
+    const domainUrl = this.configService.get('DOMAIN_URL');
+
+    if (!profile || !baseUrl || !domainUrl) {
+      throw new BadRequestException(
+        `Configuration variable  missing for form URL generation`,
+      );
+    }
+
+    let finalBaseUrl: string;
+
+    if (profile === 'DEV' || profile === 'STAGING') {
+      finalBaseUrl = baseUrl;
+    } else if (profile === 'UAT' || profile === 'PREPROD') {
+      // fetch org_slug from DB if needed
+      const org_slug = 'orgslug'; // placeholder
+      finalBaseUrl = `https://${org_slug}.${domainUrl}`;
+    } else {
+      finalBaseUrl = baseUrl;
+    }
+
+    const formURL = `${finalBaseUrl}/form/${mapped_entity_type}/${mapped_entity_id}/${view_id}`;
+
+    return formURL;
+  }
 }

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

@@ -188,10 +188,16 @@ export class ActionRepository {
 
     // Step 2: Fetch action details except the provided action_id incase it is provided
     const filteredActionIds = action_id
-      ? actionIds.filter((id) => id !== action_id)
+      ? actionIds.filter((id) => id != action_id)
       : actionIds;
 
-    const actionResults = await this.dataSource
+    let actionResults;
+
+    if (filteredActionIds.length === 0) {
+      return [];
+    }
+
+    actionResults = await this.dataSource
       .createQueryBuilder()
       .select(['a.id AS action_id', 'a.name AS action_name'])
       .from('cr_wf_action', 'a')