Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion backend/src/admin/admin.controller.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Controller, Patch, Delete, Param, Body, ParseUUIDPipe, HttpCode, HttpStatus, UseGuards } from '@nestjs/common';
import { Controller, Patch, Delete, Param, Body, ParseUUIDPipe, HttpCode, HttpStatus, UseGuards, Get } from '@nestjs/common';
import { UsersService } from '../users/providers/users.service';
import { UpdateUserDto } from '../users/dto/updateUser.dto';
import { RolesGuard } from '../auth/guards/roles.guard';
Expand All @@ -13,6 +13,30 @@ import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
export class AdminController {
constructor(private readonly usersService: UsersService) {}

// GET /admin
@Get()
@Roles(UserRole.ADMIN)
async getAdmins() {
const admins = await this.usersService.findAllAdmins();
return {
success: true,
message: 'Admins retrieved successfully',
data: admins,
};
}

// GET /admin/:id
@Get(':id')
@Roles(UserRole.ADMIN)
async getAdmin(@Param('id', ParseUUIDPipe) id: string) {
const admin = await this.usersService.findAdminById(id);
return {
success: true,
message: `Admin ${id} retrieved successfully`,
data: admin,
};
}

// PATCH /admin/:id
@Patch(':id')
@Roles(UserRole.ADMIN)
Expand Down
33 changes: 33 additions & 0 deletions backend/src/users/providers/findAdminById.provider.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { User } from '../entities/user.entity';
import { Repository } from 'typeorm';
import { UserRole } from '../enums/userRoles.enum';
import { ErrorCatch } from '../../utils/error';

@Injectable()
export class FindAdminByIdProvider {
constructor(
@InjectRepository(User)
private readonly usersRepository: Repository<User>,
) {}

public async getAdmin(id: string): Promise<User> {
try {
const admin = await this.usersRepository.findOne({
where: {
id,
role: UserRole.ADMIN,
},
});

if (!admin) {
throw new NotFoundException(`Admin with ID ${id} not found`);
}

return admin;
} catch (error) {
ErrorCatch(error, 'Error retrieving admin details');
}
}
}
24 changes: 24 additions & 0 deletions backend/src/users/providers/findAllAdmins.provider.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { User } from '../entities/user.entity';
import { UserRole } from '../enums/userRoles.enum';
import { ErrorCatch } from '../../utils/error';

@Injectable()
export class FindAllAdminsProvider {
constructor(
@InjectRepository(User)
private readonly usersRepository: Repository<User>,
) {}

async getAdmins(): Promise<User[]> {
try {
return await this.usersRepository.find({
where: { role: UserRole.ADMIN },
});
} catch (error) {
ErrorCatch(error, 'Error fetching admins');
}
}
}
15 changes: 15 additions & 0 deletions backend/src/users/providers/users.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { UploadProfilePictureProvider } from './uploadProfilePicture.provider';
import { UserRole } from '../enums/userRoles.enum';
import { ForgotPasswordProvider } from './forgotPassword.provider';
import { ResetPasswordProvider } from './resetPassword.provider';
import { FindAllAdminsProvider } from './findAllAdmins.provider';
import { FindAdminByIdProvider } from './findAdminById.provider';

@Injectable()
export class UsersService {
Expand All @@ -38,6 +40,9 @@ export class UsersService {

private readonly forgotPasswordProvider: ForgotPasswordProvider,
private readonly resetPasswordProvider: ResetPasswordProvider,

private readonly findAllAdminsProvider: FindAllAdminsProvider,
private readonly findAdminByIdProvider: FindAdminByIdProvider,
) {}

// CREATE USER
Expand All @@ -53,11 +58,21 @@ export class UsersService {
return await this.findAllUsersProvider.getUsers();
}

// FIND ALL ADMINS
async findAllAdmins(): Promise<User[]> {
return await this.findAllAdminsProvider.getAdmins();
}

// FIND USER BY ID
async findUserById(id: string): Promise<User> {
return await this.findOneUserByIdProvider.getUser(id);
}

// FIND ADMIN BY ID
async findAdminById(id: string): Promise<User> {
return await this.findAdminByIdProvider.getAdmin(id);
}

// FIND USER BY EMAIL
async findUserByEmail(email: string): Promise<User> {
return await this.findOneUserByEmailProvider.getUser(email);
Expand Down
4 changes: 4 additions & 0 deletions backend/src/users/users.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { DeleteUserProvider } from './providers/deleteUser.provider';
import { UploadProfilePictureProvider } from './providers/uploadProfilePicture.provider';
import { ForgotPasswordProvider } from './providers/forgotPassword.provider';
import { ResetPasswordProvider } from './providers/resetPassword.provider';
import { FindAllAdminsProvider } from './providers/findAllAdmins.provider';
import { FindAdminByIdProvider } from './providers/findAdminById.provider';

@Module({
imports: [TypeOrmModule.forFeature([User]), forwardRef(() => AuthModule), CloudinaryModule, EmailModule],
Expand All @@ -34,6 +36,8 @@ import { ResetPasswordProvider } from './providers/resetPassword.provider';
UploadProfilePictureProvider,
ForgotPasswordProvider,
ResetPasswordProvider,
FindAllAdminsProvider,
FindAdminByIdProvider,
],
exports: [UsersService],
})
Expand Down