rez_core 7.0.13 → 7.1.1

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

@@ -1,214 +1,214 @@
-import {
-  Controller,
-  Post,
-  Body,
-  Query,
-  ParseIntPipe,
-  Get,
-  Param,
-  Inject,
-  UseGuards,
-  Req, HttpCode, HttpStatus,
-} from '@nestjs/common';
-import { FilterService } from '../service/filter.service';
-import { SavedFilterService } from '../service/saved-filter.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-
-@Controller('filter')
-export class FilterController {
-  constructor(
-    private readonly filterService: FilterService,
-    @Inject('SavedFilterService')
-    private readonly savedFilterService: SavedFilterService,
-  ) {}
-
-  @Post()
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async applyFilter(
-    @Body() body: any,
-    @Query('page', ParseIntPipe) page = 1,
-    @Query('size', ParseIntPipe) size = 10,
-    @Req() req: Request & { user: any },
-    @Query() queryParams: Record<string, string>,
-    @Query('level_type') levelType?: string,
-    @Query('level_id') levelId?: number,
-    @Query('appcode') appCode?: string,
-  ) {
-    const loggedInUser = req.user.userData;
-
-    // Remove page and size from queryParams
-    const { page: _p, size: _s, ...otherQueryParams } = queryParams;
-
-    const {
-      entity_type,
-      quickFilter,
-      savedFilterCode,
-      attributeFilter,
-      tabs,
-      sortby,
-      defaultfilter,
-    } = body;
-
-    
-
-    return this.filterService.applyFilterWrapper({
-      entity_type,
-      quickFilter,
-      savedFilterCode,
-      attributeFilter,
-      tabs,
-      sortby,
-      page,
-      size,
-      loggedInUser,
-      queryParams: otherQueryParams, // only remaining query params
-      customLevelType: levelType,
-      customLevelId: levelId,
-      customAppCode: appCode,
-      defaultfilter,
-    });
-  }
-
-  @Get(':id')
-  @HttpCode(HttpStatus.OK)
-  async getFilterById(@Param('id') id: string) {
-    return this.savedFilterService.getFilterById(Number(id));
-  }
-
-  @Get('getsavedfilterbycode/:code')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getSavedFilterByCode(
-    @Param('code') code: string,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-    return this.savedFilterService.getSavedFilterByCode(code, loggedInUser);
-  }
-
-  // ========== NEW HIERARCHICAL FILTER ENDPOINTS ==========
-
-  /**
-   * Test endpoint for GetFilterData (Core query builder)
-   * POST /filter/get-filter-data
-   * Body: {
-   *   entity_type: string,
-   *   filterConditions?: FilterCondition[],
-   *   sortColumns?: { column: string, order: 'ASC' | 'DESC' }[],
-   *   columns?: string[],
-   *   flatJson?: boolean,
-   *   ids?: number[],
-   *   pagination?: { page: number, size: number }
-   * }
-   */
-  @Post('get-filter-data')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getFilterData(
-    @Body() body: any,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-    const {
-      entity_type,
-      filterConditions = [],
-      sortColumns = [],
-      columns = [],
-      flatJson = false,
-      ids = [],
-      pagination,
-    } = body;
-
-    return this.filterService.GetFilterData(
-      entity_type,
-      filterConditions,
-      sortColumns,
-      columns,
-      flatJson,
-      ids,
-      pagination,
-      loggedInUser,
-    );
-  }
-
-  /**
-   * Test endpoint for GetFilterDataInternal (Filter aggregation)
-   * POST /filter/get-filter-data-internal
-   * Body: {
-   *   entity_type: string,
-   *   filterCode?: string,
-   *   quickFilter?: FilterCondition[],
-   *   columns?: string[],
-   *   flatJson?: boolean,
-   *   ids?: number[]
-   * }
-   */
-  @Post('get-filter-data-internal')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getFilterDataInternal(
-    @Body() body: any,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-    const {
-      entity_type,
-      filterCode,
-      quickFilter = [],
-      columns = [],
-      flatJson = false,
-      ids = [],
-    } = body;
-
-    return this.filterService.GetFilterDataInternal(
-      entity_type,
-      filterCode,
-      quickFilter,
-      columns,
-      flatJson,
-      ids,
-      loggedInUser,
-    );
-  }
-
-  /**
-   * Test endpoint for GetFilterDataForListing (UI layer with layout preferences)
-   * POST /filter/get-filter-data-for-listing
-   * Body: {
-   *   entity_type: string,
-   *   quickFilter?: FilterCondition[],
-   *   filterCode?: string,
-   *   attributeFilter?: FilterCondition[],
-   *   sortColumn?: { column: string, order: 'ASC' | 'DESC' },
-   *   pagination?: { page: number, size: number }
-   * }
-   */
-  @Post('get-filter-data-for-listing')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getFilterDataForListing(
-    @Body() body: any,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-    const {
-      entity_type,
-      quickFilter = [],
-      filterCode,
-      attributeFilter = [],
-      sortColumn,
-      pagination,
-    } = body;
-
-    return this.filterService.GetFilterDataForListing(
-      entity_type,
-      quickFilter,
-      filterCode,
-      attributeFilter,
-      sortColumn,
-      pagination,
-      loggedInUser,
-    );
-  }
-}
+import {
+  Controller,
+  Post,
+  Body,
+  Query,
+  ParseIntPipe,
+  Get,
+  Param,
+  Inject,
+  UseGuards,
+  Req, HttpCode, HttpStatus,
+} from '@nestjs/common';
+import { FilterService } from '../service/filter.service';
+import { SavedFilterService } from '../service/saved-filter.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('filter')
+export class FilterController {
+  constructor(
+    private readonly filterService: FilterService,
+    @Inject('SavedFilterService')
+    private readonly savedFilterService: SavedFilterService,
+  ) {}
+
+  @Post()
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async applyFilter(
+    @Body() body: any,
+    @Query('page', ParseIntPipe) page = 1,
+    @Query('size', ParseIntPipe) size = 10,
+    @Req() req: Request & { user: any },
+    @Query() queryParams: Record<string, string>,
+    @Query('level_type') levelType?: string,
+    @Query('level_id') levelId?: number,
+    @Query('appcode') appCode?: string,
+  ) {
+    const loggedInUser = req.user.userData;
+
+    // Remove page and size from queryParams
+    const { page: _p, size: _s, ...otherQueryParams } = queryParams;
+
+    const {
+      entity_type,
+      quickFilter,
+      savedFilterCode,
+      attributeFilter,
+      tabs,
+      sortby,
+      defaultfilter,
+    } = body;
+
+    
+
+    return this.filterService.applyFilterWrapper({
+      entity_type,
+      quickFilter,
+      savedFilterCode,
+      attributeFilter,
+      tabs,
+      sortby,
+      page,
+      size,
+      loggedInUser,
+      queryParams: otherQueryParams, // only remaining query params
+      customLevelType: levelType,
+      customLevelId: levelId,
+      customAppCode: appCode,
+      defaultfilter,
+    });
+  }
+
+  @Get(':id')
+  @HttpCode(HttpStatus.OK)
+  async getFilterById(@Param('id') id: string) {
+    return this.savedFilterService.getFilterById(Number(id));
+  }
+
+  @Get('getsavedfilterbycode/:code')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getSavedFilterByCode(
+    @Param('code') code: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    return this.savedFilterService.getSavedFilterByCode(code, loggedInUser);
+  }
+
+  // ========== NEW HIERARCHICAL FILTER ENDPOINTS ==========
+
+  /**
+   * Test endpoint for GetFilterData (Core query builder)
+   * POST /filter/get-filter-data
+   * Body: {
+   *   entity_type: string,
+   *   filterConditions?: FilterCondition[],
+   *   sortColumns?: { column: string, order: 'ASC' | 'DESC' }[],
+   *   columns?: string[],
+   *   flatJson?: boolean,
+   *   ids?: number[],
+   *   pagination?: { page: number, size: number }
+   * }
+   */
+  @Post('get-filter-data')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getFilterData(
+    @Body() body: any,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const {
+      entity_type,
+      filterConditions = [],
+      sortColumns = [],
+      columns = [],
+      flatJson = false,
+      ids = [],
+      pagination,
+    } = body;
+
+    return this.filterService.GetFilterData(
+      entity_type,
+      filterConditions,
+      sortColumns,
+      columns,
+      flatJson,
+      ids,
+      pagination,
+      loggedInUser,
+    );
+  }
+
+  /**
+   * Test endpoint for GetFilterDataInternal (Filter aggregation)
+   * POST /filter/get-filter-data-internal
+   * Body: {
+   *   entity_type: string,
+   *   filterCode?: string,
+   *   quickFilter?: FilterCondition[],
+   *   columns?: string[],
+   *   flatJson?: boolean,
+   *   ids?: number[]
+   * }
+   */
+  @Post('get-filter-data-internal')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getFilterDataInternal(
+    @Body() body: any,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const {
+      entity_type,
+      filterCode,
+      quickFilter = [],
+      columns = [],
+      flatJson = false,
+      ids = [],
+    } = body;
+
+    return this.filterService.GetFilterDataInternal(
+      entity_type,
+      filterCode,
+      quickFilter,
+      columns,
+      flatJson,
+      ids,
+      loggedInUser,
+    );
+  }
+
+  /**
+   * Test endpoint for GetFilterDataForListing (UI layer with layout preferences)
+   * POST /filter/get-filter-data-for-listing
+   * Body: {
+   *   entity_type: string,
+   *   quickFilter?: FilterCondition[],
+   *   filterCode?: string,
+   *   attributeFilter?: FilterCondition[],
+   *   sortColumn?: { column: string, order: 'ASC' | 'DESC' },
+   *   pagination?: { page: number, size: number }
+   * }
+   */
+  @Post('get-filter-data-for-listing')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getFilterDataForListing(
+    @Body() body: any,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const {
+      entity_type,
+      quickFilter = [],
+      filterCode,
+      attributeFilter = [],
+      sortColumn,
+      pagination,
+    } = body;
+
+    return this.filterService.GetFilterDataForListing(
+      entity_type,
+      quickFilter,
+      filterCode,
+      attributeFilter,
+      sortColumn,
+      pagination,
+      loggedInUser,
+    );
+  }
+}

package/src/module/filter/dto/filter-request.dto.ts

@@ -1,41 +1,41 @@
-import { UserData } from 'src/module/auth/dto/user.dto';
-
-
-// src/module/filter/dto/filter-request.dto.ts
-export interface FilterCondition {
-  filter_entity_type: string; // main or sub-entity code (e.g. LEAD, CONTACT, ORG)
-  filter_attribute: string;
-  filter_operator: string;
-  filter_value?: string | number | boolean | (string | number | boolean)[];
-  filter_attribute_name?: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
-  filter_attribute_data_type?: string;
-  filter_entity_name?: string;  
-  datasource_list?: string; // NEW - for attributes from different datasource
-}
-
-export interface TabsConfig {
-  columnName: string;
-  value: string;
-  sortBy?: 'ASC' | 'DSC';
-}
-export interface SortConfig {
-  sortColum: string;
-  sortType: 'ASC' | 'DSC';
-}
-export interface FilterRequestDto {
-  entity_type: string;
-  quickFilter?: FilterCondition[];
-  savedFilterCode?: string | null ;
-  attributeFilter?: FilterCondition[];
-  sortby?: SortConfig[];
-  tabs?: TabsConfig;
-  page?: number|null;
-  size?: number|null;
-  loggedInUser: UserData;
-  queryParams?: Record<string, string>;
-  customLevelType?: string;
-  customLevelId?: number;
-  customAppCode?: string;
-  view?: string;
-  defaultfilter?: string;
-}
+import { UserData } from 'src/module/auth/dto/user.dto';
+
+
+// src/module/filter/dto/filter-request.dto.ts
+export interface FilterCondition {
+  filter_entity_type: string; // main or sub-entity code (e.g. LEAD, CONTACT, ORG)
+  filter_attribute: string;
+  filter_operator: string;
+  filter_value?: string | number | boolean | (string | number | boolean)[];
+  filter_attribute_name?: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
+  filter_attribute_data_type?: string;
+  filter_entity_name?: string;  
+  datasource_list?: string; // NEW - for attributes from different datasource
+}
+
+export interface TabsConfig {
+  columnName: string;
+  value: string;
+  sortBy?: 'ASC' | 'DSC';
+}
+export interface SortConfig {
+  sortColum: string;
+  sortType: 'ASC' | 'DSC';
+}
+export interface FilterRequestDto {
+  entity_type: string;
+  quickFilter?: FilterCondition[];
+  savedFilterCode?: string | null ;
+  attributeFilter?: FilterCondition[];
+  sortby?: SortConfig[];
+  tabs?: TabsConfig;
+  page?: number|null;
+  size?: number|null;
+  loggedInUser: UserData;
+  queryParams?: Record<string, string>;
+  customLevelType?: string;
+  customLevelId?: number;
+  customAppCode?: string;
+  view?: string;
+  defaultfilter?: string;
+}

package/src/module/filter/entity/saved-filter-detail.entity.ts

@@ -1,37 +1,37 @@
-import { ENTITYTYPE_SAVEDFILTERDETAIL } from 'src/constant/global.constant';
-import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity } from 'typeorm';
-
-@Entity({ name: 'frm_saved_filter_detail' })
-export class SavedFilterDetail extends BaseEntity {
-
-  @Column({ nullable: true })
-  mapped_filter_code: string; // links to SavedFilterMaster.code (manual, not FK)
-
-  @Column({ nullable: true })
-  filter_entity_type: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
-
-  @Column({ nullable: true })
-  filter_attribute: string;
-
-  @Column({ nullable: true })
-  filter_operator: string;
-
-  @Column({ nullable: true })
-  filter_attribute_name: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
-
-  @Column({ nullable: true })
-  filter_attribute_data_type: string;
-
-  @Column({ nullable: true })
-  filter_entity_name: string;
-
-  @Column({ nullable: true })
-  filter_value: string;
-
-  @Column({ nullable: true })
-  data_type: string;
-
-  @Column({ nullable: true })
-  datasource_list: string;
-}
+import { ENTITYTYPE_SAVEDFILTERDETAIL } from 'src/constant/global.constant';
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'frm_saved_filter_detail' })
+export class SavedFilterDetail extends BaseEntity {
+
+  @Column({ nullable: true })
+  mapped_filter_code: string; // links to SavedFilterMaster.code (manual, not FK)
+
+  @Column({ nullable: true })
+  filter_entity_type: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
+
+  @Column({ nullable: true })
+  filter_attribute: string;
+
+  @Column({ nullable: true })
+  filter_operator: string;
+
+  @Column({ nullable: true })
+  filter_attribute_name: string; // NEW - main/sub entity type (e.g. LEAD, CONTACT, ORG)
+
+  @Column({ nullable: true })
+  filter_attribute_data_type: string;
+
+  @Column({ nullable: true })
+  filter_entity_name: string;
+
+  @Column({ nullable: true })
+  filter_value: string;
+
+  @Column({ nullable: true })
+  data_type: string;
+
+  @Column({ nullable: true })
+  datasource_list: string;
+}

package/src/module/filter/entity/saved-filter-master.entity.ts

@@ -1,30 +1,30 @@
-import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity } from 'typeorm';
-
-@Entity({ name: 'frm_saved_filter_master' })
-export class SavedFilterMaster extends BaseEntity {
-
-  @Column({ length: 50, type: 'varchar', nullable: true })
-  mapped_entity_type: string;
-
-  @Column({ type: 'int', nullable: true })
-  user_id: number;
-
-  @Column({ type: 'boolean', default: false, nullable: true })
-  is_default: boolean;
-
-  @Column({ type: 'varchar', length: 20, default: 'FILTER', nullable: true })
-  filter_scope: 'FILTER' | 'RULE';
-
-  @Column({ type: 'boolean', default: false, nullable: true })
-  is_shared: boolean;
-
-  @Column({ type: 'boolean', default: false, nullable: true })
-  is_editable: boolean;
-
-  @Column({ type: 'boolean', default: false, nullable: true })
-  is_owner: boolean;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  description: string;
-}
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'frm_saved_filter_master' })
+export class SavedFilterMaster extends BaseEntity {
+
+  @Column({ length: 50, type: 'varchar', nullable: true })
+  mapped_entity_type: string;
+
+  @Column({ type: 'int', nullable: true })
+  user_id: number;
+
+  @Column({ type: 'boolean', default: false, nullable: true })
+  is_default: boolean;
+
+  @Column({ type: 'varchar', length: 20, default: 'FILTER', nullable: true })
+  filter_scope: 'FILTER' | 'RULE';
+
+  @Column({ type: 'boolean', default: false, nullable: true })
+  is_shared: boolean;
+
+  @Column({ type: 'boolean', default: false, nullable: true })
+  is_editable: boolean;
+
+  @Column({ type: 'boolean', default: false, nullable: true })
+  is_owner: boolean;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  description: string;
+}