rez_core 2.2.33 → 2.2.35

package/package.json

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

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

@@ -0,0 +1,51 @@
+import {
+    Controller,
+    Post,
+    Body,
+    Param,
+    Req,
+  } from '@nestjs/common';
+  import { Request } from 'express';
+  import { AttributeMasterService } from '../service/attribute-master.service';
+  
+  @Controller('attribute-master')
+  export class AttributeMasterController {
+    constructor(
+      private readonly attributeMasterService: AttributeMasterService,
+    ) {}
+  
+    @Post("/create")
+    async createAttribute(
+      @Body() attributeData: any,
+      @Req() req: Request & { user: any },
+    ) {
+        let loggedInUser = req.user.userData;
+      return await this.attributeMasterService.createAttribute(
+        attributeData,
+        loggedInUser,
+      );
+    }
+  
+    @Post('update/:id')
+    async updateAttribute(
+      @Body() attributeData: any,
+      @Param('id') id: number,
+      @Req() req: Request & { user: any },
+    ) {
+        let loggedInUser = req.user.userData;
+      return await this.attributeMasterService.updateAttribute(
+        attributeData,
+        id,
+        loggedInUser,
+      );
+    }
+
+    @Post('getById/:id')
+    async getAttributeById(
+      @Param('id') id: number,
+      @Req() req: Request & { user: any },
+    ) {
+        
+    }
+  }
+  

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

@@ -40,4 +40,25 @@ export class AttributeMasterRepository {
       },
     });
   }
+
+  async createAttribute(
+    attributeData: AttributeMaster,
+  ): Promise<AttributeMaster> {
+    return await this.attributeMasterRepository.save(attributeData);
+  }
+
+  async updateAttribute(
+    attributeData: AttributeMaster,
+    id: number,
+  ): Promise<AttributeMaster | null> {
+    await this.attributeMasterRepository.update({ id }, attributeData);
+    return this.attributeMasterRepository.findOne({ where: { id } });
+  }
+
+  async getAttributeById(
+    id: number,
+  ): Promise<AttributeMaster | null> {
+    return await this.attributeMasterRepository.findOne({ where: { id } });
+  }
+
 }

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

@@ -1,9 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { AttributeMaster } from '../entity/attribute-master.entity';
 
 @Injectable()
-export class AttributeMasterService {
+export class AttributeMasterService  {
   constructor(
     private readonly attributeMasterRepository: AttributeMasterRepository,
   ) {}
@@ -17,4 +19,41 @@ export class AttributeMasterService {
       loggedInUser,
     );
   }
+
+  async createAttribute(
+    attributeData: AttributeMaster,
+    loggedInUser: UserData,
+  ): Promise<AttributeMaster> {
+    attributeData.organization_id = loggedInUser.organization_id;
+    attributeData.level_type = loggedInUser.level_type;
+    attributeData.level_id = loggedInUser.level_id;
+    return await this.attributeMasterRepository.createAttribute(attributeData);
+  }
+
+  async updateAttribute(
+    attributeData: AttributeMaster,
+    id: number,
+    loggedInUser: UserData,
+  ): Promise<AttributeMaster | null> {
+    attributeData.organization_id = loggedInUser.organization_id;
+    attributeData.level_type = loggedInUser.level_type;
+    attributeData.level_id = loggedInUser.level_id;
+    return await this.attributeMasterRepository.updateAttribute(attributeData, id);
+  }
+
+  async getAttributeById(
+    id: number,
+  ): Promise<AttributeMaster | null> {
+    return await this.attributeMasterRepository.getAttributeById(id);
+  }
+
+  async getAttributesByMappedEntityType(
+    entityType: string,
+    loggedInUser: UserData,
+  ): Promise<AttributeMaster[]> {
+    return await this.attributeMasterRepository.findAttributesByMappedEntityType(
+      entityType,
+      loggedInUser,
+    );
+  }
 }

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

@@ -94,10 +94,13 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
 
     const statusList = await repo.query(
       `SELECT id FROM cr_list_master_items WHERE code = ? AND organization_id = ?`,
-      [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
+      [STATUS_ACTIVE, loggedInUser?.organization_id],
     );
 
     console.log('Status List:', statusList); // Debug log
+    console.log(
+      `status_code,${STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`,
+    ); // Debug log
 
     entityData.created_date = new Date();
     if (loggedInUser) {

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

@@ -37,43 +37,6 @@ export class ViewMasterService extends EntityServiceImpl {
       manager,
     );
 
-    // let viewMaster = savedEntity as ViewMaster;
-    // if (entityData.type === 'form') {
-    //   let layout = viewMaster.published_form_layout;
-
-    //   const stepsData = this.sectionMasterService.parseLayout(layout);
-    //   for (var step of stepsData) {
-    //     let sectionMaster = new SectionMaster();
-    //     sectionMaster.name = step.stepLabel;
-    //     sectionMaster.position = step.stepPosition;
-    //     sectionMaster.description = step.stepLabel;
-    //     sectionMaster.parent_id = viewMaster.id;
-    //     sectionMaster.parent_type = viewMaster.entity_type;
-
-    //     const savedSectionMaster = await this.sectionMasterService.createEntity(
-    //       sectionMaster,
-    //       loggedInUser,
-    //       manager,
-    //     );
-
-    //     const fieldGroups = step.fieldsGroup;
-
-    //     for (var fieldGroup of fieldGroups) {
-    //       let fieldsGroup = new FieldGroup();
-    //       fieldsGroup.view_id = viewMaster.id;
-    //       fieldsGroup.parent_id = savedSectionMaster.id;
-    //       fieldsGroup.field_type = fieldGroup.type;
-    //       fieldsGroup.label = fieldGroup.label;
-    //       fieldsGroup.description = fieldGroup.label;
-
-    //       this.fieldGroupService.createEntity(
-    //         fieldsGroup,
-    //         loggedInUser,
-    //         manager,
-    //       );
-    //     }
-    //   }
-    // }
     return savedEntity;
   }
 
@@ -101,4 +64,12 @@ export class ViewMasterService extends EntityServiceImpl {
       };
     }
   }
+
+  async getEntityData(
+    entityType: string,
+    id: number,
+    loggedInUserData?: UserData | null,
+  ) { 
+    return await super.getEntityData(entityType, id,loggedInUserData);
+  }
 }

package/src/module/module/repository/menu.repository.ts

@@ -77,6 +77,7 @@ export class MenuRepository extends Repository<MenuData> {
       .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
       .andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
       .andWhere('menu.level_type = :levelType', { levelType })
+      .andWhere('menu.ui_visible = 1')
       .select([
         'menu.*',
         'module.component_name AS component',

package/src/module/workflow/controller/stage-group.controller.ts

@@ -2,6 +2,8 @@ import {
   Body,
   Controller,
   Get,
+  HttpCode,
+  HttpStatus,
   Inject,
   Post,
   Req,
@@ -29,4 +31,18 @@ export class StageGroupController {
       organization_id,
     );
   }
+
+  @Post('/get-all-stage-groups-and-stages')
+  @HttpCode(HttpStatus.OK)
+  async getAllStageGroupAndStageHierarchy(
+    @Req() req: Request & { user: any },
+    @Body() body: { workflow_id: number },
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return this.stageGroupService.getAllStageGroupAndStageHierarchy(
+      body.workflow_id,
+      loggedInUser.organization_id,
+    );
+  }
 }

package/src/module/workflow/repository/stage-group.repository.ts

@@ -6,13 +6,14 @@ import {
 } from '@nestjs/common';
 import { StageGroup } from '../entity/stage-group.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 
 @Injectable()
 export class StageGroupRepository {
   constructor(
     @InjectRepository(StageGroup)
     private readonly stageGroupRepository: Repository<StageGroup>,
+    private readonly dataSource: DataSource,
   ) {}
 
   async getAllStageGroup(workflow_id: number, organization_id: number) {
@@ -38,4 +39,53 @@ export class StageGroupRepository {
 
     return result;
   }
+
+  async getAllStageGroupAndStageHierarchy(
+    workflow_id: number,
+    organization_id: number,
+  ) {
+    if (!workflow_id) {
+      throw new BadRequestException('workflow_id is required');
+    }
+
+    // Step 1: Get all stage groups
+    const stageGroups = await this.getAllStageGroup(
+      workflow_id,
+      organization_id,
+    );
+
+    if (!stageGroups.length) return [];
+
+    // Step 2: Get all stages where stage_group_id IN (...)
+    const stageGroupIds = stageGroups.map((sg) => sg.id);
+
+    const stages = await this.dataSource.query(
+      `
+    SELECT * FROM cr_wf_stage
+    WHERE stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
+      AND organization_id = ?
+    ORDER BY sequence ASC
+    `,
+      [...stageGroupIds, organization_id],
+    );
+
+    // Step 3: Group stages by stage_group_id
+    const stageMap = new Map<number, any[]>();
+    for (const stage of stages) {
+      if (!stageMap.has(stage.stage_group_id)) {
+        stageMap.set(stage.stage_group_id, []);
+      }
+      stageMap.get(stage.stage_group_id)?.push(stage);
+    }
+
+    // Step 4: Attach stages to stage groups
+    const result = stageGroups.map((stageGroup) => {
+      return {
+        ...stageGroup,
+        stages: stageMap.get(Number(stageGroup.id)) || [],
+      };
+    });
+
+    return result;
+  }
 }

package/src/module/workflow/service/stage-group.service.ts

@@ -23,6 +23,16 @@ export class StageGroupService extends EntityServiceImpl {
     );
   }
 
+  async getAllStageGroupAndStageHierarchy(
+    workflow_id: number,
+    organization_id: number,
+  ) {
+    return await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
+      workflow_id,
+      organization_id,
+    );
+  }
+
   async updateEntity(
     entityData: BaseEntity,
     loggedInUser: UserData,

package/src/resources/dev.properties.yaml

@@ -1,9 +1,9 @@
-# DB_HOST: "13.234.25.234"
-DB_HOST: 'localhost'
+DB_HOST: "13.234.25.234"
+# DB_HOST: 'localhost'
 DB_PORT: '3306'
 DB_USER: 'root'
-DB_PASS: 'root'
-DB_NAME: 'eth_core_local'
+DB_PASS: 'Rezolut@123'
+DB_NAME: 'package_core'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'