Compare commits
No commits in common. "3c2ecdff7a32338d81f32e42c3ed8217be03e0d0" and "5950d858769bf750f51db71bcc5956e5a12dd946" have entirely different histories.
3c2ecdff7a
...
5950d85876
@ -91,7 +91,13 @@ export class GestionnairesService {
|
|||||||
gestionnaire.password = await bcrypt.hash(dto.password, salt);
|
gestionnaire.password = await bcrypt.hash(dto.password, salt);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { password, ...rest } = dto;
|
if (dto.date_consentement_photo !== undefined) {
|
||||||
|
gestionnaire.date_consentement_photo = dto.date_consentement_photo
|
||||||
|
? new Date(dto.date_consentement_photo)
|
||||||
|
: undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { password, date_consentement_photo, ...rest } = dto;
|
||||||
Object.entries(rest).forEach(([key, value]) => {
|
Object.entries(rest).forEach(([key, value]) => {
|
||||||
if (value !== undefined) {
|
if (value !== undefined) {
|
||||||
(gestionnaire as any)[key] = value;
|
(gestionnaire as any)[key] = value;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import { Body, Controller, Delete, Get, Param, Patch, Post, Query, UseGuards } from '@nestjs/common';
|
import { Body, Controller, Delete, Get, Param, Patch, Post, UseGuards } from '@nestjs/common';
|
||||||
import { ApiBearerAuth, ApiOperation, ApiParam, ApiResponse, ApiTags } from '@nestjs/swagger';
|
import { ApiBearerAuth, ApiOperation, ApiParam, ApiResponse, ApiTags } from '@nestjs/swagger';
|
||||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
import { Roles } from 'src/common/decorators/roles.decorator';
|
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||||
@ -38,16 +38,6 @@ export class UserController {
|
|||||||
return this.userService.createUser(dto, currentUser);
|
return this.userService.createUser(dto, currentUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lister les utilisateurs en attente de validation
|
|
||||||
@Get('pending')
|
|
||||||
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR, RoleType.GESTIONNAIRE)
|
|
||||||
@ApiOperation({ summary: 'Lister les utilisateurs en attente de validation' })
|
|
||||||
findPendingUsers(
|
|
||||||
@Query('role') role?: RoleType
|
|
||||||
) {
|
|
||||||
return this.userService.findPendingUsers(role);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lister tous les utilisateurs (super_admin uniquement)
|
// Lister tous les utilisateurs (super_admin uniquement)
|
||||||
@Get()
|
@Get()
|
||||||
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR)
|
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR)
|
||||||
|
|||||||
@ -132,14 +132,6 @@ export class UserService {
|
|||||||
return this.usersRepository.save(entity);
|
return this.usersRepository.save(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
async findPendingUsers(role?: RoleType): Promise<Users[]> {
|
|
||||||
const where: any = { statut: StatutUtilisateurType.EN_ATTENTE };
|
|
||||||
if (role) {
|
|
||||||
where.role = role;
|
|
||||||
}
|
|
||||||
return this.usersRepository.find({ where });
|
|
||||||
}
|
|
||||||
|
|
||||||
async findAll(): Promise<Users[]> {
|
async findAll(): Promise<Users[]> {
|
||||||
return this.usersRepository.find();
|
return this.usersRepository.find();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user