rez_core 1.0.10 → 1.0.11

package/src/module/user/controller/user.controller.ts

@@ -11,7 +11,7 @@ import { UserService } from '../service/user.service';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { Response } from 'express';
 
-@Controller('user')
+@Controller('api/user')
 export class UserController {
   constructor(
     @Inject('UserService') private readonly userService: UserService,

package/src/module/user/dto/create-user.dto.ts

@@ -1,52 +1,52 @@
-import {IsNotEmpty, IsString, Matches} from 'class-validator';
-import {BaseEntity} from '../../meta/entity/base-entity.entity';
-import {ENTITYTYPE_USER} from '../../../constant/global.constant';
-import {Expose} from "class-transformer";
+import { IsNotEmpty, IsString, Matches } from 'class-validator';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { Expose } from 'class-transformer';
 
 export class CreateUserDto extends BaseEntity {
-    constructor() {
-        super();
-        this.entity_type = ENTITYTYPE_USER;
-    }
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
 
-    @IsString()
-    @IsNotEmpty()
-    @Matches(/^[A-Za-z][A-Za-z]*$/, {message: 'enter valid first name'})
-    @Expose()
-    first_name: string;
+  @IsString()
+  @IsNotEmpty()
+  @Matches(/^[A-Za-z][A-Za-z]*$/, { message: 'enter valid first name' })
+  @Expose()
+  first_name: string;
 
-    @IsString()
-    @IsNotEmpty()
-    @Matches(/^[A-Za-z][A-Za-z]*$/, {message: 'enter valid last name'})
-    @Expose()
-    last_name: string;
+  @IsString()
+  @IsNotEmpty()
+  @Matches(/^[A-Za-z][A-Za-z]*$/, { message: 'enter valid last name' })
+  @Expose()
+  last_name: string;
 
-    @IsString()
-    @IsNotEmpty()
-    @Matches(
-        /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
-        {message: 'enter valid email'},
-    )
-    email_id: string;
+  @IsString()
+  @IsNotEmpty()
+  @Matches(
+    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
+    { message: 'enter valid email' },
+  )
+  email_id: string;
 
-    @IsString()
-    @IsNotEmpty()
-    @Matches(
-        /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/,
-        {
-            message:
-                'Password must be at least 8 characters long, contain at least one uppercase letter, one lowercase letter, one digit, and one special character',
-        },
-    )
-    @Expose()
-    password: string;
+  @IsString()
+  @IsNotEmpty()
+  @Matches(
+    /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/,
+    {
+      message:
+        'Password must be at least 8 characters long, contain at least one uppercase letter, one lowercase letter, one digit, and one special character',
+    },
+  )
+  @Expose()
+  password: string;
 
-    @IsString()
-    @IsNotEmpty()
-    @Matches(/^[0-9]{10}$/, {message: 'enter valid contact number'})
-    @Expose()
-    mobile: string;
+  @IsString()
+  @IsNotEmpty()
+  @Matches(/^[0-9]{10}$/, { message: 'enter valid contact number' })
+  @Expose()
+  mobile: string;
 
-    @Expose()
-    roles: any[];
+  @Expose()
+  roles: any[];
 }

package/src/module/user/entity/role.entity.ts

@@ -15,6 +15,6 @@ export class Role extends BaseEntity {
   @Column({ type: 'int', nullable: true })
   is_system: number;
 
-  @Column({ type: 'varchar', length: 250 ,nullable:true})
+  @Column({ type: 'varchar', length: 250, nullable: true })
   description: string;
 }

package/src/module/user/repository/user-role-mapping.repository.ts

@@ -28,14 +28,20 @@ export class UserRoleMappingRepository {
     });
   }
 
-  async findByUserIdAndRoleId(userId: number, roleId: number): Promise<UserRoleMapping|null> {
+  async findByUserIdAndRoleId(
+    userId: number,
+    roleId: number,
+  ): Promise<UserRoleMapping | null> {
     return await this.userRoleMappingRepository.findOne({
       where: { user_id: userId, role_id: roleId },
     });
   }
 
-  async delete(userId: number, roleId: number){
-    await this.userRoleMappingRepository.delete({user_id: userId, role_id: roleId});
+  async delete(userId: number, roleId: number) {
+    await this.userRoleMappingRepository.delete({
+      user_id: userId,
+      role_id: roleId,
+    });
   }
 
   async deleteByUserId(userId: number) {

package/src/module/user/repository/user.repository.ts

@@ -1,6 +1,6 @@
-import { EntityRepository, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { UserData } from '../entity/user.entity';
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 @Injectable()

package/src/module/user/service/role.service.ts

@@ -1,22 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
-import { EntityMasterService } from '../../meta/service/entity-master.service';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
-import { LoggingService } from '../../../utils/service/loggingUtil.service';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserData } from '../entity/user.entity';
 import { Role } from '../entity/role.entity';
-import {EntityListService} from "../../meta/service/entity-list.service";
 
 @Injectable()
 export class RoleService extends EntityServiceImpl {
-  constructor(
-    entityMasterService: EntityMasterService,
-    reflectionHelper: ReflectionHelper,
-    entityListService: EntityListService,
-    loggingService: LoggingService,
-  ) {
-    super(entityMasterService, reflectionHelper,entityListService, loggingService);
+  constructor() {
+    super();
   }
 
   async createEntity(
@@ -26,6 +17,4 @@ export class RoleService extends EntityServiceImpl {
     let role = entityData as Role;
     return await super.createEntity(role, loggedInUser);
   }
-
-
 }

package/src/module/user/service/user-role-mapping.service.ts

@@ -23,7 +23,7 @@ export class UserRoleMappingService {
     return await this.userRoleMappingRepository.findByUserId(userId);
   }
 
-  async deleteByUserId(userId: number){
+  async deleteByUserId(userId: number) {
     await this.userRoleMappingRepository.deleteByUserId(userId);
   }
 }

package/src/module/user/service/user-session.service.ts

@@ -9,7 +9,7 @@ export class UserSessionService {
   constructor(
     private readonly userSessionRepository: UserSessionRepository,
     private readonly jwtAuthService: JwtAuthService,
-    private readonly clockIDGenService: ClockIDGenService
+    private readonly clockIDGenService: ClockIDGenService,
   ) {}
   async createSession(user) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');

package/src/module/user/service/user.service.ts

@@ -8,38 +8,25 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserRepository } from '../repository/user.repository';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
-import {
-  ENTITYTYPE_ROLE
-} from '../../../constant/global.constant';
+import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { UserRoleMappingService } from './user-role-mapping.service';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { plainToInstance } from 'class-transformer';
 import { EntityListService } from '../../meta/service/entity-list.service';
 import { EntityManager } from 'typeorm';
-import { UpdateUserDto } from "../dto/update-user.dto";
-
-
+import { UpdateUserDto } from '../dto/update-user.dto';
 
 @Injectable()
 export class UserService extends EntityServiceImpl {
   masterKey = process.env.master_key || '';
   masterIv = process.env.master_iv || '';
   constructor(
-    entityMasterService: EntityMasterService,
-    reflectionHelper: ReflectionHelper,
-    entityListService: EntityListService,
-    loggingService: LoggingService,
     private userRepository: UserRepository,
     private userRoleMappingService: UserRoleMappingService,
-    private readonly clockIDGenService: ClockIDGenService
+    private readonly clockIDGenService: ClockIDGenService,
   ) {
-    super(
-      entityMasterService,
-      reflectionHelper,
-      entityListService,
-      loggingService,
-    );
+    super();
   }
 
   async createEntity(

package/src/module/user/user.module.ts

@@ -19,7 +19,6 @@ import { UserRoleMapping } from './entity/user-role-mapping.entity';
 import { UserRoleMappingRepository } from './repository/user-role-mapping.repository';
 import { UserRoleMappingService } from './service/user-role-mapping.service';
 import { RoleRepository } from './repository/role.repository';
-import { EntityListService } from '../meta/service/entity-list.service';
 
 @Module({
   imports: [

package/src/utils/dto/excel-data.dto.ts

@@ -0,0 +1,14 @@
+import { ExcelsheetData } from './excelsheet-data.dto';
+
+export class ExcelData{
+  filePath: string;
+  sheetList: ExcelsheetData[] = [];
+
+  addSheet(sheetData: ExcelsheetData) {
+    this.sheetList.push(sheetData);
+  }
+
+  addSheetAt(sheetData: ExcelsheetData, position: number) {
+    this.sheetList.splice(position, 0, sheetData);
+  }
+}

package/src/utils/dto/excelsheet-data.dto.ts

@@ -0,0 +1,5 @@
+export interface ExcelsheetData{
+  sheetName:string;
+  headers: string[];
+  rowList: any[][];
+}

package/src/utils/service/clockIDGenUtil.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class ClockIDGenService {

package/src/utils/service/dateUtil.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class DateUtil {

package/src/utils/service/excel-helper.service.ts

@@ -1,6 +1,8 @@
 import * as ExcelJS from 'exceljs';
+import { ExcelData } from '../dto/excel-data.dto';
+import * as XLSX from 'xlsx';
 
-export class ExcelHelperService {
+export class ExcelHelper {
   static getHeader(filePath: string, sheetName: string): string[] {
     const rows = this.readExcel(filePath, 'HEADER', sheetName);
     return rows.length > 0 ? rows[0] : [];
@@ -53,4 +55,15 @@ export class ExcelHelperService {
     const jsonString = this.getJSONStringFromList(header, rowData);
     return JSON.parse(jsonString) as T[];
   }
+
+  static writeExcel(excelData: ExcelData) {
+    const wb = XLSX.utils.book_new();
+
+    for (const sheetData of excelData.sheetList) {
+      const ws = XLSX.utils.aoa_to_sheet([sheetData.headers, ...sheetData.rowList]);
+      XLSX.utils.book_append_sheet(wb, ws, sheetData.sheetName || 'Sheet1');
+    }
+
+    XLSX.writeFile(wb, excelData.filePath);
+  }
 }

package/src/utils/service/loggingUtil.service.ts

@@ -1,56 +1,56 @@
-import { Injectable, Logger } from "@nestjs/common";
+import { Injectable, Logger } from '@nestjs/common';
 import { transports } from 'winston';
+
 const winston = require('winston');
 const moment = require('moment');
 
 @Injectable()
 export class LoggingService {
-    
-    constructor(
-    ) { }
-
-  
-             
-    async log(
-        level: string, 
-        serviceName: string, 
-        methodName: string, 
-        message: string, 
-        parameters?: unknown[], 
-        debuginfo?: unknown[]) {
-
-
-        let levelInfo = level.toLowerCase().trim();
-        let logger = new Logger(serviceName);
-        
-        const fileConfiguration = {
-            format: winston.format.combine(
-                winston.format.errors({ stzack: true }),
-                winston.format.timestamp({ format: 'DD/MM/YYYY HH:mm:ss' }),
-                winston.format.printf(info => `${info.timestamp} : ${info.level}: ${serviceName}: ${methodName} : ${message} : ${JSON.stringify(parameters) || ""} : ${JSON.stringify(debuginfo) || ""}`),
-            ),
-
-            transports: [
-                new transports.File({
-                    dirname: `/data01/logs/${moment().format("DD-MM-YYYY")}/activity/${moment().format("HH dddd")}`,
-                    filename: 'activity.log',
-                    level: `${level}`
-                })
-            ],
-        }
-
-        const filelogger = winston.createLogger(fileConfiguration);
-        let data = `${message} -- Parameters: ${JSON.stringify(parameters)}`;
-
-        if (levelInfo == "debug" || levelInfo == "info") {
-            logger.debug(`${methodName} : ${message} : Parameters :${JSON.stringify(parameters)}: Debug Info: ${JSON.stringify(debuginfo)}`);
-        }
-        else if (levelInfo == "error") {
-            logger.error(`${methodName} : ${message} : Parameters :${JSON.stringify(parameters)}: Debug Info: ${JSON.stringify(debuginfo)}`)
-        }
-        filelogger.on('finish', () => {});
-        filelogger.end();
+  constructor() {}
+
+  async log(
+    level: string,
+    serviceName: string,
+    methodName: string,
+    message: string,
+    parameters?: unknown[],
+    debuginfo?: unknown[],
+  ) {
+    let levelInfo = level.toLowerCase().trim();
+    let logger = new Logger(serviceName);
+
+    const fileConfiguration = {
+      format: winston.format.combine(
+        winston.format.errors({ stzack: true }),
+        winston.format.timestamp({ format: 'DD/MM/YYYY HH:mm:ss' }),
+        winston.format.printf(
+          (info) =>
+            `${info.timestamp} : ${info.level}: ${serviceName}: ${methodName} : ${message} : ${JSON.stringify(parameters) || ''} : ${JSON.stringify(debuginfo) || ''}`,
+        ),
+      ),
+
+      transports: [
+        new transports.File({
+          dirname: `/data01/logs/${moment().format('DD-MM-YYYY')}/activity/${moment().format('HH dddd')}`,
+          filename: 'activity.log',
+          level: `${level}`,
+        }),
+      ],
+    };
+
+    const filelogger = winston.createLogger(fileConfiguration);
+    let data = `${message} -- Parameters: ${JSON.stringify(parameters)}`;
+
+    if (levelInfo == 'debug' || levelInfo == 'info') {
+      logger.debug(
+        `${methodName} : ${message} : Parameters :${JSON.stringify(parameters)}: Debug Info: ${JSON.stringify(debuginfo)}`,
+      );
+    } else if (levelInfo == 'error') {
+      logger.error(
+        `${methodName} : ${message} : Parameters :${JSON.stringify(parameters)}: Debug Info: ${JSON.stringify(debuginfo)}`,
+      );
     }
-
-
+    filelogger.on('finish', () => {});
+    filelogger.end();
+  }
 }

package/src/utils/utils.module.ts

@@ -1,12 +1,12 @@
-import {Global, Module} from "@nestjs/common";
-import { LoggingService } from "./service/loggingUtil.service";
-import {ReflectionHelper} from "./service/reflection-helper.service";
-import { ExcelUtil } from "./service/excelUtil.service";
-import { ClockIDGenService } from "./service/clockIDGenUtil.service";
+import { Global, Module } from '@nestjs/common';
+import { LoggingService } from './service/loggingUtil.service';
+import { ReflectionHelper } from './service/reflection-helper.service';
+import { ExcelUtil } from './service/excelUtil.service';
+import { ClockIDGenService } from './service/clockIDGenUtil.service';
 
 @Global()
 @Module({
-  providers: [LoggingService, ReflectionHelper,ExcelUtil,ClockIDGenService],
-  exports: [LoggingService, ReflectionHelper,ExcelUtil,ClockIDGenService],
+  providers: [LoggingService, ReflectionHelper, ExcelUtil, ClockIDGenService],
+  exports: [LoggingService, ReflectionHelper, ExcelUtil, ClockIDGenService],
 })
 export class UtilsModule {}