rez_core 1.0.38 → 1.0.40

package/dist/utils/service/file-util.service.d.ts

@@ -0,0 +1,3 @@
+export declare class FileUtil {
+    static deleteFile(path: string): void;
+}

package/dist/utils/service/file-util.service.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileUtil = void 0;
+const fs = require("node:fs");
+class FileUtil {
+    static deleteFile(path) {
+        fs.unlink(path, (err) => {
+            if (err) {
+                console.log(`Error deleting file ${path}:`, err);
+            }
+        });
+    }
+}
+exports.FileUtil = FileUtil;
+//# sourceMappingURL=file-util.service.js.map

package/dist/utils/service/file-util.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-util.service.js","sourceRoot":"","sources":["../../../src/utils/service/file-util.service.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAE9B,MAAa,QAAQ;IACnB,MAAM,CAAC,UAAU,CAAC,IAAY;QAC5B,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AARD,4BAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "",
   "author": "",
   "private": false,
@@ -26,7 +26,7 @@
     "@nestjs/core": "^11.0.1",
     "@nestjs/jwt": "^11.0.0",
     "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-express": "^11.0.1",
+    "@nestjs/platform-express": "^11.0.20",
     "@nestjs/swagger": "^11.0.3",
     "@nestjs/typeorm": "^11.0.0",
     "250218_nodejs_core": "file:",
@@ -39,6 +39,7 @@
     "dotenv": "^16.4.7",
     "exceljs": "^4.4.0",
     "moment": "^2.30.1",
+    "multer": "^1.4.5-lts.2",
     "mysql2": "^3.12.0",
     "passport": "^0.7.0",
     "passport-google-oauth20": "^2.0.0",
@@ -61,6 +62,7 @@
     "@swc/core": "^1.10.7",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
+    "@types/multer": "^1.4.12",
     "@types/node": "^22.10.7",
     "@types/supertest": "^6.0.2",
     "eslint": "^9.18.0",

package/src/constant/global.constant.ts

@@ -7,6 +7,8 @@ export const ENTITYTYPE_ENTITYTABLECOLUMN = 'ETC';
 export const ENTITYTYPE_PREFERENCEMASTER = 'PRM';
 export const ENTITYTYPE_VIEWMASTER = 'VMS';
 export const ENTITYTYPE_MEDIA = 'MDA';
+export const ENTITYTYPE_LISTMASTER = 'LMS';
+export const ENTITYTYPE_LISTMASTERITEMS = 'LMI';
 
 export const STORAGETYPE_SINGLEJSON = 'singlejson';
 export const STORAGETYPE_COLUMN = 'column';

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

@@ -0,0 +1,14 @@
+import { Controller, Get, Param } from "@nestjs/common";
+import { ListMasterService } from "../service/list-master.service";
+
+@Controller("list-master")
+export class ListMasterController {
+
+  constructor(private readonly service: ListMasterService) {}
+
+  @Get(':type')
+  getDropdownData(@Param('type') type: string) {
+    return this.service.getDropdownOptions(type);
+  }
+
+}

package/src/module/listmaster/entity/list-master-items.entity.ts

@@ -0,0 +1,33 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { ENTITYTYPE_LISTMASTERITEMS } from '../../../constant/global.constant';
+
+@Entity({name: 'cr_list_master_items'})
+export class ListMasterItems extends BaseEntity{
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_LISTMASTERITEMS;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  listtype: string;
+
+  @Column()
+  name: string;
+
+  @Column()
+  status: string;
+
+  @Column({ default: 0 })
+  isdefault: number;
+
+  @Column({ nullable: true })
+  description: string;
+
+  @Column({ default: 0 })
+  sortindex: number;
+ 
+}

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

@@ -0,0 +1,35 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { ENTITYTYPE_LISTMASTER } from '../../../constant/global.constant';
+
+@Entity({ name: 'cr_list_master' })
+export class ListMasterData extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_LISTMASTER;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  type: string;
+
+  @Column()
+  name: string;
+
+  @Column()
+  status: string;
+
+  @Column()
+  sortby: string;
+
+  @Column()
+  isfactory: number;
+
+  @Column()
+  source: string;
+
+  @Column({ nullable: true })
+  sourcelist: string;
+}

package/src/module/listmaster/listmaster.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { ListMasterData } from './entity/list-master.entity';
+import { ListMasterItems } from './entity/list-master-items.entity';
+import { ListMasterRepository } from './repository/list-master.repository';
+import { ListMasterItemsRepository } from './repository/list-master-items.repository';
+import { ListMasterService } from './service/list-master.service';
+import { EntityModule } from '../meta/entity.module';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([ListMasterData, ListMasterItems]),EntityModule],
+  providers: [ListMasterRepository, ListMasterItemsRepository, ListMasterService],
+})
+export class ListMasterModule {}

package/src/module/listmaster/repository/list-master-items.repository.ts

@@ -0,0 +1,21 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { ListMasterItems } from '../entity/list-master-items.entity';
+
+@Injectable()
+export class ListMasterItemsRepository{
+
+    constructor(
+        @InjectRepository(ListMasterItems) private repo: Repository<ListMasterItems>,
+      ) {}
+    
+    async findItemsByType(type: string) {
+        const items = await this.repo.find({
+          where: { listtype: type, status: 'active' },
+          order: { sortindex: 'ASC' },
+        });
+        return items.map(i => ({ label: i.name, value: i.name }));
+      }
+
+}

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

@@ -0,0 +1,15 @@
+import { Injectable } from '@nestjs/common';
+import { ListMasterData } from '../entity/list-master.entity';
+import { Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+
+@Injectable()
+export class ListMasterRepository{
+
+    constructor(
+        @InjectRepository(ListMasterData) private readonly repo:  Repository<ListMasterData>) {}
+    
+    findByType(type: string) {
+        return this.repo.findOne({ where: { type } });
+      }
+}

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

@@ -0,0 +1,44 @@
+import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
+import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import { ListMasterItemsRepository } from '../repository/list-master-items.repository';
+import { ListMasterRepository } from '../repository/list-master.repository';
+
+@Injectable()
+export class ListMasterService extends EntityServiceImpl {
+  constructor(
+    private readonly listMasterRepo: ListMasterRepository,
+    private readonly listItemsRepo: ListMasterItemsRepository,
+  ) {
+    super();
+  }
+
+  async getDropdownOptions(type: string) {
+    const config = await this.listMasterRepo.findByType(type);
+
+    if (!config) throw new NotFoundException(`Type ${type} not found`);
+
+    switch (config.source) {
+      case 'entity':
+        return this.fetchFromEntity(config.sourcelist);
+
+      case 'master':
+        return this.listItemsRepo.findItemsByType(type);
+
+      case 'custom':
+        // Placeholder
+        return { message: `Custom API for type ${type} not implemented` };
+
+      default:
+        throw new BadRequestException(`Unknown source: ${config.source}`);
+    }
+  }
+
+  private async fetchFromEntity(sourcelist: string) {
+    if (sourcelist === 'USR') {
+      // Example: hardcoded until dynamic entity registry is done
+      return [{ label: 'User A', value: 1 }, { label: 'User B', value: 2 }];
+    }
+
+    throw new NotFoundException(`Entity source ${sourcelist} not handled yet`);
+  }
+}

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

@@ -1,4 +1,5 @@
 import {
+  BadRequestException,
   Controller,
   Post,
   UploadedFile,
@@ -6,6 +7,7 @@ import {
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { MasterService } from '../service/master.service';
+import { Express } from 'express';
 
 @Controller('master')
 export class MasterController {
@@ -19,4 +21,20 @@ export class MasterController {
     }
     return this.masterService.processExcel(file);
   }
+
+  @Post('uploadMasterData')
+  @UseInterceptors(FileInterceptor('file'))
+  async uploadMasterDataXls(@UploadedFile() file: Express.Multer.File) {
+    if (!file) {
+      throw new BadRequestException('File is required');
+    }
+    // const tempFilePath = join(__dirname, '../../uploads', `${Date.now()}_${file.originalname}`);
+    // await writeFile(tempFilePath, file.buffer);
+
+    try {
+      await this.masterService.uploadMasterData(file.buffer);
+    } finally {
+      // FileUtil.deleteFile(tempFilePath);
+    }
+  }
 }

package/src/module/master/service/master.service.ts

@@ -1,11 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { ExcelUtil } from '../../../utils/service/excelUtil.service';
 import { EntityManager } from 'typeorm';
+import { EntityMasterService } from '../../meta/service/entity-master.service';
 
 @Injectable()
 export class MasterService {
   constructor(
     private readonly entityManager: EntityManager,
+    private readonly entityMasterService: EntityMasterService,
     private ExcelUtil: ExcelUtil,
   ) {}
 
@@ -34,4 +36,22 @@ export class MasterService {
       }
     });
   }
+
+  async uploadMasterData(file) {
+    const data = ExcelUtil.readExcel(file.buffer);
+    await this.importEntityMasterData(data['cr_entity_master']);
+  }
+
+  private async importEntityMasterData(entityMasterList) {
+    for (let entityMaster of entityMasterList) {
+      let existingData = await this.entityMasterService.findByMappedEntityType(entityMaster.mapped_entity_type);
+
+      if (existingData) {
+        entityMaster.id = existingData.id;
+        await this.entityMasterService.update(existingData.id, entityMaster);
+      } else {
+        await this.entityMasterService.save(entityMaster);
+      }
+    }
+  }
 }

package/src/module/meta/controller/media.controller.ts

@@ -11,7 +11,7 @@ import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 import { Response } from 'express';
 
 @Controller('media')
-@UseGuards(JwtAuthGuard)
+// @UseGuards(JwtAuthGuard)
 export class MediaController {
   constructor(private readonly mediaDataService: MediaDataService) {}
 

package/src/module/meta/entity/entity-master.entity.ts

@@ -48,7 +48,7 @@ export class EntityMaster extends BaseEntity {
     length: 200,
     nullable: true,
   })
-  dbTableName: string;
+  db_table_name: string;
 
   @Column({
     name: 'description',

package/src/module/meta/repository/entity-table.repository.ts

@@ -11,9 +11,11 @@ export class EntityTableRepository {
   ) {}
 
   async findByEntityTypeAndListType(entityType: string, listType: string) {
-    return await this.entityTableRepository.findOne({
+    const temp =  await this.entityTableRepository.findOne({
       where: { mapped_entity_type: entityType, list_type: listType },
     });
+    console.log(temp)
+    return temp;
   }
 
   async findByEntityTypeAndListTypeAndDisplayType(

package/src/module/meta/service/entity-master.service.ts

@@ -23,4 +23,18 @@ export class EntityMasterService {
 
     return entityMaster;
   }
+
+  async save(entityMaster: EntityMaster) {
+    return await this.entityMasterRepository.save(entityMaster);
+  }
+
+  async update(id: number, entityMaster: EntityMaster) {
+    return await this.entityMasterRepository.update(id, entityMaster);
+  }
+
+  async findByMappedEntityType(mappedEntityType: string) {
+    return await this.entityMasterRepository.findOne({
+      where: { mapped_entity_type: mappedEntityType },
+    });
+  }
 }

package/src/module/meta/service/entity-service-impl.service.ts

@@ -261,7 +261,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     } else {
       let entityMaster =
         await this.entityMasterService.getEntityData(entityType);
-      tableName = entityMaster.dbTableName;
+      tableName = entityMaster.db_table_name;
     }
     return await this.entityListService.getMaxSequenceNumber(
       tableName,

package/src/module/module/controller/module-access.controller.ts

@@ -1,10 +1,13 @@
-import { Body, Controller, Get, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query, UseGuards } from '@nestjs/common';
 import { ModuleAccessService } from '../service/module-access.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
 @Controller('module-access')
+@UseGuards(JwtAuthGuard)
 export class ModuleAccessController {
   constructor(private readonly moduleAccessService: ModuleAccessService) {}
 
+
   @Get('roles')
   async getRoles() {
     return this.moduleAccessService.getRoles();

package/src/module/module/repository/module-access.repository.ts

@@ -20,12 +20,22 @@ export class ModuleAccessRepository {
   ) {}
 
   async getRoles() {
-    return this.roleRepo.find();
+    const roles = await this.roleRepo.find();
+    return roles.map(role => ({
+      label: role.name,
+      value: role.id,
+    }));
   }
+  
 
   async getModules() {
-    return this.moduleRepo.find({ where: { module_level: 'MAINMOD' } });
+    const modules = await this.moduleRepo.find({ where: { module_level: 'MAINMOD' } });
+    return modules.map(mod => ({
+      label: mod.name,
+      value: mod.id,
+    }));
   }
+  
 
   async getAccessListing(roleIds: number[]) {
     // Fetch roles using role IDs

package/src/utils/service/file-util.service.ts

@@ -0,0 +1,11 @@
+import * as fs from 'node:fs';
+
+export class FileUtil{
+  static deleteFile(path: string) {
+    fs.unlink(path, (err) => {
+      if (err) {
+        console.log(`Error deleting file ${path}:`, err);
+      }
+    });
+  }
+}