Feat/update optional

src/modules/users/dtos/IUpdateUserDTO.ts

@@ -1,9 +1,12 @@
 interface IUpdateUserDTO {
-  name: string;
-  email: string;
-  password: string;
-  language: string;
-  phone: string;
+  name?: string;
+  email?: string;
+  password?: string;
+  language?: string;
+  phone?: string;
+  image?: string;
+  gender?: string;
+  birthdate?: Date;
 }
 
 export default IUpdateUserDTO;

src/modules/users/infra/http/controller/UsersController.ts

@@ -38,13 +38,13 @@
     });
   }
 
   public async readAll(req: Request, res: Response): Promise<Response> {
 
     const readUsers = container.resolve(ReadAllUsersService);
 
     const users = await readUsers.execute();
 
     return res.status(201).json(users?.map(user => {
       return {
         ...user,
         password: undefined,
@@ -56,7 +56,7 @@
 
   public async readById(req: Request, res: Response): Promise<Response> {
     const { id } = req.token;
 
     const readUser = container.resolve(ReadUserByIdService);
 
     const user = await readUser.execute({
@@ -80,18 +80,24 @@
       password,
       language,
       phone,
+      image,
+      gender,
+      birthdate,
     } = req.body;
 
     const updateUser = container.resolve(UpdateUserService);
 
-    const user = await updateUser.execute({
+    const user = await updateUser.execute(
       id,
-      name,
+      { name,
       email,
       password,
       language,
       phone,
-    });
+      image,
+      gender,
+      birthdate, }
+    );
 
     return res.status(201).json({
       ...user,

src/modules/users/infra/prisma/entities/users.prisma

@@ -7,6 +7,9 @@ model Users {
   phone      String
   pin        String?
   pinExpires DateTime?
+  image      String?
+  gender     String?
+  birthdate  DateTime?
   created_at DateTime  @default(now())
   updated_at DateTime  @default(now())
 }

src/modules/users/services/UpdateUserService.ts

@@ -8,12 +8,14 @@ import IHashProvider from '@shared/container/providers/HashProvider/models/IHash
 import IUsersRepository from '../repositories/IUsersRepository';
 
 interface IRequest {
-  id: string;
-  name: string;
-  email: string;
-  password: string;
-  language: string;
-  phone: string;
+  name?: string;
+  email?: string;
+  password?: string;
+  language?: string;
+  phone?: string;
+  image?: string;
+  gender?: string;
+  birthdate?: Date;
 }
 
 @injectable()
@@ -26,23 +28,47 @@ export default class UpdateUserService {
     private hashProvider: IHashProvider,
   ) { }
 
-public async execute({
-  id, name, email, password, language, phone,
-}: IRequest): Promise<Users> {
+public async execute(id: string, updateData: IRequest): Promise<Users> {
     const userAlreadyExists = await this.usersRepository.findById(id);
 
     if (!userAlreadyExists) throw new AppError('User with this id does not exist');
+    if (updateData.email) {
+      const userWithUpdatedEmail = await this.usersRepository.findByEmailWithRelations(updateData.email);
+      if(userWithUpdatedEmail) {
+        if (userWithUpdatedEmail.id == id) {
+          throw new AppError('You cannot update your email to the same email');
+        }
+        if (userWithUpdatedEmail.id !== id) {
+          throw new AppError('User with same email already exists');
+        }
+      }
+    }
+    if(updateData.birthdate || updateData.birthdate == ''){ 
+      const birthdate = new Date(updateData.birthdate);
+      if (isNaN(birthdate.getTime())) {
+        throw new AppError('Birthdate is not a valid date');
+      }
+
+      if (birthdate > new Date()) {
+        throw new AppError('Birthdate cannot be greater than current date');
+      }
+    }
 
-    const hashedPassword = await this.hashProvider.generateHash(password);
+    const data = { ...userAlreadyExists, ...updateData };
+
+    let hashedPassword;
+    if(data.password){
+      hashedPassword = await this.hashProvider.generateHash(data.password.toString());
+    } else {
+      hashedPassword = data.password;
+    }
 
     const updatedUser = this.usersRepository.update(
     id,
     {
-      name,
-      email: email.toLowerCase(),
+      ...data,
+      email: data.email?.toLowerCase(),
       password: hashedPassword,
-      language,
-      phone,
     });
 
     return updatedUser;

src/shared/infra/prisma/migrations/20240824231846_extra_user_fields/migration.sql

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Users" ADD COLUMN     "birthdate" TIMESTAMP(3),
+ADD COLUMN     "gender" TEXT,
+ADD COLUMN     "image" TEXT;

src/shared/infra/prisma/schema.prisma

@@ -17,6 +17,9 @@ model Users {
   phone      String
   pin        String?
   pinExpires DateTime?
+  image      String?
+  gender     String?
+  birthdate  DateTime?
   created_at DateTime  @default(now())
   updated_at DateTime  @default(now())
 }