rez_core 3.1.26 → 3.1.29

package/package.json

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

package/src/module/filter/controller/filter.controller.ts

@@ -71,4 +71,14 @@ export class FilterController {
   async getFilterById(@Param('id') id: string) {
     return this.savedFilterService.getFilterById(Number(id));
   }
+
+  @Get('getsavedfilterbycode/:code')
+  @UseGuards(JwtAuthGuard)
+  async getSavedFilterByCode(
+    @Param('code') code: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    return this.savedFilterService.getSavedFilterByCode(code, loggedInUser);
+  }
 }

package/src/module/filter/repository/saved-filter.repository.ts

@@ -1,8 +1,11 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, Not } from 'typeorm';
+import { Repository, Not, DataSource } from 'typeorm';
 import { SavedFilterMaster } from '../entity/saved-filter-master.entity';
 import { SavedFilterDetail } from '../entity/saved-filter-detail.entity';
+import { SavedFilterService } from '../service/saved-filter.service';
+import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
+import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class SavedFilterRepositoryService {
@@ -11,6 +14,7 @@ export class SavedFilterRepositoryService {
     private readonly savedFilterMasterRepo: Repository<SavedFilterMaster>,
     @InjectRepository(SavedFilterDetail)
     private readonly savedFilterDetailRepo: Repository<SavedFilterDetail>,
+    private readonly dataSource: DataSource,
   ) {}
 
   async isFilterNameExists({
@@ -121,4 +125,29 @@ export class SavedFilterRepositoryService {
           : detail.filter_value,
     }));
   }
+
+  async getSavedFilterByCode(
+    code: string,
+    loggedInUser: UserData,
+  ): Promise<any> {
+    const [filterMaster] = await this.dataSource.query(
+      `SELECT id, name, code 
+     FROM cr_saved_filter_master 
+     WHERE code = ? AND organization_id = ? 
+     LIMIT 1
+`,
+      [code, loggedInUser.organization_id],
+    );
+
+    if (!filterMaster) {
+      return null;
+    }
+
+    const filterDetails = await this.getDetailsByCode(filterMaster.code);
+
+    return {
+      ...filterMaster,
+      filterDetails,
+    };
+  }
 }

package/src/module/filter/service/saved-filter.service.ts

@@ -1,4 +1,9 @@
-import { BadRequestException, forwardRef, Inject, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  forwardRef,
+  Inject,
+  Injectable,
+} from '@nestjs/common';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserData } from '../../user/entity/user.entity';
@@ -9,8 +14,7 @@ import { SavedFilterRepositoryService } from '../repository/saved-filter.reposit
 
 @Injectable()
 export class SavedFilterService extends EntityServiceImpl {
-  constructor(private readonly savedFilterRepo: SavedFilterRepositoryService
-  ) {
+  constructor(private readonly savedFilterRepo: SavedFilterRepositoryService) {
     super();
   }
 
@@ -159,4 +163,8 @@ export class SavedFilterService extends EntityServiceImpl {
   async getFilterById(id: number) {
     return await this.savedFilterRepo.getFilterById(id);
   }
+
+  async getSavedFilterByCode(code: string, loggedInUser: UserData) {
+    return await this.savedFilterRepo.getSavedFilterByCode(code, loggedInUser);
+  }
 }

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

@@ -49,4 +49,7 @@ export class ActionDataEntity extends BaseEntity {
 
   @Column({ type: 'int', nullable: true })
   dependent_action_id: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  mode: string;
 }

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

@@ -199,6 +199,7 @@ export class ActionRepository {
         'a.reason_code AS action_reason_code',
         'a.default_reason_code AS default_reason_code',
         'a.default_value AS default_value',
+        'a.mode AS mode',
         'a.action_category AS action_category_id',
         'ac.reason_code AS category_reason_code',
         'ac.modalName AS modalName',
@@ -254,6 +255,7 @@ export class ActionRepository {
         label: row.action_name,
         modalName: row.modalName,
         logo: row.logo,
+        mode: row.mode,
         name: row.action_category_name,
         reason_code,
         default_reason_code: row.default_reason_code,

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

@@ -71,7 +71,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
       `Updating WorkflowAutomation with data: ${JSON.stringify(entityData)}`,
     );
 
-    const { event, criteria, action, ...workflowData } = entityData;
+    const { event, filter, action, ...workflowData } = entityData;
 
     // 1. Update core workflow columns first
     this.logger.log(`Updating core workflow fields for workflow...`);
@@ -126,47 +126,49 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     }
 
     // 3. CRITERIA FILTER
-    if (criteria?.criteriaFilterJson?.length) {
+    if (filter?.filter_code) {
       this.logger.log(`Processing CRITERIA filter for workflow ${workflow.id}`);
 
-      const criteriaFilterMaster = {
-        entity_type: 'SFM',
-        name: `Criteria_Filter_${workflow.id}`,
-        filterDetails: criteria?.criteriaFilterJson ?? [],
-        filter_scope: 'RULE',
-        organization_id: loggedInUser.organization_id,
-        enterprise_id: loggedInUser.enterprise_id,
-      };
-
-      if (workflow.criteria_filter_code) {
-        this.logger.debug(
-          `Existing criteria filter found: ${workflow.criteria_filter_code}`,
-        );
-        const existing = await this.savedFilterService.getEntityDataByCode(
-          ENTITYTYPE_SAVEDFILTERMASTER,
-          workflow.criteria_filter_code,
-          loggedInUser,
-        );
-
-        if (existing) {
-          criteriaFilterMaster['id'] = existing.id;
-          const updatedCriteria = await this.savedFilterService.updateEntity(
-            criteriaFilterMaster as any,
-            loggedInUser,
-          );
-          workflow.criteria_filter_code = updatedCriteria.code;
-          this.logger.log(
-            `Updated existing criteria filter: ${updatedCriteria.code}`,
-          );
-        }
-      } else {
-        const savedCriteria = await this.savedFilterService.createEntity(
-          criteriaFilterMaster,
-          loggedInUser,
-        );
-        workflow.criteria_filter_code = savedCriteria.code;
-        this.logger.log(`Created new criteria filter: ${savedCriteria.code}`);
-      }
+      // const criteriaFilterMaster = {
+      //   entity_type: 'SFM',
+      //   name: `Criteria_Filter_${workflow.id}`,
+      //   filterDetails: criteria?.criteriaFilterJson ?? [],
+      //   filter_scope: 'RULE',
+      //   organization_id: loggedInUser.organization_id,
+      //   enterprise_id: loggedInUser.enterprise_id,
+      // };
+
+      // if (workflow.criteria_filter_code) {
+      //   this.logger.debug(
+      //     `Existing criteria filter found: ${workflow.criteria_filter_code}`,
+      //   );
+      //   const existing = await this.savedFilterService.getEntityDataByCode(
+      //     ENTITYTYPE_SAVEDFILTERMASTER,
+      //     workflow.criteria_filter_code,
+      //     loggedInUser,
+      //   );
+
+      //   if (existing) {
+      //     criteriaFilterMaster['id'] = existing.id;
+      //     const updatedCriteria = await this.savedFilterService.updateEntity(
+      //       criteriaFilterMaster as any,
+      //       loggedInUser,
+      //     );
+      //     workflow.criteria_filter_code = updatedCriteria.code;
+      //     this.logger.log(
+      //       `Updated existing criteria filter: ${updatedCriteria.code}`,
+      //     );
+      //   }
+      // } else {
+      //   const savedCriteria = await this.savedFilterService.createEntity(
+      //     criteriaFilterMaster,
+      //     loggedInUser,
+      //   );
+      //   workflow.criteria_filter_code = savedCriteria.code;
+      //   this.logger.log(`Created new criteria filter: ${savedCriteria.code}`);
+      // }
+
+      workflow.criteria_filter_code = entityData.filter.filter_code;
     }
 
     // 4. ACTIONS
@@ -282,26 +284,11 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     }
 
     // 3. CRITERIA FILTER
-    let criteria: any = null;
+    let filter: any = null;
     if (workflowAutomation.criteria_filter_code) {
-      const criteriaFilterMaster: any =
-        await this.savedFilterService.getEntityDataByCode(
-          ENTITYTYPE_SAVEDFILTERMASTER,
-          workflowAutomation.criteria_filter_code,
-          loggedInUser,
-        );
-
-      if (criteriaFilterMaster) {
-        // 🔑 fetch filter details using mapped_filter_code
-        const criteriaFilterDetails =
-          await this.savedFilterService.getDetailsByCode(
-            criteriaFilterMaster.code,
-          );
-
-        criteria = {
-          criteriaFilterJson: criteriaFilterDetails ?? [],
-        };
-      }
+      filter = {
+        filter_code: workflowAutomation.criteria_filter_code,
+      };
     }
 
     // 4. ACTIONS
@@ -321,7 +308,7 @@ export class WorkflowAutomationService extends EntityServiceImpl {
     const response = {
       ...workflowAutomation,
       event,
-      criteria,
+      filter,
       action,
     };
 

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}