Merge pull request Ajared#68 from Ajared/feat/user-mgt

Author: prudentbird

backend/src/modules/admin/admin.controller.spec.ts

@@ -22,6 +22,10 @@ const mockUserService = {
   reactivateUser: jest.fn().mockResolvedValue(undefined),
   listUsers: jest.fn().mockResolvedValue({ data: [], total: 0 }),
   assignLocationToUser: jest.fn().mockResolvedValue(undefined),
+  deleteUser: jest.fn().mockResolvedValue(undefined),
+  updateUserRole: jest.fn().mockResolvedValue(undefined),
+  verifyUser: jest.fn().mockResolvedValue(undefined),
+  verifyUsersBulk: jest.fn().mockResolvedValue(undefined),
 };
 
 const mockAdminService = {
@@ -272,4 +276,86 @@ describe('AdminController', () => {
       await expect(controller.getStoreById(storeId)).rejects.toThrow(error);
     });
   });
+
+  describe('deleteUser', () => {
+    it('should call userService.deleteUser with correct id and return the expected result', async () => {
+      const userId = '123e4567-e89b-42d3-a456-426614174000';
+      const req = {
+        user: { sub: '123e4567-e89b-42d3-a456-426614174001' },
+      } as Request & {
+        user: { sub: string };
+      };
+      const expectedResult = {
+        message: 'User Deletion operation successful',
+      };
+      mockUserService.deleteUser.mockResolvedValueOnce(expectedResult);
+
+      const result = await controller.deleteUser(userId, req);
+
+      expect(mockUserService.deleteUser).toHaveBeenCalledWith(
+        userId,
+        req.user.sub,
+      );
+      expect(result).toEqual(expectedResult);
+    });
+
+    it('should handle errors from userService.deleteUser', async () => {
+      const userId = '123e4567-e89b-42d3-a456-426614174000';
+      const req = {
+        user: { sub: '123e4567-e89b-42d3-a456-426614174001' },
+      } as Request & {
+        user: { sub: string };
+      };
+      const error = new Error('Deletion failed');
+      mockUserService.deleteUser.mockRejectedValueOnce(error);
+
+      await expect(controller.deleteUser(userId, req)).rejects.toThrow(error);
+    });
+  });
+
+  describe('updateUserRole', () => {
+    it('should call userService.updateUserRole with correct arguments and return the expected result', async () => {
+      const userId = '123e4567-e89b-42d3-a456-426614174000';
+      const updateUserRoleDto = { role: 'admin' as any };
+      const req = {
+        user: { sub: '123e4567-e89b-42d3-a456-426614174001' },
+      } as Request & {
+        user: { sub: string };
+      };
+      const expectedResult = {
+        message: 'User Role Update operation successful',
+        data: { id: userId, role: 'admin' },
+      };
+      mockUserService.updateUserRole.mockResolvedValueOnce(expectedResult);
+
+      const result = await controller.updateUserRole(
+        userId,
+        updateUserRoleDto,
+        req,
+      );
+
+      expect(mockUserService.updateUserRole).toHaveBeenCalledWith(
+        userId,
+        'admin',
+        req.user.sub,
+      );
+      expect(result).toEqual(expectedResult);
+    });
+
+    it('should handle errors from userService.updateUserRole', async () => {
+      const userId = '123e4567-e89b-42d3-a456-426614174000';
+      const updateUserRoleDto = { role: 'admin' as any };
+      const req = {
+        user: { sub: '123e4567-e89b-42d3-a456-426614174001' },
+      } as Request & {
+        user: { sub: string };
+      };
+      const error = new Error('Role update failed');
+      mockUserService.updateUserRole.mockRejectedValueOnce(error);
+
+      await expect(
+        controller.updateUserRole(userId, updateUserRoleDto, req),
+      ).rejects.toThrow(error);
+    });
+  });
 });

backend/src/modules/admin/admin.controller.ts

@@ -8,6 +8,7 @@ import { UserRole } from '~/modules/user/constants/user.constant';
 import {
   Body,
   Controller,
+  Delete,
   Get,
   HttpCode,
   HttpStatus,
@@ -25,6 +26,7 @@ import {
   AssignLocationDto,
   UserQueryValidator,
   BulkApproveUsersDto,
+  UpdateUserRoleDto,
 } from '../user/dto/user.dto';
 
 @Controller('admin')
@@ -112,4 +114,29 @@ export class AdminController {
   async getStoreById(@Param('id') id: string) {
     return this.adminService.getStoreById(id);
   }
+
+  @Mutation()
+  @HttpCode(HttpStatus.OK)
+  @Delete('users/:userId')
+  async deleteUser(
+    @Param('userId') userId: string,
+    @Req() req: Request & { user: { sub: string } },
+  ) {
+    return this.userService.deleteUser(userId, req.user.sub);
+  }
+
+  @Mutation()
+  @HttpCode(HttpStatus.OK)
+  @Post('users/:userId/role')
+  async updateUserRole(
+    @Param('userId') userId: string,
+    @Body() updateUserRoleDto: UpdateUserRoleDto,
+    @Req() req: Request & { user: { sub: string } },
+  ) {
+    return this.userService.updateUserRole(
+      userId,
+      updateUserRoleDto.role,
+      req.user.sub,
+    );
+  }
 }

backend/src/modules/user/dto/user.dto.ts

@@ -9,6 +9,7 @@ import {
   IsArray,
   IsUUID,
 } from 'class-validator';
+import { UserRole } from '../constants/user.constant';
 import { QueryValidator } from '~/helpers/query.helper';
 import { AuthProvider } from '~/modules/auth/constants/auth.constant';
 
@@ -69,3 +70,9 @@ export class BulkApproveUsersDto {
   @IsUUID('4', { each: true })
   userIds: string[];
 }
+
+export class UpdateUserRoleDto {
+  @IsEnum(UserRole)
+  @IsNotEmpty()
+  role: UserRole;
+}