rez_core 4.0.114 → 4.0.115

package/src/module/lead/lead.module.ts

@@ -1,14 +1,14 @@
-import { Module } from '@nestjs/common';
-import { LeadController } from './controller/lead.controller';
-import { LeadService } from './service/lead.service';
-import { LeadRepository } from './repository/lead.repository';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { OrganizationData } from '../enterprise/entity/organization.entity';
-
-@Module({
-  imports: [TypeOrmModule.forFeature([OrganizationData])],
-  providers: [LeadService, LeadRepository],
-  controllers: [],
-  exports: [LeadService],
-})
-export class LeadModule {}
+import { Module } from '@nestjs/common';
+import { LeadController } from './controller/lead.controller';
+import { LeadService } from './service/lead.service';
+import { LeadRepository } from './repository/lead.repository';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { OrganizationData } from '../enterprise/entity/organization.entity';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([OrganizationData])],
+  providers: [LeadService, LeadRepository],
+  controllers: [],
+  exports: [LeadService],
+})
+export class LeadModule {}

package/src/module/lead/repository/lead.repository.ts

@@ -1,41 +1,41 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-// import { BrandData } from 'src/module/enterprise/entity/brand.entity';
-import { OrganizationData } from 'src/module/enterprise/entity/organization.entity';
-// import { SchoolData } from 'src/module/enterprise/entity/school.entity';
-import { DataSource, Repository } from 'typeorm';
-
-@Injectable()
-export class LeadRepository {
-  constructor(
-    @InjectRepository(OrganizationData)
-    private organizationRepository: Repository<OrganizationData>,
-    private readonly dataSource: DataSource,
-  ) {}
-
-  async getAllOrganizations(): Promise<OrganizationData[]> {
-    return this.organizationRepository.find();
-  }
-
-  async getBrandsByOrganization(organization_id: number): Promise<any[]> {
-    return await this.dataSource
-      .createQueryBuilder()
-      .select(['*'])
-      .from('eth_brand_profile', 'brd')
-      .where('brd.organization_id = :orgId', { orgId: organization_id })
-      .getRawMany();
-  }
-
-  async getSchoolsByBrandAndOrganization(
-    brand_id: number,
-    organization_id: number,
-  ): Promise<any[]> {
-    return await this.dataSource
-      .createQueryBuilder()
-      .select(['*'])
-      .from('sso_school', 'sch')
-      .where('sch.brand_id = :brdId', { brdId: brand_id })
-      .andWhere('sch.organization_id = :orgId', { orgId: organization_id })
-      .getRawMany();
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+// import { BrandData } from 'src/module/enterprise/entity/brand.entity';
+import { OrganizationData } from 'src/module/enterprise/entity/organization.entity';
+// import { SchoolData } from 'src/module/enterprise/entity/school.entity';
+import { DataSource, Repository } from 'typeorm';
+
+@Injectable()
+export class LeadRepository {
+  constructor(
+    @InjectRepository(OrganizationData)
+    private organizationRepository: Repository<OrganizationData>,
+    private readonly dataSource: DataSource,
+  ) {}
+
+  async getAllOrganizations(): Promise<OrganizationData[]> {
+    return this.organizationRepository.find();
+  }
+
+  async getBrandsByOrganization(organization_id: number): Promise<any[]> {
+    return await this.dataSource
+      .createQueryBuilder()
+      .select(['*'])
+      .from('eth_brand_profile', 'brd')
+      .where('brd.organization_id = :orgId', { orgId: organization_id })
+      .getRawMany();
+  }
+
+  async getSchoolsByBrandAndOrganization(
+    brand_id: number,
+    organization_id: number,
+  ): Promise<any[]> {
+    return await this.dataSource
+      .createQueryBuilder()
+      .select(['*'])
+      .from('sso_school', 'sch')
+      .where('sch.brand_id = :brdId', { brdId: brand_id })
+      .andWhere('sch.organization_id = :orgId', { orgId: organization_id })
+      .getRawMany();
+  }
+}

package/src/module/lead/service/lead.service.ts

@@ -1,54 +1,54 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { LeadRepository } from '../repository/lead.repository';
-
-@Injectable()
-export class LeadService {
-  constructor(private readonly leadRepository: LeadRepository) {}
-
-  async getAllOrganizations() {
-    const organizations = await this.leadRepository.getAllOrganizations();
-    return organizations.map((org) => ({
-      id: org.id,
-      name: org.name,
-      // Add other organization fields as needed
-    }));
-  }
-
-  async getBrandsByOrganization(organizationId: number) {
-    const brands =
-      await this.leadRepository.getBrandsByOrganization(organizationId);
-    if (!brands.length) {
-      throw new NotFoundException(
-        `No brands found for organization ID ${organizationId}`,
-      );
-    }
-    return brands.map((brand) => ({
-      id: brand.id,
-      name: brand.name,
-      organizationId: brand.organization_id,
-      // Add other brand fields as needed
-    }));
-  }
-
-  async getSchoolsByBrandAndOrganization(
-    brandId: number,
-    organizationId: number,
-  ) {
-    const schools = await this.leadRepository.getSchoolsByBrandAndOrganization(
-      brandId,
-      organizationId,
-    );
-    if (!schools.length) {
-      throw new NotFoundException(
-        `No schools found for brand ID ${brandId} and organization ID ${organizationId}`,
-      );
-    }
-    return schools.map((school) => ({
-      id: school.id,
-      name: school.name,
-      brandId: school.brand_id,
-      organizationId: school.organization_id,
-      // Add other school fields as needed
-    }));
-  }
-}
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { LeadRepository } from '../repository/lead.repository';
+
+@Injectable()
+export class LeadService {
+  constructor(private readonly leadRepository: LeadRepository) {}
+
+  async getAllOrganizations() {
+    const organizations = await this.leadRepository.getAllOrganizations();
+    return organizations.map((org) => ({
+      id: org.id,
+      name: org.name,
+      // Add other organization fields as needed
+    }));
+  }
+
+  async getBrandsByOrganization(organizationId: number) {
+    const brands =
+      await this.leadRepository.getBrandsByOrganization(organizationId);
+    if (!brands.length) {
+      throw new NotFoundException(
+        `No brands found for organization ID ${organizationId}`,
+      );
+    }
+    return brands.map((brand) => ({
+      id: brand.id,
+      name: brand.name,
+      organizationId: brand.organization_id,
+      // Add other brand fields as needed
+    }));
+  }
+
+  async getSchoolsByBrandAndOrganization(
+    brandId: number,
+    organizationId: number,
+  ) {
+    const schools = await this.leadRepository.getSchoolsByBrandAndOrganization(
+      brandId,
+      organizationId,
+    );
+    if (!schools.length) {
+      throw new NotFoundException(
+        `No schools found for brand ID ${brandId} and organization ID ${organizationId}`,
+      );
+    }
+    return schools.map((school) => ({
+      id: school.id,
+      name: school.name,
+      brandId: school.brand_id,
+      organizationId: school.organization_id,
+      // Add other school fields as needed
+    }));
+  }
+}

package/src/module/listmaster/controller/list-master.controller.ts

@@ -1,230 +1,230 @@
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  HttpCode,
-  HttpStatus,
-  Inject,
-  Param,
-  Post,
-  Query,
-  Req,
-  Request,
-  UseGuards,
-} from '@nestjs/common';
-import { ListMasterService } from '../service/list-master.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { ListMasterItemService } from '../service/list-master-item.service';
-import { MessagePattern, Payload } from '@nestjs/microservices';
-
-@Controller('list-master')
-export class ListMasterController {
-  constructor(
-    @Inject('ListMasterService')
-    private readonly service: ListMasterService,
-    @Inject('ListMasterItemService')
-    private readonly listMasterItemService: ListMasterItemService,
-  ) {}
-
-  @Post('/getDropdownData/:type')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getDropdownDataO(
-    @Param('type') type: string,
-    @Query() queryParams: Record<string, string>,
-    @Request() req,
-  ) {
-    const { inactiveIds, ...params } = queryParams;
-
-    const inactiveIdsArray = inactiveIds
-      ? inactiveIds.split(',').map((id) => parseInt(id, 10))
-      : [];
-
-    const loggedInUser = req.user.userData;
-
-    return await this.service.getDropdownOptions(
-      type,
-      params,
-      inactiveIdsArray,
-      loggedInUser,
-    );
-  }
-
-  // Public/internal endpoint (no JWT required)
-  @Get('/getDropdownDataPublic/:type')
-  @HttpCode(HttpStatus.OK)
-  async getDropdownDataPublic(
-    @Param('type') type: string,
-    @Query() queryParams: Record<string, string>,
-  ) {
-    const {
-      inactiveIds,
-      loggedInUser: loggedInUserParam,
-      ...params
-    } = queryParams;
-
-    const inactiveIdsArray = inactiveIds
-      ? inactiveIds.split(',').map((id) => parseInt(id, 10))
-      : [];
-
-    // Default user object (if organization_id or appcode is needed in service)
-    let loggedInUser: any = {};
-
-    if (typeof loggedInUserParam === 'string') {
-      try {
-        loggedInUser = JSON.parse(loggedInUserParam);
-      } catch (e) {
-        loggedInUser = {};
-      }
-    } else if (
-      typeof loggedInUserParam === 'object' &&
-      loggedInUserParam !== null
-    ) {
-      loggedInUser = loggedInUserParam;
-    } else {
-      loggedInUser = {};
-    }
-
-    return await this.service.getDropdownOptions(
-      type,
-      params,
-      inactiveIdsArray,
-      loggedInUser,
-      true, // publicCall flag set to true
-    );
-  }
-
-  @Get('/getDataSourceList/:source')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getListSourceType(
-    @Req() req: Request & { user: any },
-    @Param('source') source: string,
-  ) {
-    const loggedInUser = req.user.userData;
-
-    return await this.listMasterItemService.getListSourceType(
-      loggedInUser,
-      source,
-    );
-  }
-
-  // @Post('/getResolvedListMasterItems/:type')
-  // @UseGuards(JwtAuthGuard)
-  // @HttpCode(HttpStatus.OK)
-  // async getResolvedListMasterItems(
-  //   @Body() entityData: any,
-  //   @Param('type') type: string,
-  //   @Req() req: Request & { user: any },
-  // ) {
-  //   const loggedInUser = req.user.userData;
-  //   const entityType = type;
-
-  //   return await this.listMasterItemService.getResolvedListMasterItems(
-  //     loggedInUser,
-  //     entityData,
-  //     entityType,
-  //   );
-  // }
-
-  @Get('/getListMasterItems/:type')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getListMasterItems(
-    @Param('type') type: string,
-    @Req() req: Request & { user: any },
-    @Query('search') search?: string,
-  ) {
-    const loggedInUser = req.user.userData;
-
-    return await this.listMasterItemService.getListMasterItemsByType(
-      type,
-      loggedInUser.organization_id,
-      search,
-    );
-  }
-
-  @Get('')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getAllListMasters(
-    @Req() req: Request & { user: any },
-    @Query('search') search?: string,
-  ) {
-    const loggedInUser = req.user.userData;
-    return await this.service.getAllListMasterByOrganization(
-      loggedInUser.organization_id,
-      search,
-    );
-  }
-
-  @Post('/upsertListMasterItem/:type')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async upsertListMasterItem(
-    @Param('type') type: string,
-    @Body() item: any,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-
-    return await this.listMasterItemService.upsertListMasterItem(
-      type,
-      item.items,
-      loggedInUser,
-    );
-  }
-
-  @Delete('/deleteListMasterItem/:type/:code')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async deleteListMasterItem(
-    @Param('type') type: string,
-    @Param('code') code: string,
-  ): Promise<string> {
-    return await this.listMasterItemService.deleteListMasterItem(type, code);
-  }
-
-  @Post('getDropdownData')
-  @UseGuards(JwtAuthGuard)
-  @HttpCode(HttpStatus.OK)
-  async getDropdownData(
-    @Query('entity_type') entity_type: string,
-    @Query('attribute_key') attribute_key: string,
-    @Body() body: Record<string, string>,
-    @Request() req,
-  ) {
-
-    const loggedInUser = req.user.userData;
-    const authHeader = req.headers.authorization || '';
-    const token = authHeader.replace('Bearer ', '').trim();
-
-    return await this.service.getDropDownData(
-      entity_type,
-      attribute_key,
-      loggedInUser,
-      body
-    );
-  }
-
-  @MessagePattern('getDropdownData')
-  async getDropdownDataMS(
-    @Payload()
-    data: {
-      entity_type: string;
-      attribute_key: string;
-      loggedInUser: any;
-      body: Record<string, string>;
-    },
-  ) {
-    const { entity_type, attribute_key, loggedInUser, body } = data;
-
-    return this.service.getDropDownData(
-      entity_type,
-      attribute_key,
-      loggedInUser,
-      body,
-    );
-  }
-}
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Inject,
+  Param,
+  Post,
+  Query,
+  Req,
+  Request,
+  UseGuards,
+} from '@nestjs/common';
+import { ListMasterService } from '../service/list-master.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { ListMasterItemService } from '../service/list-master-item.service';
+import { MessagePattern, Payload } from '@nestjs/microservices';
+
+@Controller('list-master')
+export class ListMasterController {
+  constructor(
+    @Inject('ListMasterService')
+    private readonly service: ListMasterService,
+    @Inject('ListMasterItemService')
+    private readonly listMasterItemService: ListMasterItemService,
+  ) {}
+
+  @Post('/getDropdownData/:type')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getDropdownDataO(
+    @Param('type') type: string,
+    @Query() queryParams: Record<string, string>,
+    @Request() req,
+  ) {
+    const { inactiveIds, ...params } = queryParams;
+
+    const inactiveIdsArray = inactiveIds
+      ? inactiveIds.split(',').map((id) => parseInt(id, 10))
+      : [];
+
+    const loggedInUser = req.user.userData;
+
+    return await this.service.getDropdownOptions(
+      type,
+      params,
+      inactiveIdsArray,
+      loggedInUser,
+    );
+  }
+
+  // Public/internal endpoint (no JWT required)
+  @Get('/getDropdownDataPublic/:type')
+  @HttpCode(HttpStatus.OK)
+  async getDropdownDataPublic(
+    @Param('type') type: string,
+    @Query() queryParams: Record<string, string>,
+  ) {
+    const {
+      inactiveIds,
+      loggedInUser: loggedInUserParam,
+      ...params
+    } = queryParams;
+
+    const inactiveIdsArray = inactiveIds
+      ? inactiveIds.split(',').map((id) => parseInt(id, 10))
+      : [];
+
+    // Default user object (if organization_id or appcode is needed in service)
+    let loggedInUser: any = {};
+
+    if (typeof loggedInUserParam === 'string') {
+      try {
+        loggedInUser = JSON.parse(loggedInUserParam);
+      } catch (e) {
+        loggedInUser = {};
+      }
+    } else if (
+      typeof loggedInUserParam === 'object' &&
+      loggedInUserParam !== null
+    ) {
+      loggedInUser = loggedInUserParam;
+    } else {
+      loggedInUser = {};
+    }
+
+    return await this.service.getDropdownOptions(
+      type,
+      params,
+      inactiveIdsArray,
+      loggedInUser,
+      true, // publicCall flag set to true
+    );
+  }
+
+  @Get('/getDataSourceList/:source')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getListSourceType(
+    @Req() req: Request & { user: any },
+    @Param('source') source: string,
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.listMasterItemService.getListSourceType(
+      loggedInUser,
+      source,
+    );
+  }
+
+  // @Post('/getResolvedListMasterItems/:type')
+  // @UseGuards(JwtAuthGuard)
+  // @HttpCode(HttpStatus.OK)
+  // async getResolvedListMasterItems(
+  //   @Body() entityData: any,
+  //   @Param('type') type: string,
+  //   @Req() req: Request & { user: any },
+  // ) {
+  //   const loggedInUser = req.user.userData;
+  //   const entityType = type;
+
+  //   return await this.listMasterItemService.getResolvedListMasterItems(
+  //     loggedInUser,
+  //     entityData,
+  //     entityType,
+  //   );
+  // }
+
+  @Get('/getListMasterItems/:type')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getListMasterItems(
+    @Param('type') type: string,
+    @Req() req: Request & { user: any },
+    @Query('search') search?: string,
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.listMasterItemService.getListMasterItemsByType(
+      type,
+      loggedInUser.organization_id,
+      search,
+    );
+  }
+
+  @Get('')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getAllListMasters(
+    @Req() req: Request & { user: any },
+    @Query('search') search?: string,
+  ) {
+    const loggedInUser = req.user.userData;
+    return await this.service.getAllListMasterByOrganization(
+      loggedInUser.organization_id,
+      search,
+    );
+  }
+
+  @Post('/upsertListMasterItem/:type')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async upsertListMasterItem(
+    @Param('type') type: string,
+    @Body() item: any,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.listMasterItemService.upsertListMasterItem(
+      type,
+      item.items,
+      loggedInUser,
+    );
+  }
+
+  @Delete('/deleteListMasterItem/:type/:code')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async deleteListMasterItem(
+    @Param('type') type: string,
+    @Param('code') code: string,
+  ): Promise<string> {
+    return await this.listMasterItemService.deleteListMasterItem(type, code);
+  }
+
+  @Post('getDropdownData')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getDropdownData(
+    @Query('entity_type') entity_type: string,
+    @Query('attribute_key') attribute_key: string,
+    @Body() body: Record<string, string>,
+    @Request() req,
+  ) {
+
+    const loggedInUser = req.user.userData;
+    const authHeader = req.headers.authorization || '';
+    const token = authHeader.replace('Bearer ', '').trim();
+
+    return await this.service.getDropDownData(
+      entity_type,
+      attribute_key,
+      loggedInUser,
+      body
+    );
+  }
+
+  @MessagePattern('getDropdownData')
+  async getDropdownDataMS(
+    @Payload()
+    data: {
+      entity_type: string;
+      attribute_key: string;
+      loggedInUser: any;
+      body: Record<string, string>;
+    },
+  ) {
+    const { entity_type, attribute_key, loggedInUser, body } = data;
+
+    return this.service.getDropDownData(
+      entity_type,
+      attribute_key,
+      loggedInUser,
+      body,
+    );
+  }
+}