rez_core 1.0.83 → 1.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "",
   "author": "",
   "private": false,

package/src/module/layout/entity/header-items.entity.ts

@@ -9,7 +9,7 @@ export class HeaderItems {
   section_id: number;
 
   @Column({ length: 50, nullable: true, type: 'varchar' })
-  key: string;
+  code: string;
 
   @Column({ length: 50, nullable: true, type: 'varchar' })
   type: string;

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

@@ -14,8 +14,8 @@ export class MasterService {
     private readonly entityMasterService: EntityMasterService,
     private readonly attributeMasterService: AttributeMasterService,
     private readonly excelUtil: ExcelUtil,
-        private reflectionHelper: ReflectionHelper,
-    
+    private reflectionHelper: ReflectionHelper,
+
     private readonly entityServiceImpl: EntityServiceImpl,
   ) {}
 
@@ -24,6 +24,9 @@ export class MasterService {
     'cr_attribute_master',
     'cr_list_master',
     'cr_list_master_items',
+    'cr_entity_table',
+    'cr_entity_table_column',
+    'cr_view_master',
   ];
   private readonly sequence = [
     {
@@ -42,6 +45,58 @@ export class MasterService {
       table: 'cr_list_master_items',
       unique_fields: ['listtype', 'code'],
     },
+    {
+      table: 'cr_entity_table',
+      unique_fields: ['list_type', 'mapped_entity_type'],
+    },
+    {
+      table: 'cr_entity_table_column',
+      unique_fields: ['parent_id', 'parent_type', 'attribute_key'],
+    },
+    {
+      table: 'cr_view_master',
+      unique_fields: ['mapped_entity_type'],
+    },
+    {
+      table: 'cr_user',
+      unique_fields: ['email_id', 'mobile', 'code'],
+    },
+    {
+      table: 'cr_header_items',
+      unique_fields: ['code', 'section_id'],
+    },
+    {
+      table: 'cr_module_access',
+      unique_fields: ['module_code', 'action_type', 'role_code'],
+    },
+    {
+      table: 'cr_module_action',
+      unique_fields: ['module_code', 'action_type'],
+    },
+    {
+      table: 'cr_menu',
+      unique_fields: ['module_code'],
+    },
+    {
+      table: 'cr_module',
+      unique_fields: ['module_code'],
+    },
+    {
+      table: 'cr_role',
+      unique_fields: ['code'],
+    },
+    {
+      table: 'cr_header_sections',
+      unique_fields: ['section_name'],
+    },
+    {
+      table: 'cr_user_role_mapping',
+      unique_fields: ['user_id', 'role_id'],
+    },
+    {
+      table: 'cr_organization',
+      unique_fields: ['code'],
+    },
   ];
   private readonly dataSequence = [
     {
@@ -77,10 +132,8 @@ export class MasterService {
         console.log(`Sheet ${table} not found in the Excel file.`);
         continue;
       }
-      if (this.isMetaSheet(table)) {
-        console.log(`Processing sheet: ${table}`);
-        await this.upsertData(table, unique_fields, sheetData);
-      }
+      console.log(`Processing sheet: ${table}`);
+      await this.upsertData(table, unique_fields, sheetData);
     }
     return {
       message: 'Data uploaded successfully',
@@ -134,58 +187,78 @@ export class MasterService {
     };
   }
 
-  async uploadEntityData(file, entityType, loggedInUser, duplicateHandling: 'skip_duplicates' | 'overwrite_items') {
+  async uploadEntityData(
+    file,
+    entityType,
+    loggedInUser,
+    duplicateHandling: 'skip_duplicates' | 'overwrite_items',
+  ) {
     const data = ExcelUtil.readExcel(file.buffer);
-    const entityMaster = await this.entityMasterService.findByMappedEntityType(entityType);
+    const entityMaster =
+      await this.entityMasterService.findByMappedEntityType(entityType);
     if (!entityMaster) {
       throw new Error(`Entity master not found for entityType: ${entityType}`);
     }
-  
+
     const tableName = entityMaster.db_table_name;
     const sheetData = data[tableName];
     if (!sheetData) {
       throw new Error(`Sheet for ${tableName} not found in uploaded file`);
     }
-  
-    const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityType);
-    const uniqueFields = attributes.filter(attr => attr.is_unique).map(attr => attr.attribute_key);
-  
+
+    const attributes =
+      await this.attributeMasterService.findAttributesByMappedEntityType(
+        entityType,
+      );
+    const uniqueFields = attributes
+      .filter((attr) => attr.is_unique)
+      .map((attr) => attr.attribute_key);
+
     if (uniqueFields.length === 0) {
       throw new Error(`No unique fields found for entityType: ${entityType}`);
     }
-  
+
     for (const row of sheetData) {
       if (row.parent_type && row.parent_id) {
         await this.resolveParent(row);
       }
-  
+
       for (const attr of attributes) {
         if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
-          const refEntity = await this.entityMasterService.getEntityData(attr.datasource_list);
+          const refEntity = await this.entityMasterService.getEntityData(
+            attr.datasource_list,
+          );
           const refData = await this.entityManager.query(
             `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
             [row[attr.attribute_key]],
           );
-  
+
           if (!refData.length) {
-            throw new Error(`Reference entity not found for code: ${row[attr.attribute_key]}`);
+            throw new Error(
+              `Reference entity not found for code: ${row[attr.attribute_key]}`,
+            );
           }
-  
+
           row[attr.attribute_key] = refData[0].id;
         }
       }
     }
-  
-    await this.upsertViaService(entityType, sheetData, attributes, uniqueFields, loggedInUser, duplicateHandling);
-  
+
+    await this.upsertViaService(
+      entityType,
+      sheetData,
+      attributes,
+      uniqueFields,
+      loggedInUser,
+      duplicateHandling,
+    );
+
     return { message: 'Entity data uploaded successfully' };
   }
-  
-  
 
-  private isMetaSheet(sheetName: string): boolean {
-    return this.metaSheets.includes(sheetName.toLowerCase());
-  }
+  // private isMetaSheet(sheetName: string): boolean {
+  //   return this.metaSheets.includes(sheetName.toLowerCase());
+  // }
 
   private async resolveParent(row: any): Promise<void> {
     const parentType = row.parent_type; // (Future use maybe)
@@ -269,35 +342,39 @@ export class MasterService {
     loggedInUser: any,
     duplicateHandling: 'skip_duplicates' | 'overwrite_items',
   ): Promise<void> {
-    const entityMaster = await this.entityMasterService.findByMappedEntityType(entityType);
-    if (!entityMaster) throw new Error(`Entity master not found for ${entityType}`);
-  
+    const entityMaster =
+      await this.entityMasterService.findByMappedEntityType(entityType);
+    if (!entityMaster)
+      throw new Error(`Entity master not found for ${entityType}`);
+
     const serviceName = entityMaster.entity_service;
-    const entityService = await this.reflectionHelper.getBean<EntityServiceImpl>(serviceName);
-    if (!entityService) throw new Error(`Entity service not found for ${entityType}`);
-  
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(serviceName);
+    if (!entityService)
+      throw new Error(`Entity service not found for ${entityType}`);
+
     for (const row of data) {
       const qb = this.entityManager
         .createQueryBuilder()
         .select('*')
         .from(entityMaster.db_table_name, entityMaster.db_table_name);
-  
+
       // Build OR conditions dynamically for unique fields
       uniqueFields.forEach((field, index) => {
         const condition = `${entityMaster.db_table_name}.${field} = :val${index}`;
         const param = { [`val${index}`]: row[field] };
-  
+
         if (index === 0) {
           qb.where(condition, param);
         } else {
           qb.orWhere(condition, param);
         }
       });
-  
+
       const existing = await qb.limit(1).getRawOne();
-  
+
       row.entity_type = entityType;
-  
+
       if (existing) {
         if (duplicateHandling === 'skip_duplicates') {
           continue; // Skip this row
@@ -310,8 +387,4 @@ export class MasterService {
       }
     }
   }
-  
-  
-  
-
 }

package/src/resources/dev.properties.yaml

@@ -1,7 +1,8 @@
-DB_HOST: "13.234.25.234"
+# DB_HOST: "13.234.25.234"
+DB_HOST: "localhost"
 DB_PORT: "3306"
 DB_USER: "root"
-DB_PASS: "Rezolut@123"
+DB_PASS: "root"
 DB_NAME: "core"
 MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
 MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="

package/src/resources/properties.yaml.ts

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

package/src/resources/uat.properties.yaml

@@ -1,7 +1,7 @@
-DB_HOST: "13.234.25.234"
+DB_HOST: "13.200.182.92"
 DB_PORT: "3306"
 DB_USER: "root"
-DB_PASS: "Rezolut@123"
+DB_PASS: "ether"
 DB_NAME: "ether_core"
 MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
 MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="