rez_core 4.0.134 → 4.0.135

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

@@ -1,31 +1,31 @@
-import { forwardRef, Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { SavedFilterService } from './service/saved-filter.service';
-import { SavedFilterDetail } from './entity/saved-filter-detail.entity';
-import { SavedFilterMaster } from './entity/saved-filter-master.entity';
-import { SavedFilterRepositoryService } from './repository/saved-filter.repository';
-import { EntityModule } from '../meta/entity.module';
-import { FilterService } from './service/filter.service';
-import { FilterController } from './controller/filter.controller';
-import { FilterEvaluatorService } from './service/filter-evaluator.service';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([SavedFilterDetail, SavedFilterMaster]),
-    forwardRef(() => EntityModule)
-  ],
-  controllers: [FilterController],
-  providers: [
-    { provide: 'SavedFilterService', useClass: SavedFilterService },
-    SavedFilterRepositoryService,
-    FilterService,
-    FilterEvaluatorService,
-  ],
-  exports: [
-    'SavedFilterService',
-    SavedFilterRepositoryService,
-    FilterService,
-    FilterEvaluatorService,
-  ],
-})
-export class FilterModule {}
+import { forwardRef, Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { SavedFilterService } from './service/saved-filter.service';
+import { SavedFilterDetail } from './entity/saved-filter-detail.entity';
+import { SavedFilterMaster } from './entity/saved-filter-master.entity';
+import { SavedFilterRepositoryService } from './repository/saved-filter.repository';
+import { EntityModule } from '../meta/entity.module';
+import { FilterService } from './service/filter.service';
+import { FilterController } from './controller/filter.controller';
+import { FilterEvaluatorService } from './service/filter-evaluator.service';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([SavedFilterDetail, SavedFilterMaster]),
+    forwardRef(() => EntityModule)
+  ],
+  controllers: [FilterController],
+  providers: [
+    { provide: 'SavedFilterService', useClass: SavedFilterService },
+    SavedFilterRepositoryService,
+    FilterService,
+    FilterEvaluatorService,
+  ],
+  exports: [
+    'SavedFilterService',
+    SavedFilterRepositoryService,
+    FilterService,
+    FilterEvaluatorService,
+  ],
+})
+export class FilterModule {}

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

@@ -1,168 +1,168 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/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 {
-  constructor(
-    @InjectRepository(SavedFilterMaster)
-    private readonly savedFilterMasterRepo: Repository<SavedFilterMaster>,
-    @InjectRepository(SavedFilterDetail)
-    private readonly savedFilterDetailRepo: Repository<SavedFilterDetail>,
-    private readonly dataSource: DataSource,
-  ) {}
-
-  async isFilterNameExists({
-    name,
-    organization_id,
-    id,
-    level_type,
-    level_id,
-  }: any): Promise<boolean> {
-    const where: any = {
-      name,
-      organization_id: organization_id,
-      level_type: level_type,
-      level_id: level_id,
-    };
-    if (id) {
-      where.id = Not(id);
-    }
-
-    const existing = await this.savedFilterMasterRepo.findOne({ where });
-    return !!existing;
-  }
-
-  async getDetailsByCode(code: string) {
-    let data = await this.savedFilterDetailRepo.find({
-      where: { mapped_filter_code: code },
-    });
-    return data.map((detail) => ({
-      filter_attribute: detail.filter_attribute,
-      filter_operator: detail.filter_operator,
-      filter_attribute_data_type: detail.filter_attribute_data_type,
-      filter_attribute_name: detail.filter_attribute_name,
-      filter_entity_name: detail.filter_entity_name,
-      filter_entity_type: detail.filter_entity_type,
-      datasource_list: detail.datasource_list,
-      filter_value:
-        detail.data_type === 'multiselect'
-          ? detail.filter_value?.trim() === ''
-            ? []
-            : detail.filter_value.split(',')
-          : detail.filter_value,
-    }));
-  }
-
-  async deleteDetailsByCode(code: string): Promise<void> {
-    await this.savedFilterDetailRepo.delete({ mapped_filter_code: code });
-  }
-
-  async saveDetails(details: Partial<SavedFilterDetail>[]): Promise<void> {
-    const entities = this.savedFilterDetailRepo.create(details);
-    await this.savedFilterDetailRepo.save(entities);
-  }
-
-  async updateCode(id: number, code: string): Promise<void> {
-    await this.savedFilterMasterRepo.update(id, { code });
-  }
-
-  async getDefaultFilterByEntityType(
-    entityType: string,
-  ): Promise<{ label: string; value: number ,code: string} | null> {
-    const filter = await this.savedFilterMasterRepo.findOne({
-      where: {
-        mapped_entity_type: entityType,
-        is_default: true,
-      },
-    });
-
-    return filter ? { label: filter.name, value: filter.id , code: filter.code} : null;
-  }
-
-  async getSavedFiltersByUserIdAndEntityType(
-    userId: number,
-    entityType: string,
-  ) {
-    const filters = await this.savedFilterMasterRepo.find({
-      where: {
-        user_id: userId,
-        mapped_entity_type: entityType,
-        status: 'ACTIVE',
-      },
-      order: {
-        created_date: 'DESC',
-      },
-    });
-
-    return filters.map((filter) => ({
-      label: filter.name,
-      value: filter.id,
-      code: filter.code,
-    }));
-  }
-
-  async getFilterById(id: number): Promise<
-    {
-      filter_attribute: string;
-      filter_operator: string;
-      filter_value: any;
-    }[]
-  > {
-    const saveFilterMasterData = await this.savedFilterMasterRepo.findOne({
-      where: { id },
-    });
-
-    if (!saveFilterMasterData) return [];
-
-    const filterDetails = await this.savedFilterDetailRepo.find({
-      where: { mapped_filter_code: saveFilterMasterData.code },
-    });
-
-    return filterDetails.map((detail) => ({
-      filter_attribute: detail.filter_attribute,
-      filter_operator: detail.filter_operator,
-      filter_attribute_data_type: detail.filter_attribute_data_type,
-      filter_attribute_name: detail.filter_attribute_name,
-      filter_entity_name: detail.filter_entity_name,
-      filter_entity_type: detail.filter_entity_type,
-      datasource_list: detail.datasource_list,
-      filter_value:
-        detail.data_type === 'multiselect'
-          ? detail.filter_value?.trim() === ''
-            ? []
-            : detail.filter_value.split(',')
-          : detail.filter_value,
-    }));
-  }
-
-  async getSavedFilterByCode(
-    code: string,
-    loggedInUser: UserData,
-  ): Promise<any> {
-    const [filterMaster] = await this.dataSource.query(
-      `SELECT id, name, code 
-     FROM frm_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,
-    };
-  }
-}
+import { Inject, Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/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 {
+  constructor(
+    @InjectRepository(SavedFilterMaster)
+    private readonly savedFilterMasterRepo: Repository<SavedFilterMaster>,
+    @InjectRepository(SavedFilterDetail)
+    private readonly savedFilterDetailRepo: Repository<SavedFilterDetail>,
+    private readonly dataSource: DataSource,
+  ) {}
+
+  async isFilterNameExists({
+    name,
+    organization_id,
+    id,
+    level_type,
+    level_id,
+  }: any): Promise<boolean> {
+    const where: any = {
+      name,
+      organization_id: organization_id,
+      level_type: level_type,
+      level_id: level_id,
+    };
+    if (id) {
+      where.id = Not(id);
+    }
+
+    const existing = await this.savedFilterMasterRepo.findOne({ where });
+    return !!existing;
+  }
+
+  async getDetailsByCode(code: string) {
+    let data = await this.savedFilterDetailRepo.find({
+      where: { mapped_filter_code: code },
+    });
+    return data.map((detail) => ({
+      filter_attribute: detail.filter_attribute,
+      filter_operator: detail.filter_operator,
+      filter_attribute_data_type: detail.filter_attribute_data_type,
+      filter_attribute_name: detail.filter_attribute_name,
+      filter_entity_name: detail.filter_entity_name,
+      filter_entity_type: detail.filter_entity_type,
+      datasource_list: detail.datasource_list,
+      filter_value:
+        detail.data_type === 'multiselect'
+          ? detail.filter_value?.trim() === ''
+            ? []
+            : detail.filter_value.split(',')
+          : detail.filter_value,
+    }));
+  }
+
+  async deleteDetailsByCode(code: string): Promise<void> {
+    await this.savedFilterDetailRepo.delete({ mapped_filter_code: code });
+  }
+
+  async saveDetails(details: Partial<SavedFilterDetail>[]): Promise<void> {
+    const entities = this.savedFilterDetailRepo.create(details);
+    await this.savedFilterDetailRepo.save(entities);
+  }
+
+  async updateCode(id: number, code: string): Promise<void> {
+    await this.savedFilterMasterRepo.update(id, { code });
+  }
+
+  async getDefaultFilterByEntityType(
+    entityType: string,
+  ): Promise<{ label: string; value: number ,code: string} | null> {
+    const filter = await this.savedFilterMasterRepo.findOne({
+      where: {
+        mapped_entity_type: entityType,
+        is_default: true,
+      },
+    });
+
+    return filter ? { label: filter.name, value: filter.id , code: filter.code} : null;
+  }
+
+  async getSavedFiltersByUserIdAndEntityType(
+    userId: number,
+    entityType: string,
+  ) {
+    const filters = await this.savedFilterMasterRepo.find({
+      where: {
+        user_id: userId,
+        mapped_entity_type: entityType,
+        status: 'ACTIVE',
+      },
+      order: {
+        created_date: 'DESC',
+      },
+    });
+
+    return filters.map((filter) => ({
+      label: filter.name,
+      value: filter.id,
+      code: filter.code,
+    }));
+  }
+
+  async getFilterById(id: number): Promise<
+    {
+      filter_attribute: string;
+      filter_operator: string;
+      filter_value: any;
+    }[]
+  > {
+    const saveFilterMasterData = await this.savedFilterMasterRepo.findOne({
+      where: { id },
+    });
+
+    if (!saveFilterMasterData) return [];
+
+    const filterDetails = await this.savedFilterDetailRepo.find({
+      where: { mapped_filter_code: saveFilterMasterData.code },
+    });
+
+    return filterDetails.map((detail) => ({
+      filter_attribute: detail.filter_attribute,
+      filter_operator: detail.filter_operator,
+      filter_attribute_data_type: detail.filter_attribute_data_type,
+      filter_attribute_name: detail.filter_attribute_name,
+      filter_entity_name: detail.filter_entity_name,
+      filter_entity_type: detail.filter_entity_type,
+      datasource_list: detail.datasource_list,
+      filter_value:
+        detail.data_type === 'multiselect'
+          ? detail.filter_value?.trim() === ''
+            ? []
+            : detail.filter_value.split(',')
+          : detail.filter_value,
+    }));
+  }
+
+  async getSavedFilterByCode(
+    code: string,
+    loggedInUser: UserData,
+  ): Promise<any> {
+    const [filterMaster] = await this.dataSource.query(
+      `SELECT id, name, code 
+     FROM frm_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/filter-evaluator.service.ts

@@ -1,86 +1,86 @@
-import { Injectable } from '@nestjs/common';
-import { DataSource } from 'typeorm';
-import { SavedFilterDetail } from 'src/module/filter/entity/saved-filter-detail.entity';
-import { FilterService } from './filter.service';
-
-@Injectable()
-export class FilterEvaluatorService {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly filterService: FilterService,
-  ) {}
-
-  /**
-   * Check if any of the trigger attributes are modified in this event.
-   * @param oldEntity previous state
-   * @param newEntity new state
-   * @param savedFilterCode code of saved filter that contains trigger attributes
-   * @returns true if at least one trigger attribute changed (and optionally matches value)
-   */
-  async evaluateTriggerAttributes(
-    oldEntity: Record<string, any> | null,
-    newEntity: Record<string, any>,
-    savedFilterCode: string,
-  ): Promise<boolean> {
-    // Fetch trigger filter details
-    console.log('IN FILTER EVALUATOR SERVICE');
-    const triggerFilters: SavedFilterDetail[] = await this.dataSource.query(
-      `SELECT * 
-       FROM frm_saved_filter_detail 
-       WHERE mapped_filter_code = ?`,
-      [savedFilterCode],
-    );
-
-    // If no trigger filters defined, just return true (so criteria can run)
-    if (!triggerFilters || triggerFilters.length === 0) {
-      return true;
-    }
-
-    const oldState = oldEntity || {};
-
-    // Check each trigger attribute
-    for (const filter of triggerFilters) {
-      const attr = filter.filter_attribute;
-      const expectedValue = filter.filter_value;
-
-      const oldVal = oldState[attr];
-      const newVal = newEntity[attr];
-      // If value changed and (no expected value defined OR matches expected)
-      if (oldVal !== newVal && (!expectedValue || newVal == expectedValue)) {
-        return true;
-      }
-    }
-
-    // No trigger attribute matched
-    return false;
-  }
-
-  /**
-   * Evaluate the criteria for an entity using the filter service
-   * @param entityType type of entity
-   * @param entityId id of entity to evaluate
-   * @param criteriaFilterCode saved filter code for criteria
-   * @param filterService instance of your FilterService
-   */
-  async evaluateCriteria(
-    entityType: string,
-    criteriaFilterCode: string,
-    entityId: number,
-    loggedInUser: any,
-  ): Promise<boolean> {
-    if (!criteriaFilterCode) return true; // no criteria = always true
-
-    const filterRequest = {
-      entity_type: entityType,
-      savedFilterCode: criteriaFilterCode,
-      queryParams: { id: entityId },
-      page: 1,
-      size: 1,
-      loggedInUser: loggedInUser || { organization_id: null },
-    } as any;
-
-    const result = await this.filterService.applyFilterWrapper(filterRequest);
-
-    return result?.data?.entity_list?.length > 0;
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { SavedFilterDetail } from 'src/module/filter/entity/saved-filter-detail.entity';
+import { FilterService } from './filter.service';
+
+@Injectable()
+export class FilterEvaluatorService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly filterService: FilterService,
+  ) {}
+
+  /**
+   * Check if any of the trigger attributes are modified in this event.
+   * @param oldEntity previous state
+   * @param newEntity new state
+   * @param savedFilterCode code of saved filter that contains trigger attributes
+   * @returns true if at least one trigger attribute changed (and optionally matches value)
+   */
+  async evaluateTriggerAttributes(
+    oldEntity: Record<string, any> | null,
+    newEntity: Record<string, any>,
+    savedFilterCode: string,
+  ): Promise<boolean> {
+    // Fetch trigger filter details
+    console.log('IN FILTER EVALUATOR SERVICE');
+    const triggerFilters: SavedFilterDetail[] = await this.dataSource.query(
+      `SELECT * 
+       FROM frm_saved_filter_detail 
+       WHERE mapped_filter_code = ?`,
+      [savedFilterCode],
+    );
+
+    // If no trigger filters defined, just return true (so criteria can run)
+    if (!triggerFilters || triggerFilters.length === 0) {
+      return true;
+    }
+
+    const oldState = oldEntity || {};
+
+    // Check each trigger attribute
+    for (const filter of triggerFilters) {
+      const attr = filter.filter_attribute;
+      const expectedValue = filter.filter_value;
+
+      const oldVal = oldState[attr];
+      const newVal = newEntity[attr];
+      // If value changed and (no expected value defined OR matches expected)
+      if (oldVal !== newVal && (!expectedValue || newVal == expectedValue)) {
+        return true;
+      }
+    }
+
+    // No trigger attribute matched
+    return false;
+  }
+
+  /**
+   * Evaluate the criteria for an entity using the filter service
+   * @param entityType type of entity
+   * @param entityId id of entity to evaluate
+   * @param criteriaFilterCode saved filter code for criteria
+   * @param filterService instance of your FilterService
+   */
+  async evaluateCriteria(
+    entityType: string,
+    criteriaFilterCode: string,
+    entityId: number,
+    loggedInUser: any,
+  ): Promise<boolean> {
+    if (!criteriaFilterCode) return true; // no criteria = always true
+
+    const filterRequest = {
+      entity_type: entityType,
+      savedFilterCode: criteriaFilterCode,
+      queryParams: { id: entityId },
+      page: 1,
+      size: 1,
+      loggedInUser: loggedInUser || { organization_id: null },
+    } as any;
+
+    const result = await this.filterService.applyFilterWrapper(filterRequest);
+
+    return result?.data?.entity_list?.length > 0;
+  }
+}