rez_core 0.0.7 → 1.0.2-o

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

@@ -1,21 +1,21 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_role_mapping' })
-export class UserRoleMapping {
-  constructor(user_id: number, role_id: number) {
-    this.user_id = user_id;
-    this.role_id = role_id;
-  }
-
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  user_id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  role_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  is_default: number;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_role_mapping' })
+export class UserRoleMapping {
+  constructor(user_id: number, role_id: number) {
+    this.user_id = user_id;
+    this.role_id = role_id;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  user_id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  role_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  is_default: number;
+}

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

@@ -1,61 +1,61 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_session' })
-export class UserSession {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({
-    name: 'is_session_loggedout',
-    nullable: true,
-    type: 'int',
-  })
-  is_session_loggedout: number;
-
-  @Column({
-    name: 'login_id',
-    nullable: true,
-    length: 50,
-  })
-  login_id: string;
-
-  @Column({
-    name: 'login_time',
-    nullable: true,
-  })
-  login_time: Date;
-
-  @Column({
-    name: 'logout_time',
-    nullable: true,
-  })
-  logout_time: Date;
-
-  @Column({
-    name: 'session_key',
-    nullable: true,
-    length: 100,
-  })
-  session_key: string;
-
-  @Column({
-    name: 'user_id',
-    nullable: true,
-    type: 'bigint',
-  })
-  user_id: number;
-
-  @Column({
-    name: 'access_token',
-    nullable: true,
-    type: 'varchar',
-    length: 5000,
-  })
-  access_token: string;
-
-  @Column({
-    name: 'expiry_date',
-    nullable: true,
-  })
-  expiry_date: Date;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_session' })
+export class UserSession {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({
+    name: 'is_session_loggedout',
+    nullable: true,
+    type: 'int',
+  })
+  is_session_loggedout: number;
+
+  @Column({
+    name: 'login_id',
+    nullable: true,
+    length: 50,
+  })
+  login_id: string;
+
+  @Column({
+    name: 'login_time',
+    nullable: true,
+  })
+  login_time: Date;
+
+  @Column({
+    name: 'logout_time',
+    nullable: true,
+  })
+  logout_time: Date;
+
+  @Column({
+    name: 'session_key',
+    nullable: true,
+    length: 100,
+  })
+  session_key: string;
+
+  @Column({
+    name: 'user_id',
+    nullable: true,
+    type: 'bigint',
+  })
+  user_id: number;
+
+  @Column({
+    name: 'access_token',
+    nullable: true,
+    type: 'varchar',
+    length: 5000,
+  })
+  access_token: string;
+
+  @Column({
+    name: 'expiry_date',
+    nullable: true,
+  })
+  expiry_date: Date;
+}

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

@@ -1,35 +1,35 @@
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
-
-@Entity({ name: 'cr_user' })
-export class UserData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_USER;
-  }
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  first_name: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  last_name: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  password: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  email_id: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  mobile: string;
-
-  @Column({ type: 'int', nullable: true })
-  is_firstlogin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_defaultadmin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_customer: number;
-}
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+
+@Entity({ name: 'cr_user' })
+export class UserData extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  first_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  last_name: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  password: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  email_id: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  mobile: string;
+
+  @Column({ type: 'int', nullable: true })
+  is_firstlogin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_defaultadmin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_customer: number;
+}

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

@@ -1,16 +1,16 @@
-import { Injectable } from '@nestjs/common';
-import { Repository } from 'typeorm';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Role } from '../entity/role.entity';
-
-@Injectable()
-export class RoleRepository {
-  constructor(
-    @InjectRepository(Role)
-    private readonly roleRepo: Repository<Role>,
-  ) {}
-
-  async findByCode(code: string): Promise<Role | null> {
-    return this.roleRepo.findOne({ where: { code } });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Role } from '../entity/role.entity';
+
+@Injectable()
+export class RoleRepository {
+  constructor(
+    @InjectRepository(Role)
+    private readonly roleRepo: Repository<Role>,
+  ) {}
+
+  async findByCode(code: string): Promise<Role | null> {
+    return this.roleRepo.findOne({ where: { code } });
+  }
+}

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/repository/userSession.repository.ts

@@ -1,33 +1,33 @@
-import { Repository } from 'typeorm';
-import { UserSession } from '../entity/user-session.entity';
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-@Injectable()
-export class UserSessionRepository {
-  constructor(
-    @InjectRepository(UserSession)
-    private userSessionRepo: Repository<UserSession>,
-  ) {}
-
-  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
-  }
-
-  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({
-      where: { user_id: userId, is_session_loggedout: 0 },
-    });
-  }
-
-  async saveSession(session: UserSession): Promise<UserSession> {
-    return this.userSessionRepo.save(session);
-  }
-
-  async logoutSession(sessionKey: string): Promise<void> {
-    await this.userSessionRepo.update(
-      { session_key: sessionKey },
-      { is_session_loggedout: 1, logout_time: new Date() },
-    );
-  }
-}
+import { Repository } from 'typeorm';
+import { UserSession } from '../entity/user-session.entity';
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+@Injectable()
+export class UserSessionRepository {
+  constructor(
+    @InjectRepository(UserSession)
+    private userSessionRepo: Repository<UserSession>,
+  ) {}
+
+  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
+  }
+
+  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({
+      where: { user_id: userId, is_session_loggedout: 0 },
+    });
+  }
+
+  async saveSession(session: UserSession): Promise<UserSession> {
+    return this.userSessionRepo.save(session);
+  }
+
+  async logoutSession(sessionKey: string): Promise<void> {
+    await this.userSessionRepo.update(
+      { session_key: sessionKey },
+      { is_session_loggedout: 1, logout_time: new Date() },
+    );
+  }
+}

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

@@ -3,6 +3,8 @@ import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { UserData } from '../entity/user.entity';
 import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
+import { ConfigService } from '@nestjs/config';
+
 
 
 @Injectable()
@@ -10,15 +12,21 @@ export class LoginService {
   constructor(
     @Inject('UserService') private readonly userService: UserService,
     private userSessionService: UserSessionService,
+    private configService: ConfigService
   ) {}
-  
-  masterKey: string = process.env.master_key || '';
-  masterIv: string = process.env.master_iv || '';
-  
+
+  masterKey: string = this.configService.get('MASTER_KEY') || '';
+  masterIv: string = this.configService.get('MASTER_IV') || '';
+
   async login(email: string, password: string) {
-    console.log(process.env.master_key)
     const user = await this.userService.findByEmailId(email);
-    if (!user) throw new BadRequestException('Invalid email or password');
+    if (!user) {
+      return {
+        success: false,
+        message: 'Your Email ID not registered.',
+        type: 'email',
+      };
+    }
 
     const encryptedPassword = EncryptUtilService.encryptGCM(
       password,
@@ -27,10 +35,19 @@ export class LoginService {
     );
 
     if (encryptedPassword !== user.password) {
-      throw new BadRequestException('Invalid email or password');
+      return {
+        success: false,
+        message: 'Oops! Your password is incorrect.',
+        type: 'password',
+      };
     }
 
-    return this.userSessionService.createSession(user);
+    const token = await this.userSessionService.createSession(user);
+
+    return{
+      success:true,
+      accessToken:token
+    }
   }
 
   async loginWithGoogle(email: string, name) {

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');
@@ -29,7 +29,7 @@ export class UserSessionService {
     userSession.access_token = accessToken;
     await this.userSessionRepository.saveSession(userSession);
 
-    return { accessToken };
+    return  accessToken ;
   }
 
   async findBySessionKey(sessionKey: string): Promise<UserSession | null> {

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

@@ -1,49 +1,38 @@
 import { BadRequestException, 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 { UserData } from '../entity/user.entity';
 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, STATUS_ACTIVE } 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 {UpdateUserDto} from "../dto/update-user.dto";
-
-
+import { EntityManager } from 'typeorm';
+import { UpdateUserDto } from '../dto/update-user.dto';
+import { ConfigService } from '@nestjs/config';
 
 @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,
+    private configService: ConfigService,
   ) {
-    super(
-      entityMasterService,
-      reflectionHelper,
-      entityListService,
-      loggingService,
-    );
+    super();
   }
 
+  masterKey = this.configService.get('MASTER_KEY') || '';
+  masterIv = this.configService.get('MASTER_IV') || '';
+
+
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
+    manager?: EntityManager,
   ): Promise<BaseEntity> {
     let userData = entityData as CreateUserDto;
     let existingUser = await this.userRepository.findByEmailId(
@@ -74,11 +63,11 @@ export class UserService extends EntityServiceImpl {
       );
     }
     userData.password = password;
-
-    let savedData = await super.createEntity(userData, loggedInUser);
+    userData.status = STATUS_ACTIVE;
+    const savedData = await super.createEntity(userData, loggedInUser);
     if (userData.roles) {
       let roles = userData.roles;
-      this.userRoleMappingService.deleteByUserId(userData.id);
+      await this.userRoleMappingService.deleteByUserId(userData.id);
       for (const role in roles) {
         let userRoleMapping = new UserRoleMapping(
           savedData.id,
@@ -149,7 +138,7 @@ export class UserService extends EntityServiceImpl {
     return await this.userRepository.findByEmailId(email_id);
   }
 
-  async findByMobile(mobile: string){
+  async findByMobile(mobile: string) {
     return await this.userRepository.findByMobile(mobile);
   }
 }

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: [
@@ -46,6 +45,7 @@ import { EntityListService } from '../meta/service/entity-list.service';
     'RoleService',
     UserRoleMappingService,
     RoleRepository,
+    LoginService,
   ],
   controllers: [LoginController, UserController],
 })

package/src/resources/dev.properties.yaml

@@ -0,0 +1,15 @@
+DB_HOST: "13.234.25.234"
+DB_PORT: "3306"
+DB_USER: "root"
+DB_PASS: "Rezolut@123"
+DB_NAME: "core"
+MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
+MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
+SECRET_KEY: "1hard_to_guess_secret7890a"
+CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
+CLIENT_SECRET: "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"
+CALLBACK_URL: "http://localhost:3000/auth/google/callback"
+OTP_EXPIRY: "10"
+OTP_LENGTH: "6"
+VERIFY_OTP: "false"
+DEFAULT_OTP: "123456"

package/src/resources/properties.module.ts

@@ -0,0 +1,12 @@
+import { Module } from "@nestjs/common";
+import { ConfigModule } from "@nestjs/config";
+import propertiesYaml from "./properties.yaml";
+@Module({
+    imports: [
+        ConfigModule.forRoot({
+            load: [propertiesYaml],
+            isGlobal: true
+        })
+    ],
+})
+export default class Properties { }

package/src/resources/properties.yaml.ts

@@ -0,0 +1,11 @@
+import { readFileSync } from 'fs';
+import * as yaml from 'js-yaml';
+import { join } from 'path';
+
+const YAML_CONFIG = `/dev.properties.yaml`;
+
+export default () => {
+    return yaml.load(
+        readFileSync(join(__dirname, YAML_CONFIG), 'utf8'),
+    ) as Record<string, any>
+}

package/src/resources/uat.properties.yaml

@@ -0,0 +1,15 @@
+DB_HOST: "13.234.25.234"
+DB_PORT: "3306"
+DB_USER: "root"
+DB_PASS: "Rezolut@123"
+DB_NAME: "ether_core"
+MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
+MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
+SECRET_KEY: "1hard_to_guess_secret7890a"
+CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
+CLIENT_SECRET: "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"
+CALLBACK_URL: "http://localhost:3000/auth/google/callback"
+OTP_EXPIRY: "10"
+OTP_LENGTH: "6"
+VERIFY_OTP: "false"
+DEFAULT_OTP: "123456"

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);
+  }
+}