rez_core 4.0.167 → 4.0.171

package/src/module/mapper/service/mapper.service.ts

@@ -1,79 +1,79 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { DataSource } from 'typeorm';
-import { MapperRepository } from '../repository/mapper.repository';
-import { FieldMapperRepository } from '../repository/field-mapper.repository';
-import { FieldLovsRepository } from '../repository/field-lovs.repository';
-
-@Injectable()
-export class MapperService extends EntityServiceImpl {
-  constructor(
-    private readonly dataSource: DataSource,
-    private mapperRepository: MapperRepository,
-    private fieldMapperRepository: FieldMapperRepository,
-    private fieldLovsRepository: FieldLovsRepository,
-  ) {
-    super();
-  }
-
-  async getByMappedEntityType(mappedEntityType: string,loggedInUser, filter?: string, status?: string) {
-    if (!mappedEntityType) return [];
-
-    const mappers = await this.dataSource.query(
-      `SELECT id, name, code, status
-       FROM frm_mapper_master
-       WHERE mapped_entity_type = $1 AND organization_id = $2 AND (-1 = $3 OR name LIKE $4 OR code LIKE $5)`,
-      [mappedEntityType,loggedInUser.organization_id, filter || -1, `%${filter}%`, `%${filter}%`],
-    );
-
-    const distinctStatuses = [
-      ...new Set(mappers.map((m) => m.status).filter((s) => s !== null)),
-    ];
-
-    // get all statuses in one query
-    const statusMap = new Map();
-    if (distinctStatuses.length > 0) {
-      const statuses = await this.dataSource.query(
-        `SELECT id, name FROM frm_list_master_items WHERE id IN ($1)`,
-        [distinctStatuses],
-      );
-      statuses.forEach((status) => {
-        statusMap.set(status.id, status.name);
-      });
-    }
-
-    // map status names to mappers
-
-    let mappersResolved =  mappers.map((m) => ({
-      id: m.id,
-      label: m.name,
-      value: m.id,
-      code: m.code,
-      status: statusMap.get(m.status) || null,
-    }));
-
-    if (status) {
-      mappersResolved = mappersResolved.filter(
-        (m) => m.status && m.status.toLowerCase() === status.toLowerCase(),
-      );
-    }
-    return mappersResolved;
-  }
-
-  async deleteEntity(entityType: string, entityId: number, loggedInUser) {
-    let fieldMappers =
-      await this.fieldMapperRepository.findByMapperId(entityId);
-
-    for (const fieldMapper of fieldMappers) {
-      await this.fieldLovsRepository.deleteByMapperFieldId(fieldMapper.id);
-    }
-
-    await this.fieldMapperRepository.deleteByMapperId(entityId);
-
-    await super.deleteEntity(entityType, entityId, loggedInUser);
-    return {
-      success: true,
-      message: `Mapper deleted successfully.`,
-    };
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { DataSource } from 'typeorm';
+import { MapperRepository } from '../repository/mapper.repository';
+import { FieldMapperRepository } from '../repository/field-mapper.repository';
+import { FieldLovsRepository } from '../repository/field-lovs.repository';
+
+@Injectable()
+export class MapperService extends EntityServiceImpl {
+  constructor(
+    private readonly dataSource: DataSource,
+    private mapperRepository: MapperRepository,
+    private fieldMapperRepository: FieldMapperRepository,
+    private fieldLovsRepository: FieldLovsRepository,
+  ) {
+    super();
+  }
+
+  async getByMappedEntityType(mappedEntityType: string,loggedInUser, filter?: string, status?: string) {
+    if (!mappedEntityType) return [];
+
+    const mappers = await this.dataSource.query(
+      `SELECT id, name, code, status
+       FROM frm_mapper_master
+       WHERE mapped_entity_type = ? AND organization_id = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`,
+      [mappedEntityType,loggedInUser.organization_id, filter || -1, `%${filter}%`, `%${filter}%`],
+    );
+
+    const distinctStatuses = [
+      ...new Set(mappers.map((m) => m.status).filter((s) => s !== null)),
+    ];
+
+    // get all statuses in one query
+    const statusMap = new Map();
+    if (distinctStatuses.length > 0) {
+      const statuses = await this.dataSource.query(
+        `SELECT id, name FROM frm_list_master_items WHERE id IN (?)`,
+        [distinctStatuses],
+      );
+      statuses.forEach((status) => {
+        statusMap.set(status.id, status.name);
+      });
+    }
+
+    // map status names to mappers
+
+    let mappersResolved =  mappers.map((m) => ({
+      id: m.id,
+      label: m.name,
+      value: m.id,
+      code: m.code,
+      status: statusMap.get(m.status) || null,
+    }));
+
+    if (status) {
+      mappersResolved = mappersResolved.filter(
+        (m) => m.status && m.status.toLowerCase() === status.toLowerCase(),
+      );
+    }
+    return mappersResolved;
+  }
+
+  async deleteEntity(entityType: string, entityId: number, loggedInUser) {
+    let fieldMappers =
+      await this.fieldMapperRepository.findByMapperId(entityId);
+
+    for (const fieldMapper of fieldMappers) {
+      await this.fieldLovsRepository.deleteByMapperFieldId(fieldMapper.id);
+    }
+
+    await this.fieldMapperRepository.deleteByMapperId(entityId);
+
+    await super.deleteEntity(entityType, entityId, loggedInUser);
+    return {
+      success: true,
+      message: `Mapper deleted successfully.`,
+    };
+  }
+}

package/src/module/master/controller/master.controller.ts

@@ -1,74 +1,74 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Inject,
-  Param,
-  Post,
-  Req,
-  UploadedFile,
-  UseGuards,
-  UseInterceptors,
-} from '@nestjs/common';
-import { FileInterceptor } from '@nestjs/platform-express';
-import { MasterService } from '../service/master.service';
-import { Express } from 'express';
-import { UserService } from 'src/module/user/service/user.service';
-import { ENTITYTYPE_USER } from 'src/constant/global.constant';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-
-@Controller('master')
-@UseGuards(JwtAuthGuard)
-export class MasterController {
-  constructor(
-    private readonly masterService: MasterService,
-    private readonly entityService: EntityServiceImpl,
-  ) {}
-
-  @Post('uploadMeta')
-  @UseInterceptors(FileInterceptor('file'))
-  async uploadMasterMetaXls(@UploadedFile() file: Express.Multer.File) {
-    if (!file) {
-      throw new BadRequestException('File is required');
-    }
-    return await this.masterService.uploadMeta(file.buffer);
-  }
-
-  @Post('uploadData')
-  @UseInterceptors(FileInterceptor('file'))
-  async uploadMasterDataXls(
-    @UploadedFile() file: Express.Multer.File,
-    @Req() req: Request & { user: any },
-  ) {
-    const loggedInUser = req.user.userData;
-    if (!file) {
-      throw new BadRequestException('File is required');
-    }
-    return await this.masterService.uploadData(file.buffer, loggedInUser);
-  }
-
-  @Post('uploadEntity/:entityType')
-  @UseInterceptors(FileInterceptor('file'))
-  async uploadEntityDataXls(
-    @Param('entityType') entityType: string,
-    @UploadedFile() file: Express.Multer.File,
-    @Req() req: Request & { user: any },
-    @Body('duplicateHandling')
-    duplicateHandling: 'skip_duplicates' | 'overwrite_items',
-  ) {
-    const loggedInUser = req.user.userData;
-    // let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER, requestedUser.userId);
-
-    if (!file) {
-      throw new BadRequestException('File is required');
-    }
-
-    return await this.masterService.uploadEntityData(
-      file.buffer,
-      entityType,
-      loggedInUser,
-      duplicateHandling,
-    );
-  }
-}
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Inject,
+  Param,
+  Post,
+  Req,
+  UploadedFile,
+  UseGuards,
+  UseInterceptors,
+} from '@nestjs/common';
+import { FileInterceptor } from '@nestjs/platform-express';
+import { MasterService } from '../service/master.service';
+import { Express } from 'express';
+import { UserService } from 'src/module/user/service/user.service';
+import { ENTITYTYPE_USER } from 'src/constant/global.constant';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('master')
+@UseGuards(JwtAuthGuard)
+export class MasterController {
+  constructor(
+    private readonly masterService: MasterService,
+    private readonly entityService: EntityServiceImpl,
+  ) {}
+
+  @Post('uploadMeta')
+  @UseInterceptors(FileInterceptor('file'))
+  async uploadMasterMetaXls(@UploadedFile() file: Express.Multer.File) {
+    if (!file) {
+      throw new BadRequestException('File is required');
+    }
+    return await this.masterService.uploadMeta(file.buffer);
+  }
+
+  @Post('uploadData')
+  @UseInterceptors(FileInterceptor('file'))
+  async uploadMasterDataXls(
+    @UploadedFile() file: Express.Multer.File,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    if (!file) {
+      throw new BadRequestException('File is required');
+    }
+    return await this.masterService.uploadData(file.buffer, loggedInUser);
+  }
+
+  @Post('uploadEntity/:entityType')
+  @UseInterceptors(FileInterceptor('file'))
+  async uploadEntityDataXls(
+    @Param('entityType') entityType: string,
+    @UploadedFile() file: Express.Multer.File,
+    @Req() req: Request & { user: any },
+    @Body('duplicateHandling')
+    duplicateHandling: 'skip_duplicates' | 'overwrite_items',
+  ) {
+    const loggedInUser = req.user.userData;
+    // let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER, requestedUser.userId);
+
+    if (!file) {
+      throw new BadRequestException('File is required');
+    }
+
+    return await this.masterService.uploadEntityData(
+      file.buffer,
+      entityType,
+      loggedInUser,
+      duplicateHandling,
+    );
+  }
+}