rez_core 2.1.28 → 2.1.29

package/package.json

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

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')