rez_core 1.0.39 → 1.0.40

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,22 +1,40 @@
-import {
-  Controller,
-  Post,
-  UploadedFile,
-  UseInterceptors,
-} from '@nestjs/common';
-import { FileInterceptor } from '@nestjs/platform-express';
-import { MasterService } from '../service/master.service';
-
-@Controller('master')
-export class MasterController {
-  constructor(private readonly masterService: MasterService) {}
-
-  @Post('upload')
-  @UseInterceptors(FileInterceptor('file'))
-  async uploadFile(@UploadedFile() file) {
-    if (!file) {
-      throw new Error('File is required');
-    }
-    return this.masterService.processExcel(file);
-  }
-}
+import {
+  BadRequestException,
+  Controller,
+  Post,
+  UploadedFile,
+  UseInterceptors,
+} from '@nestjs/common';
+import { FileInterceptor } from '@nestjs/platform-express';
+import { MasterService } from '../service/master.service';
+import { Express } from 'express';
+
+@Controller('master')
+export class MasterController {
+  constructor(private readonly masterService: MasterService) {}
+
+  @Post('upload')
+  @UseInterceptors(FileInterceptor('file'))
+  async uploadFile(@UploadedFile() file) {
+    if (!file) {
+      throw new Error('File is required');
+    }
+    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/dto/entity-list-data.dto.ts

@@ -1,6 +1,6 @@
-import { EntityTab } from './entity-tab.dto';
-
-export class EntityListData {
-  entity_list: any;
-  entity_tabs: EntityTab[];
-}
+import { EntityTab } from './entity-tab.dto';
+
+export class EntityListData {
+  entity_list: any;
+  entity_tabs: EntityTab[];
+}

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

@@ -1,67 +1,67 @@
-import { BaseEntity } from './base-entity.entity';
-import { Column, Entity } from 'typeorm';
-
-@Entity({ name: 'cr_attribute_master' })
-export class AttributeMaster extends BaseEntity {
-  @Column({ name: 'mapped_entity_type', type: 'varchar', nullable: true })
-  mapped_entity_type: string;
-
-  @Column({ name: 'mapped_entity_id' })
-  mapped_entity_id: number;
-
-  @Column({ name: 'element_type', type: 'varchar', nullable: true, length: 50 })
-  element_type: string;
-
-  @Column({
-    name: 'data_source_type',
-    type: 'varchar',
-    nullable: true,
-    length: 50,
-  })
-  data_source_type: string;
-
-  @Column({ name: 'datasource_list', type: 'varchar', nullable: true })
-  datasource_list: string;
-
-  @Column({
-    name: 'custom_values',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  custom_values: string;
-
-  @Column({ name: 'max_length', nullable: true })
-  max_length: number;
-
-  @Column({ name: 'required', nullable: true })
-  required: number;
-
-  @Column({
-    name: 'description',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  description: string;
-
-  @Column({
-    name: 'attribute_key',
-    type: 'varchar',
-    nullable: true,
-    length: 50,
-  })
-  attribute_key: string;
-
-  @Column({ name: 'db_datatype', type: 'varchar', nullable: true, length: 50 })
-  db_datatype: string;
-
-  @Column({ name: 'category', type: 'varchar', nullable: true, length: 50 })
-  category: string;
-
-  @Column({ name: 'is_unique', nullable: true })
-  is_unique: number;
-
-  @Column({ name: 'can_export', nullable: true })
-  can_export: number;
-}
+import { BaseEntity } from './base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_attribute_master' })
+export class AttributeMaster extends BaseEntity {
+  @Column({ name: 'mapped_entity_type', type: 'varchar', nullable: true })
+  mapped_entity_type: string;
+
+  @Column({ name: 'mapped_entity_id' })
+  mapped_entity_id: number;
+
+  @Column({ name: 'element_type', type: 'varchar', nullable: true, length: 50 })
+  element_type: string;
+
+  @Column({
+    name: 'data_source_type',
+    type: 'varchar',
+    nullable: true,
+    length: 50,
+  })
+  data_source_type: string;
+
+  @Column({ name: 'datasource_list', type: 'varchar', nullable: true })
+  datasource_list: string;
+
+  @Column({
+    name: 'custom_values',
+    type: 'varchar',
+    length: 2000,
+    nullable: true,
+  })
+  custom_values: string;
+
+  @Column({ name: 'max_length', nullable: true })
+  max_length: number;
+
+  @Column({ name: 'required', nullable: true })
+  required: number;
+
+  @Column({
+    name: 'description',
+    type: 'varchar',
+    length: 2000,
+    nullable: true,
+  })
+  description: string;
+
+  @Column({
+    name: 'attribute_key',
+    type: 'varchar',
+    nullable: true,
+    length: 50,
+  })
+  attribute_key: string;
+
+  @Column({ name: 'db_datatype', type: 'varchar', nullable: true, length: 50 })
+  db_datatype: string;
+
+  @Column({ name: 'category', type: 'varchar', nullable: true, length: 50 })
+  category: string;
+
+  @Column({ name: 'is_unique', nullable: true })
+  is_unique: number;
+
+  @Column({ name: 'can_export', nullable: true })
+  can_export: number;
+}

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/entity/preference.entity.ts

@@ -1,65 +1,65 @@
-import { BaseEntity } from './base-entity.entity';
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
-
-@Entity({ name: 'cr_preference_master' })
-export class PreferenceMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
-  }
-
-  @Column({ name: 'appcode', type: 'varchar', length: 200, nullable: true })
-  appCode: string;
-
-  @Column({
-    name: 'display_name',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  display_name: string;
-
-  @Column({
-    name: 'preference_key',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  preference_key: string;
-
-  @Column({
-    name: 'preference_value',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  preference_value: string;
-
-  @Column({
-    name: 'description',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  description: string;
-
-  @Column({ name: 'reflect_on', type: 'varchar', length: 200, nullable: true })
-  reflect_on: string;
-
-  @Column({
-    name: 'default_value',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  default_value: string;
-
-  @Column({
-    name: 'possible_values',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  possible_values: string;
-}
+import { BaseEntity } from './base-entity.entity';
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
+
+@Entity({ name: 'cr_preference_master' })
+export class PreferenceMaster extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
+  }
+
+  @Column({ name: 'appcode', type: 'varchar', length: 200, nullable: true })
+  appCode: string;
+
+  @Column({
+    name: 'display_name',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  display_name: string;
+
+  @Column({
+    name: 'preference_key',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  preference_key: string;
+
+  @Column({
+    name: 'preference_value',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  preference_value: string;
+
+  @Column({
+    name: 'description',
+    type: 'varchar',
+    length: 2000,
+    nullable: true,
+  })
+  description: string;
+
+  @Column({ name: 'reflect_on', type: 'varchar', length: 200, nullable: true })
+  reflect_on: string;
+
+  @Column({
+    name: 'default_value',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  default_value: string;
+
+  @Column({
+    name: 'possible_values',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  possible_values: string;
+}

package/src/module/meta/repository/attribute-master.repository.ts

@@ -1,28 +1,28 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { AttributeMaster } from '../entity/attribute-master.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class AttributeMasterRepository {
-  constructor(
-    @InjectRepository(AttributeMaster)
-    private readonly attributeMasterRepository: Repository<AttributeMaster>,
-  ) {}
-
-  async findByMappedEntityIdAndMappedEntityTypeAndAttributeKeyAndOrganizationId(
-    mappedEntityId: number,
-    mappedEntityType: string,
-    attributeKey: string,
-    organizationId: number,
-  ): Promise<AttributeMaster | null> {
-    return await this.attributeMasterRepository.findOne({
-      where: {
-        mapped_entity_id: mappedEntityId,
-        mapped_entity_type: mappedEntityType,
-        attribute_key: attributeKey,
-        organization_id: organizationId,
-      },
-    });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { AttributeMaster } from '../entity/attribute-master.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class AttributeMasterRepository {
+  constructor(
+    @InjectRepository(AttributeMaster)
+    private readonly attributeMasterRepository: Repository<AttributeMaster>,
+  ) {}
+
+  async findByMappedEntityIdAndMappedEntityTypeAndAttributeKeyAndOrganizationId(
+    mappedEntityId: number,
+    mappedEntityType: string,
+    attributeKey: string,
+    organizationId: number,
+  ): Promise<AttributeMaster | null> {
+    return await this.attributeMasterRepository.findOne({
+      where: {
+        mapped_entity_id: mappedEntityId,
+        mapped_entity_type: mappedEntityType,
+        attribute_key: attributeKey,
+        organization_id: organizationId,
+      },
+    });
+  }
+}

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

@@ -1,20 +1,20 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { PreferenceMaster } from '../entity/preference.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class PreferenceRepository {
-  constructor(
-    @InjectRepository(PreferenceMaster)
-    private readonly preferenceRepository: Repository<PreferenceMaster>,
-  ) {}
-
-  async findByPreferenceKey(
-    preferenceKey: string,
-  ): Promise<PreferenceMaster | null> {
-    return await this.preferenceRepository.findOne({
-      where: { preference_key: preferenceKey },
-    });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { PreferenceMaster } from '../entity/preference.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class PreferenceRepository {
+  constructor(
+    @InjectRepository(PreferenceMaster)
+    private readonly preferenceRepository: Repository<PreferenceMaster>,
+  ) {}
+
+  async findByPreferenceKey(
+    preferenceKey: string,
+  ): Promise<PreferenceMaster | null> {
+    return await this.preferenceRepository.findOne({
+      where: { preference_key: preferenceKey },
+    });
+  }
+}