Merge pull request #138 from apurvaubade/DeleteRole_new

Role:Delete Role API

src/adapters/postgres/rbac/role-adapter.ts

@@ -13,6 +13,7 @@ import { ErrorResponseTypeOrm } from "src/error-response-typeorm";
 import { RoleSearchDto } from "../../../rbac/role/dto/role-search.dto";
 import { UserRoleMapping } from "src/rbac/assign-role/entities/assign-role.entity";
 import { Privilege } from "src/rbac/privilege/entities/privilege.entity";
+import { isUUID } from "class-validator";
 
 @Injectable()
 export class PostgresRoleService {
@@ -228,7 +229,37 @@ export class PostgresRoleService {
 
   public async deleteRole(roleId: string) {
     try {
-      let response = await this.roleRepository.delete(roleId);
+      if (!isUUID(roleId)) {
+        return new ErrorResponseTypeOrm({
+          statusCode: HttpStatus.BAD_REQUEST,
+          errorMessage: "Please Enter valid (UUID)",
+        });
+      }
+
+      const roleToDelete = await this.roleRepository.findOne({
+        where: { roleId: roleId },
+      });
+
+      if (!roleToDelete) {
+        return new ErrorResponseTypeOrm({
+          statusCode: HttpStatus.NOT_FOUND,
+          errorMessage: "Role  not found",
+        });
+      }
+      // Delete the role
+      const response = await this.roleRepository.delete(roleId);
+
+      // Delete entries from RolePrivilegesMapping table associated with the roleId
+      const rolePrivilegesDeleteResponse =
+        await this.roleprivilegeMappingRepository.delete({
+          roleId: roleId,
+        });
+
+      const userRoleDeleteResponse =
+        await this.userRoleMappingRepository.delete({
+          roleId: roleId,
+        });
+
       return new SuccessResponse({
         statusCode: HttpStatus.OK,
         message: "Role deleted successfully.",
@@ -239,7 +270,7 @@ export class PostgresRoleService {
     } catch (e) {
       return new ErrorResponseTypeOrm({
         statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
-        errorMessage: e,
+        errorMessage: "Internal server error", // Access the error message
       });
     }
   }

src/rbac/role/role.controller.ts

@@ -22,6 +22,8 @@ import {
   ApiCreatedResponse,
   ApiBasicAuth,
   ApiHeader,
+  ApiBadRequestResponse,
+  ApiNotFoundResponse,
 } from "@nestjs/swagger";
 import { Request } from "@nestjs/common";
 import { CreateRolesDto, RoleDto } from "./dto/role.dto";
@@ -108,12 +110,14 @@ export class RoleController {
   }
 
   //delete role
-  @Delete("/:id")
+  @Delete("/:roleId")
   @ApiBasicAuth("access-token")
-  @ApiCreatedResponse({ description: "Role deleted successfully." })
-  @ApiForbiddenResponse({ description: "Forbidden" })
+  @ApiHeader({ name: "tenantid" })
+  @ApiOkResponse({ description: "Role deleted successfully." })
+  @ApiNotFoundResponse({ description: "Data not found" })
+  @ApiBadRequestResponse({ description: "Bad request" })
   public async deleteRole(
-    @Param("id") roleId: string,
+    @Param("roleId") roleId: string,
     @Res() response: Response
   ) {
     const result = await this.roleAdapter.buildRbacAdapter().deleteRole(roleId);