rez_core 4.0.151 → 4.0.152

package/src/module/enterprise/service/organization.service.ts

@@ -1,145 +1,145 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
-import { EntityManager, IsNull, Repository } from 'typeorm';
-import { OrganizationData } from '../entity/organization.entity';
-// import { BrandRepository } from '../repository/brand.repository';
-import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
-import { SchoolRepository } from '../repository/school.repository';
-
-@Injectable()
-export class OrganizationService {
-  constructor(
-    @InjectRepository(OrganizationData)
-    private readonly organizationRepository: Repository<OrganizationData>,
-    private readonly idGen: ClockIDGenService,
-    private readonly wbcCodeGenService: WBSCodeGenService,
-    private readonly schoolRepository: SchoolRepository,
-  ) {}
-
-  async create(
-    organizationDto: Partial<OrganizationData>,
-    manager?: EntityManager,
-  ): Promise<OrganizationData> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    const isBrand = organizationDto.type === 'BRN';
-
-    if (isBrand) {
-      // BRN case
-      const parentOrgId = organizationDto.parent_id;
-
-      if (!parentOrgId) {
-        throw new Error('Parent Org ID is required to create a brand.');
-      }
-
-      const parentOrg = await repo.findOne({
-        where: { id: parentOrgId },
-      });
-
-      if (!parentOrg) {
-        throw new Error('Parent organization not found.');
-      }
-
-      const existingBrands = await repo.find({
-        where: {
-          type: 'BRN',
-          parent_id: parentOrgId,
-        },
-        select: ['wbs_code'],
-      });
-
-      const brandCodes = existingBrands
-        .map((b) => b.wbs_code?.split('.')[1])
-        .filter(Boolean)
-        .map(Number);
-
-      const nextBrnCode = brandCodes.length ? Math.max(...brandCodes) + 1 : 1;
-
-      const brnWbsCode = this.wbcCodeGenService.padCode(nextBrnCode);
-      organizationDto.wbs_code = `${parentOrg.wbs_code}.${brnWbsCode}`;
-    } else {
-      // ORG case
-      const existingOrgs = await repo.find({
-        where: {
-          type: IsNull(),
-        },
-        select: ['wbs_code'],
-      });
-
-      const orgCodes = existingOrgs
-        .map((org) => org.wbs_code)
-        .filter(Boolean)
-        .map(Number);
-
-      const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
-
-      organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
-    }
-
-    organizationDto.code = this.idGen.idGenerator('ORG');
-    // organizationDto.status = 'ACTIVE';
-    organizationDto.created_date = new Date();
-
-    const organization = repo.create(organizationDto);
-    return await repo.save(organization);
-  }
-
-  async findAll(manager?: EntityManager): Promise<OrganizationData[]> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    return await repo.find();
-  }
-
-  async findOne(
-    id: number,
-    manager?: EntityManager,
-  ): Promise<OrganizationData | null> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    return await repo.findOne({ where: { id } });
-  }
-
-  async findById(id: number | undefined) {
-    return await this.organizationRepository.find({ where: { id } });
-  }
-
-  async update(
-    id: number,
-    organizationDto: Partial<OrganizationData>,
-    manager?: EntityManager,
-  ): Promise<OrganizationData | null> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    await repo.update(id, organizationDto);
-    return await repo.findOne({ where: { id } });
-  }
-
-  async remove(id: number, manager?: EntityManager): Promise<void> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
-
-    await repo.delete(id);
-  }
-
-  async getOrganizationHierarchy(
-    userId: number,
-    appCode: string,
-    orgId: number,
-  ) {
-    return await this.schoolRepository.getUserContextDropdown(
-      userId,
-      appCode,
-      orgId,
-    );
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
+import { EntityManager, IsNull, Repository } from 'typeorm';
+import { OrganizationData } from '../entity/organization.entity';
+// import { BrandRepository } from '../repository/brand.repository';
+import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
+import { SchoolRepository } from '../repository/school.repository';
+
+@Injectable()
+export class OrganizationService {
+  constructor(
+    @InjectRepository(OrganizationData)
+    private readonly organizationRepository: Repository<OrganizationData>,
+    private readonly idGen: ClockIDGenService,
+    private readonly wbcCodeGenService: WBSCodeGenService,
+    private readonly schoolRepository: SchoolRepository,
+  ) {}
+
+  async create(
+    organizationDto: Partial<OrganizationData>,
+    manager?: EntityManager,
+  ): Promise<OrganizationData> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    const isBrand = organizationDto.type === 'BRN';
+
+    if (isBrand) {
+      // BRN case
+      const parentOrgId = organizationDto.parent_id;
+
+      if (!parentOrgId) {
+        throw new Error('Parent Org ID is required to create a brand.');
+      }
+
+      const parentOrg = await repo.findOne({
+        where: { id: parentOrgId },
+      });
+
+      if (!parentOrg) {
+        throw new Error('Parent organization not found.');
+      }
+
+      const existingBrands = await repo.find({
+        where: {
+          type: 'BRN',
+          parent_id: parentOrgId,
+        },
+        select: ['wbs_code'],
+      });
+
+      const brandCodes = existingBrands
+        .map((b) => b.wbs_code?.split('.')[1])
+        .filter(Boolean)
+        .map(Number);
+
+      const nextBrnCode = brandCodes.length ? Math.max(...brandCodes) + 1 : 1;
+
+      const brnWbsCode = this.wbcCodeGenService.padCode(nextBrnCode);
+      organizationDto.wbs_code = `${parentOrg.wbs_code}.${brnWbsCode}`;
+    } else {
+      // ORG case
+      const existingOrgs = await repo.find({
+        where: {
+          type: IsNull(),
+        },
+        select: ['wbs_code'],
+      });
+
+      const orgCodes = existingOrgs
+        .map((org) => org.wbs_code)
+        .filter(Boolean)
+        .map(Number);
+
+      const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
+
+      organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
+    }
+
+    organizationDto.code = this.idGen.idGenerator('ORG');
+    // organizationDto.status = 'ACTIVE';
+    organizationDto.created_date = new Date();
+
+    const organization = repo.create(organizationDto);
+    return await repo.save(organization);
+  }
+
+  async findAll(manager?: EntityManager): Promise<OrganizationData[]> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    return await repo.find();
+  }
+
+  async findOne(
+    id: number,
+    manager?: EntityManager,
+  ): Promise<OrganizationData | null> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    return await repo.findOne({ where: { id } });
+  }
+
+  async findById(id: number | undefined) {
+    return await this.organizationRepository.find({ where: { id } });
+  }
+
+  async update(
+    id: number,
+    organizationDto: Partial<OrganizationData>,
+    manager?: EntityManager,
+  ): Promise<OrganizationData | null> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    await repo.update(id, organizationDto);
+    return await repo.findOne({ where: { id } });
+  }
+
+  async remove(id: number, manager?: EntityManager): Promise<void> {
+    const repo = manager
+      ? manager.getRepository(OrganizationData)
+      : this.organizationRepository;
+
+    await repo.delete(id);
+  }
+
+  async getOrganizationHierarchy(
+    userId: number,
+    appCode: string,
+    orgId: number,
+  ) {
+    return await this.schoolRepository.getUserContextDropdown(
+      userId,
+      appCode,
+      orgId,
+    );
+  }
+}

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

@@ -1,84 +1,84 @@
-import {
-  Controller,
-  Post,
-  Body,
-  Query,
-  ParseIntPipe,
-  Get,
-  Param,
-  Inject,
-  UseGuards,
-  Req,
-} 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)
-  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,
-    } = 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,
-    });
-  }
-
-  @Get(':id')
-  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);
-  }
-}
+import {
+  Controller,
+  Post,
+  Body,
+  Query,
+  ParseIntPipe,
+  Get,
+  Param,
+  Inject,
+  UseGuards,
+  Req,
+} 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)
+  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,
+    } = 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,
+    });
+  }
+
+  @Get(':id')
+  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/dto/filter-request.dto.ts

@@ -1,38 +1,38 @@
-import { UserData } from 'src/module/user/entity/user.entity';
-
-// 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;
-  size?: number;
-  loggedInUser: UserData;
-  queryParams?: Record<string, string>;
-  customLevelType?: string;
-  customLevelId?: number;
-  customAppCode?: string;
-}
+import { UserData } from 'src/module/user/entity/user.entity';
+
+// 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;
+  size?: number;
+  loggedInUser: UserData;
+  queryParams?: Record<string, string>;
+  customLevelType?: string;
+  customLevelId?: number;
+  customAppCode?: string;
+}

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

@@ -1,41 +1,41 @@
-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 {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_SAVEDFILTERDETAIL;
-  }
-
-  @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 {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_SAVEDFILTERDETAIL;
+  }
+
+  @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,23 +1,23 @@
-import { ENTITYTYPE_SAVEDFILTERMASTER } 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_master' })
-export class SavedFilterMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_SAVEDFILTERMASTER;
-  }
-
-  @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';
-}
+import { ENTITYTYPE_SAVEDFILTERMASTER } 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_master' })
+export class SavedFilterMaster extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_SAVEDFILTERMASTER;
+  }
+
+  @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';
+}