🐛 Fix update user API bug

B3-3iL-DLW · May 17, 2024 · 30b82ee · 30b82ee
1 parent 0321494
commit 30b82ee
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 12 deletions.
diff --git a/backend-nest/src/api/users/dto/update-user.dto.ts b/backend-nest/src/api/users/dto/update-user.dto.ts
@@ -1,4 +1,10 @@
 import { PartialType } from '@nestjs/mapped-types';
 import { CreateUserDto } from './create-user.dto';
+import { IsNotEmpty } from 'class-validator';
 
-export class UpdateUserDto extends PartialType(CreateUserDto) {}
+export class UpdateUserBaseDto extends CreateUserDto {
+  @IsNotEmpty()
+  id: number;
+}
+
+export class UpdateUserDto extends PartialType(UpdateUserBaseDto) {}
diff --git a/backend-nest/src/api/users/users.controller.ts b/backend-nest/src/api/users/users.controller.ts
@@ -29,8 +29,8 @@ export class UsersController {
   }
 
   @Get(':id')
-  async findOne(@Param('id') id: string) {
-    return this.usersService.findOne({ id: Number(id) });
+  async findOne(@Param('id') id: number) {
+    return this.usersService.findOne(id);
   }
 
   @Post(':email')

diff --git a/backend-nest/src/api/users/users.service.ts b/backend-nest/src/api/users/users.service.ts
@@ -13,18 +13,16 @@ import { UpdateUserDto } from './dto/update-user.dto';
 export class UsersService {
   constructor(private prisma: PrismaService) {}
 
-  async findOne(
-    userWhereUniqueInput: Prisma.userWhereUniqueInput,
-  ): Promise<user | null> {
+  async findOne(id: number): Promise<user | null> {
     const existingUser = await this.prisma.user.findUnique({
-      where: userWhereUniqueInput,
+      where: { id: id },
     });
     if (!existingUser) {
       throw new NotFoundException('User not found');
     }
     try {
       return await this.prisma.user.findUnique({
-        where: userWhereUniqueInput,
+        where: { id: id },
       });
     } catch (error) {
       console.error(error);
@@ -70,7 +68,15 @@ export class UsersService {
   }
 
   async create(data: CreateUserDto): Promise<user> {
-    let existingUser;
+    let existingUser: {
+      id: number;
+      email: string;
+      password: string;
+      firstname: string;
+      lastname: string;
+      role: $Enums.user_role;
+      classGroupId: number;
+    };
     try {
       existingUser = await this.findOneByEmail(data.email);
     } catch (error) {
@@ -111,7 +117,7 @@ export class UsersService {
       classGroupId: number;
     };
     try {
-      existingUser = await this.findOneByEmail(params.data.email);
+      existingUser = await this.findOne(params.data.id);
     } catch (error) {
       if (error instanceof NotFoundException) {
         existingUser = null;
@@ -126,6 +132,13 @@ export class UsersService {
       throw new NotFoundException(errorMessage);
     }
 
+    const emailExists = await this.emailExists(params.data.email);
+    if (emailExists && params.data.email !== existingUser.email) {
+      const errorMessage = 'An account with this email already exists';
+      console.error(errorMessage);
+      throw new ConflictException(errorMessage);
+    }
+
     try {
       return await this.prisma.user.update(params);
     } catch (error) {
@@ -135,7 +148,7 @@ export class UsersService {
   }
 
   async delete(where: Prisma.userWhereUniqueInput): Promise<user> {
-    const existingUser = await this.findOne(where);
+    const existingUser = await this.findOne(where.id);
     if (!existingUser) {
       throw new NotFoundException('User not found');
     }
@@ -152,7 +165,7 @@ export class UsersService {
   }
 
   async updateClassGroup(userId: number, classGroupId: number): Promise<user> {
-    const existingUser = await this.findOne({ id: userId });
+    const existingUser = await this.findOne(userId);
     if (!existingUser) {
       throw new NotFoundException('User not found');
     }
@@ -171,4 +184,17 @@ export class UsersService {
       );
     }
   }
+
+  async emailExists(email: string): Promise<boolean> {
+    try {
+      const existingUser = await this.findOneByEmail(email);
+      return !!existingUser;
+    } catch (error) {
+      if (error instanceof NotFoundException) {
+        return false;
+      } else {
+        throw error;
+      }
+    }
+  }
 }