rez_core 2.1.27 → 2.1.29

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -25,6 +25,7 @@ export class FilterService {
     column: string | undefined,
     whereClauses: { query: string; params: Record<string, any> }[],
   ) {
+    console.log('GTETABCOUNTS', tableName, column, whereClauses);
     if (!column) return [];
 
     let whereSQL = '';
@@ -95,6 +96,8 @@ export class FilterService {
         'LIST',
       );
 
+    console.log(getTableMeta, 'GETTABLEMETA');
+
     if (!getTableMeta) {
       throw new BadRequestException(
         `Table meta not found for entity_type: ${entity_type}`,
@@ -107,6 +110,7 @@ export class FilterService {
         true,
       );
 
+    console.log(getTableColumnMeta, 'GETTABLECOLUMNMETA');
     // const attributeMeta =
     //   await this.attributeMasterService.findAttributesByMappedEntityType(
     //     entity_type,
@@ -119,6 +123,7 @@ export class FilterService {
       {} as Record<string, any>,
     );
 
+    console.log(attributeMetaMap, 'ATTRIBUTEMETAMAP');
     // Get and parse filters
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     const baseFilters = [
@@ -128,7 +133,7 @@ export class FilterService {
     ];
 
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
-
+    console.log(baseWhere, 'BASEWHERE', level_type, level_id);
     if (level_type && level_id) {
       baseWhere.push({
         query: 'e.level_type = :level_type AND e.level_id = :level_id',
@@ -139,7 +144,9 @@ export class FilterService {
       });
     }
 
+    console.log('OUSTSIDE SKIP');
     if (this.skipLevelFilterEntities.includes(entity_type)) {
+      console.log('INSIDE SKIP');
       baseWhere.push({
         query: 'e.appcode = :appcode',
         params: { appcode },
@@ -153,12 +160,15 @@ export class FilterService {
       [user_id, entity_type],
     );
 
+    console.log('LAYOUTPREFERNECE', layoutPreference);
+
     // Extract layout preference
     const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
     let showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
     let allTabs;
     if (layout.attribute) {
+      console.log('IN LAYOUT');
       allTabs = await this.gettab_value_counts(
         getTableMeta.data_source,
         layout.attribute,
@@ -210,6 +220,8 @@ export class FilterService {
       filteredTabs = allTabs;
     }
 
+    console.log(allTabs, 'ALLTABSE');
+
     const dataWhere = [...baseWhere];
 
     if (tabs?.columnName && tabs?.value) {

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

@@ -13,6 +13,8 @@ import {
   UseGuards,
   Inject,
   Request,
+  InternalServerErrorException,
+  NotFoundException,
 } from '@nestjs/common';
 import { EntityServiceImpl } from '../service/entity-service-impl.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
@@ -63,56 +65,36 @@ export class EntityController {
   async create(
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
-    @Res() res: Response,
     @Req() req: Request & { user: any },
   ) {
-    try {
-      let loggedInUser = req.user.userData;
-      let appcode = req.user.userData.appcode;
-      if (!entityType) {
-        return res.status(HttpStatus.BAD_REQUEST).json({
-          success: false,
-          error: 'Query parameter "entity_type" is required',
-        });
-      }
-      const entityMaster =
-        await this.entityMasterService.getEntityData(entityType);
+    let loggedInUser = req.user.userData;
+    let appcode = req.user.userData.appcode;
 
-      const entityService =
-        await this.reflectionHelper.getBean<EntityServiceImpl>(
-          entityMaster.entity_service,
-        );
-
-      if (!entityService) {
-        return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
-          success: false,
-          error: `No service found for Entity Type ${entityType}`,
-        });
-      }
-      const createdEntity = await entityService.createEntity(
-        entityData,
-        loggedInUser as UserData,
-        null,
-        appcode,
+    if (!entityType) {
+      throw new BadRequestException(
+        `Query parameter "entity_type" is required`,
       );
+    }
 
-      if (!createdEntity) {
-        return res.status(HttpStatus.BAD_REQUEST).json({
-          success: false,
-          error: createdEntity?.error || 'Entity creation failed',
-        });
-      }
+    const entityMaster =
+      await this.entityMasterService.getEntityData(entityType);
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(
+        entityMaster.entity_service,
+      );
 
-      return res.status(HttpStatus.OK).json({
-        success: true,
-        data: createdEntity,
-      });
-    } catch (error) {
-      return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
-        success: false,
-        error: error.message || 'Internal server error',
-      });
+    if (!entityService) {
+      throw new InternalServerErrorException(
+        `No service found for Entity Type ${entityType}`,
+      );
     }
+
+    return entityService.createEntity(
+      entityData,
+      loggedInUser as UserData,
+      null,
+      appcode,
+    );
   }
 
   @Post('update/:id')
@@ -120,68 +102,44 @@ export class EntityController {
     @Param('id') id: number,
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
-    @Res() response: Response,
     @Req() req: Request & { user: any },
   ) {
-    try {
-      let loggedInUser = req.user.userData;
-      // let loggedInUser = await this.entityService.getEntityData(
-      //   ENTITYTYPE_USER,
-      //   requestedUser.userId,
-      // );
-      if (!entityType) {
-        return response.status(HttpStatus.BAD_REQUEST).json({
-          success: false,
-          error: 'Query parameter "entity_type" is required',
-        });
-      }
+    const loggedInUser = req.user.userData;
 
-      const entityMaster =
-        await this.entityMasterService.getEntityData(entityType);
-
-      const entityService =
-        await this.reflectionHelper.getBean<EntityServiceImpl>(
-          entityMaster.entity_service,
-        );
-
-      if (!entityService) {
-        return response.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
-          success: false,
-          error: `No service found for entity_type "${entityType}"`,
-        });
-      }
+    if (!entityType) {
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
+    }
 
-      let existingEntity = await entityService.getEntityData(entityType, id);
-      if (!existingEntity) {
-        return response.status(HttpStatus.NOT_FOUND).json({
-          success: false,
-          error: `No entity found for id "${id}"`,
-        });
-      }
-      // let mergeEntity = JsonUtil.merge(existingEntity, entityData);
+    const entityMaster =
+      await this.entityMasterService.getEntityData(entityType);
 
-      const updatedEntity = await entityService.updateEntity(
-        entityData,
-        loggedInUser as UserData,
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(
+        entityMaster.entity_service,
       );
 
-      if (!updatedEntity) {
-        return response.status(HttpStatus.BAD_REQUEST).json({
-          success: false,
-          error: updatedEntity?.error || 'Entity creation failed',
-        });
-      }
+    if (!entityService) {
+      throw new InternalServerErrorException(
+        `No service found for entity_type "${entityType}"`,
+      );
+    }
 
-      return response.status(HttpStatus.OK).json({
-        success: true,
-        data: updatedEntity.data,
-      });
-    } catch (error) {
-      return response.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
-        success: false,
-        error: error.message || 'Internal server error',
-      });
+    const existingEntity = await entityService.getEntityData(entityType, id);
+    if (!existingEntity) {
+      throw new NotFoundException(`No entity found for id "${id}"`);
     }
+
+    const updatedEntity = await entityService.updateEntity(
+      entityData,
+      loggedInUser as UserData,
+    );
+
+    return {
+      success: true,
+      data: updatedEntity.data,
+    };
   }
 
   @Post('getFilteredDataWithTabs/:entity_type')