Remove User and AdminUser controllers; update import paths in UserModule to reflect new directory structure.

src/modules/users/controllers/adminUser.controller.ts

@@ -1,11 +1,13 @@
 import { Controller, Get, UseGuards, Query, ValidationPipe } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth, ApiOperation, ApiOkResponse } from '@nestjs/swagger';
 import { AdminAuthGuard } from 'src/modules/auth/guards/adminAuth.guard';
-import { UserService } from './user.service';
-import { FindUsersDto } from './dto/find-user.dto';
+import { UserService } from '../user.service';
+import { FindUsersDto } from '../dto/find-user.dto';
 import { UserId } from 'src/common/decorators/user-id.decorator';
 import { RestId } from 'src/common/decorators';
 
+@UseGuards(AdminAuthGuard)
+@ApiBearerAuth()
 @ApiTags('Admin/User')
 @Controller('admin/user')
 export class AdminUserController {

src/modules/users/controllers/user.controller.ts

@@ -1,41 +1,32 @@
 import { Controller, Get, UseGuards, Patch, Body, ValidationPipe } from '@nestjs/common';
-import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
+import { ApiTags, ApiBearerAuth, ApiOperation, ApiBody } from '@nestjs/swagger';
 import { AdminAuthGuard } from 'src/modules/auth/guards/adminAuth.guard';
-import { UserService } from './user.service';
-import { UpdateUserDto } from './dto/update-user.dto';
+import { UserService } from '../user.service';
+import { UpdateUserDto } from '../dto/update-user.dto';
 import { UserId } from 'src/common/decorators/user-id.decorator';
 
+@UseGuards(AdminAuthGuard)
+@ApiBearerAuth()
 @ApiTags('User')
 @Controller('user')
 export class UserController {
   constructor(private readonly userService: UserService) {}
 
-  @UseGuards(AdminAuthGuard)
-  @ApiBearerAuth()
   @ApiOperation({ summary: 'Get the current authenticated user profile' })
   @Get('/me')
   async getUser(@UserId() userId: string) {
     const user = await this.userService.findById(userId);
-    return {
-      message: `GET request: Retrieving profile for authenticated user`,
-      user,
-      userId,
-    };
+    return user;
   }
 
-  @UseGuards(AdminAuthGuard)
-  @ApiBearerAuth()
   @ApiOperation({ summary: 'Update the authenticated user profile' })
+  @ApiBody({ type: UpdateUserDto })
   @Patch('/')
   async updateUser(
     @UserId() userId: string,
     @Body(new ValidationPipe({ transform: true, whitelist: true })) dto: UpdateUserDto,
   ) {
     const user = await this.userService.updateUser(userId, dto);
-    return {
-      message: `PATCH request: Updating profile for user ${userId}`,
-      userId,
-      user,
-    };
+    return user;
   }
 }

src/modules/users/user.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { UserService } from './user.service';
-import { AdminUserController } from './adminUser.controller';
+import { AdminUserController } from './controllers/adminUser.controller';
 import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { User } from './entities/user.entity';
 import { JwtModule } from '@nestjs/jwt';