diff --git a/build.gradle.kts b/build.gradle.kts index 39bf11b..133f628 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-validation") implementation("org.flywaydb:flyway-core") implementation("org.flywaydb:flyway-database-postgresql:11.10.0") implementation("org.postgresql:postgresql") diff --git a/src/main/java/ru/team58/profileservice/controller/UserController.java b/src/main/java/ru/team58/profileservice/controller/UserController.java index 2c18b1b..446b742 100644 --- a/src/main/java/ru/team58/profileservice/controller/UserController.java +++ b/src/main/java/ru/team58/profileservice/controller/UserController.java @@ -1,6 +1,8 @@ package ru.team58.profileservice.controller; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import ru.team58.profileservice.controller.exceptions.BadRequestException; import ru.team58.profileservice.controller.exceptions.UnauthorizedException; @@ -9,7 +11,7 @@ import ru.team58.profileservice.controller.schemes.CreateUserRequest; import ru.team58.profileservice.controller.schemes.GetUserResponse; import ru.team58.profileservice.controller.schemes.UpdateUserRequest; import ru.team58.profileservice.controller.schemes.UserResponse; -import ru.team58.profileservice.mapper.UserMapper; +import ru.team58.profileservice.mapper.*; import ru.team58.profileservice.service.UserDTO; import ru.team58.profileservice.service.UserService; import ru.team58.profileservice.service.exceptions.UserAlreadyExistsException; @@ -22,6 +24,18 @@ public class UserController { @Autowired UserService userService; + @Autowired + UserResponseMapper userResponseMapper; + + @Autowired + GetUserMapper getUserMapper; + + @Autowired + UpdateUserMapper updateUserMapper; + + @Autowired + CreateUserMapper createUserMapper; + @GetMapping("/") public UserResponse getMe(Principal principal) { if (principal == null) { @@ -34,11 +48,11 @@ public class UserController { throw new UserNotFoundException(); } - return UserMapper.INSTANCE.toUserResponse(userService.getByUsername(principal.getName())); + return userResponseMapper.toUserResponse(userService.getByUsername(principal.getName())); } - @PutMapping("/") - public void updateMe(Principal principal, @RequestBody UpdateUserRequest request) { + @PutMapping(value = "/", consumes = {MediaType.APPLICATION_JSON_VALUE}) + public void updateMe(Principal principal, @Valid @RequestBody UpdateUserRequest request) { if (principal == null) { throw new UnauthorizedException(); } @@ -49,7 +63,7 @@ public class UserController { throw new UserNotFoundException(); } - userService.updateUser(UserMapper.INSTANCE.toUserDTO(request)); + userService.updateUser(updateUserMapper.toUserDTO(request)); } @DeleteMapping("/") @@ -69,9 +83,9 @@ public class UserController { userService.deleteUser(user.getId()); } - @PostMapping("/") - public void createMe(@RequestBody CreateUserRequest request) { - UserDTO user = UserMapper.INSTANCE.toUserDTO(request); + @PostMapping(value = "/", consumes = MediaType.APPLICATION_JSON_VALUE) + public void createMe(@Valid @RequestBody CreateUserRequest request) { + UserDTO user = createUserMapper.toUserDTO(request); try { userService.createUser(user); @@ -92,7 +106,7 @@ public class UserController { throw new UserNotFoundException(); } - return UserMapper.INSTANCE.toGetUserResponse(user); + return getUserMapper.toGetUserResponse(user); } @DeleteMapping("/{id}") diff --git a/src/main/java/ru/team58/profileservice/controller/advice/ErrorDTO.java b/src/main/java/ru/team58/profileservice/controller/advice/ErrorDTO.java new file mode 100644 index 0000000..a22df5a --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/advice/ErrorDTO.java @@ -0,0 +1,16 @@ +package ru.team58.profileservice.controller.advice; + +import lombok.*; +import org.springframework.http.HttpStatus; + +import java.util.List; + +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +@Builder +public class ErrorDTO { + HttpStatus status; + List errors; +} diff --git a/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java b/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java index bd0d990..b9f7546 100644 --- a/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java +++ b/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java @@ -2,39 +2,63 @@ package ru.team58.profileservice.controller.advice; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; import ru.team58.profileservice.controller.exceptions.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @ControllerAdvice public class UserControllerExceptionHandler { @ExceptionHandler(UserNotFoundException.class) - public ResponseEntity handleUserNotFoundException(UserNotFoundException ex) { - ErrorDetails errorDetails = new ErrorDetails("User not found", HttpStatus.FORBIDDEN.value()); - return new ResponseEntity<>(errorDetails, HttpStatus.FORBIDDEN); + public ResponseEntity handleUserNotFoundException(UserNotFoundException ex) { + var error = new ErrorDTO(HttpStatus.FORBIDDEN, List.of("User not found")); + return ResponseEntity.status(error.status).body(error); } @ExceptionHandler(UserAlreadyExistsException.class) - public ResponseEntity handleUserAlreadyExistsException(UserAlreadyExistsException ex) { - ErrorDetails errorDetails = new ErrorDetails("User already exists", HttpStatus.BAD_REQUEST.value()); - return new ResponseEntity<>(errorDetails, HttpStatus.BAD_REQUEST); + public ResponseEntity handleUserAlreadyExistsException(UserAlreadyExistsException ex) { + var errorDetails = new ErrorDetails("User already exists", HttpStatus.BAD_REQUEST.value()); + var error = new ErrorDTO(HttpStatus.BAD_REQUEST, List.of("User already exists")); + return ResponseEntity.status(error.status).body(error); } @ExceptionHandler(BadRequestException.class) - public ResponseEntity handleBadRequestException(BadRequestException ex) { - ErrorDetails errorDetails = new ErrorDetails("Bad Request", HttpStatus.BAD_REQUEST.value()); - return new ResponseEntity<>(errorDetails, HttpStatus.BAD_REQUEST); + public ResponseEntity handleBadRequestException(BadRequestException ex) { + var error = new ErrorDTO(HttpStatus.BAD_REQUEST, List.of("Bad request")); + return ResponseEntity.status(error.status).body(error); } @ExceptionHandler(ForbiddenException.class) - public ResponseEntity handleForbiddenException(ForbiddenException ex) { - ErrorDetails errorDetails = new ErrorDetails("Forbidden", HttpStatus.FORBIDDEN.value()); - return new ResponseEntity<>(errorDetails, HttpStatus.FORBIDDEN); + public ResponseEntity handleForbiddenException(ForbiddenException ex) { + var error = new ErrorDTO(HttpStatus.FORBIDDEN, List.of("Forbidden")); + return ResponseEntity.status(error.status).body(error); } @ExceptionHandler(UnauthorizedException.class) - public ResponseEntity handleUnauthorizedException(UnauthorizedException ex) { - ErrorDetails errorDetails = new ErrorDetails("Unauthorized", HttpStatus.UNAUTHORIZED.value()); - return new ResponseEntity<>(errorDetails, HttpStatus.UNAUTHORIZED); + public ResponseEntity handleUnauthorizedException(UnauthorizedException ex) { + var error = new ErrorDTO(HttpStatus.UNAUTHORIZED, List.of("Unauthorized")); + return ResponseEntity.status(error.status).body(error); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationExceptions( + MethodArgumentNotValidException ex) { + var errors = new ArrayList(); + ex.getBindingResult().getAllErrors().forEach((error) -> { + var fieldName = ((FieldError) error).getField(); + var errorMessage = error.getDefaultMessage(); + errors.add(String.format("%s: %s", fieldName, errorMessage)); + }); + + var error = new ErrorDTO(HttpStatus.BAD_REQUEST, errors); + return ResponseEntity.status(error.status).body(error); } } diff --git a/src/main/java/ru/team58/profileservice/controller/exceptions/IncorrectEmailException.java b/src/main/java/ru/team58/profileservice/controller/exceptions/IncorrectEmailException.java new file mode 100644 index 0000000..7e35e40 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/exceptions/IncorrectEmailException.java @@ -0,0 +1,4 @@ +package ru.team58.profileservice.controller.exceptions; + +public class IncorrectEmailException extends BadRequestException { +} diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java b/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java index 6344ece..428ab9a 100644 --- a/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java +++ b/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java @@ -1,15 +1,10 @@ package ru.team58.profileservice.controller.schemes; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; +import lombok.*; +import lombok.experimental.SuperBuilder; @Getter @Setter -@Builder -public class CreateUserRequest { - String username; - String firstName; - String lastName; - String email; -} +@SuperBuilder +@NoArgsConstructor +public class CreateUserRequest extends UserScheme {} diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java b/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java index 6548494..51cadcb 100644 --- a/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java +++ b/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java @@ -1,18 +1,13 @@ package ru.team58.profileservice.controller.schemes; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; +import lombok.*; +import lombok.experimental.SuperBuilder; import java.util.UUID; @Getter @Setter -@Builder -public class UpdateUserRequest { - UUID id; - String username; - String firstName; - String lastName; - String email; +@SuperBuilder +@NoArgsConstructor +public class UpdateUserRequest extends UserScheme { } diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java b/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java new file mode 100644 index 0000000..49246ba --- /dev/null +++ b/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java @@ -0,0 +1,41 @@ +package ru.team58.profileservice.controller.schemes; + +import jakarta.validation.constraints.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +import java.util.UUID; + +@SuperBuilder +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class UserScheme { + private UUID id; + + @NotBlank(message = "Username cannot be empty") + @Pattern(regexp = "^[a-z0-9.]+$", message = "Username can have only characters: a-z and 0-9") + @Size(min = 3, max = 14, message = "Username must be bigger than 3 and less than 14") + private String username; + + @NotBlank(message = "First name cannot be empty") + @Pattern(regexp = "^[a-zA-Zа-яА-Я]*$", message = "First name can contain only letters") + @Size(min = 3, max = 255, message = "First name must be bigger than 3 and less than 255") + private String firstName; + + @NotBlank(message = "Last name cannot be empty") + @Pattern(regexp = "^[a-zA-Zа-яА-Я]*$", message = "Last name can contain only letters") + @Size(min = 3, max = 255, message = "Last name must be bigger than 3 and less than 255") + private String lastName; + + @NotBlank + @Email(regexp = "[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,3}", message = """ + Email can contain: a-z, 0-9, '.', '_', '%', '+', '-'. + And have format like: "example@domain.com".""") + @Size(min = 5, max = 255, message = "Email must be bigger than 5 and less than 255") + private String email; +} diff --git a/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java b/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java new file mode 100644 index 0000000..b1a6df8 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java @@ -0,0 +1,12 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import ru.team58.profileservice.controller.schemes.CreateUserRequest; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(componentModel = "spring") +public interface CreateUserMapper { + @Mapping(target = "id", ignore = true) + UserDTO toUserDTO(CreateUserRequest request); +} diff --git a/src/main/java/ru/team58/profileservice/mapper/GetUserMapper.java b/src/main/java/ru/team58/profileservice/mapper/GetUserMapper.java new file mode 100644 index 0000000..7750f75 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/GetUserMapper.java @@ -0,0 +1,11 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import ru.team58.profileservice.controller.schemes.GetUserResponse; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(componentModel = "spring") +public interface GetUserMapper { + GetUserResponse toGetUserResponse(UserDTO dto); +} diff --git a/src/main/java/ru/team58/profileservice/mapper/UpdateUserMapper.java b/src/main/java/ru/team58/profileservice/mapper/UpdateUserMapper.java new file mode 100644 index 0000000..f8e67ca --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UpdateUserMapper.java @@ -0,0 +1,10 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import ru.team58.profileservice.controller.schemes.UpdateUserRequest; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(componentModel = "spring") +public interface UpdateUserMapper { + UserDTO toUserDTO(UpdateUserRequest request); +} diff --git a/src/main/java/ru/team58/profileservice/mapper/UserDTOMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserDTOMapper.java new file mode 100644 index 0000000..9d39f48 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UserDTOMapper.java @@ -0,0 +1,10 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import ru.team58.profileservice.persistence.entity.UserEntity; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(componentModel = "spring") +public interface UserDTOMapper { + UserDTO toUserDTO(UserEntity entity); +} diff --git a/src/main/java/ru/team58/profileservice/mapper/UserEntityMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserEntityMapper.java new file mode 100644 index 0000000..6840427 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UserEntityMapper.java @@ -0,0 +1,10 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import ru.team58.profileservice.persistence.entity.UserEntity; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(componentModel = "spring") +public interface UserEntityMapper { + UserEntity toUserEntity(UserDTO dto); +} diff --git a/src/main/java/ru/team58/profileservice/mapper/UserMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserMapper.java deleted file mode 100644 index 857bcae..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/UserMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package ru.team58.profileservice.mapper; - -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.factory.Mappers; -import ru.team58.profileservice.controller.schemes.CreateUserRequest; -import ru.team58.profileservice.controller.schemes.GetUserResponse; -import ru.team58.profileservice.controller.schemes.UpdateUserRequest; -import ru.team58.profileservice.controller.schemes.UserResponse; -import ru.team58.profileservice.persistence.entity.UserEntity; -import ru.team58.profileservice.service.UserDTO; - -@Mapper(componentModel = "spring") -public interface UserMapper { - UserMapper INSTANCE = Mappers.getMapper(UserMapper.class); - - UserDTO toUserDTO(UserEntity entity); - UserDTO toUserDTO(UpdateUserRequest request); - @Mapping(target = "id", ignore = true) - UserDTO toUserDTO(CreateUserRequest request); - - UserEntity toUserEntity(UserDTO dto); - - UserResponse toUserResponse(UserDTO dto); - - GetUserResponse toGetUserResponse(UserDTO dto); -} diff --git a/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java new file mode 100644 index 0000000..c810ba6 --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java @@ -0,0 +1,10 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import ru.team58.profileservice.controller.schemes.UserResponse; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(componentModel = "spring") +public interface UserResponseMapper { + UserResponse toUserResponse(UserDTO dto); +} diff --git a/src/main/java/ru/team58/profileservice/mapper/UserSchemeMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserSchemeMapper.java new file mode 100644 index 0000000..34a826c --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UserSchemeMapper.java @@ -0,0 +1,12 @@ +package ru.team58.profileservice.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import ru.team58.profileservice.controller.schemes.UserScheme; +import ru.team58.profileservice.service.UserDTO; + +@Mapper(uses = {CreateUserMapper.class, UpdateUserMapper.class}) +public interface UserSchemeMapper { + @Mapping(target = "id", ignore = true) + UserDTO toUserDTO(UserScheme user); +} diff --git a/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java b/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java index b509abe..6cb0d41 100644 --- a/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java +++ b/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java @@ -1,6 +1,7 @@ package ru.team58.profileservice.persistence.entity; import jakarta.persistence.*; +import jakarta.validation.constraints.*; import lombok.*; import java.util.UUID; diff --git a/src/main/java/ru/team58/profileservice/service/UserDTO.java b/src/main/java/ru/team58/profileservice/service/UserDTO.java index d0834f6..d23bd29 100644 --- a/src/main/java/ru/team58/profileservice/service/UserDTO.java +++ b/src/main/java/ru/team58/profileservice/service/UserDTO.java @@ -1,12 +1,7 @@ package ru.team58.profileservice.service; +import jakarta.validation.Valid; import lombok.*; -import ru.team58.profileservice.persistence.entity.UserEntity; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Objects; import java.util.UUID; @Getter diff --git a/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java index 821adcb..1b2fb5e 100644 --- a/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java +++ b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java @@ -2,7 +2,8 @@ package ru.team58.profileservice.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.team58.profileservice.mapper.UserMapper; +import ru.team58.profileservice.mapper.UserDTOMapper; +import ru.team58.profileservice.mapper.UserEntityMapper; import ru.team58.profileservice.persistence.entity.UserEntity; import ru.team58.profileservice.persistence.repo.UserRepository; import ru.team58.profileservice.service.exceptions.UserAlreadyExistsException; @@ -15,16 +16,21 @@ public class UserServiceImpl implements UserService { @Autowired UserRepository userRepository; + @Autowired + UserDTOMapper userDTOMapper; + @Autowired + UserEntityMapper userEntityMapper; + @Override public UserDTO getById(UUID id) { UserEntity user = userRepository.findById(id).orElseThrow(UserNotFoundException::new); - return UserMapper.INSTANCE.toUserDTO(user); + return userDTOMapper.toUserDTO(user); } @Override public UserDTO getByUsername(String username) { UserEntity user = userRepository.findByUsername(username).orElseThrow(UserNotFoundException::new); - return UserMapper.INSTANCE.toUserDTO(user); + return userDTOMapper.toUserDTO(user); } @Override @@ -32,7 +38,7 @@ public class UserServiceImpl implements UserService { userRepository.findByUsername(user.username).ifPresent(u -> { throw new UserAlreadyExistsException(); }); - return userRepository.save(UserMapper.INSTANCE.toUserEntity(user)).getId(); + return userRepository.save(userEntityMapper.toUserEntity(user)).getId(); } @Override @@ -44,6 +50,6 @@ public class UserServiceImpl implements UserService { @Override public void updateUser(UserDTO user) { userRepository.findById(user.getId()).orElseThrow(UserNotFoundException::new); - userRepository.save(UserMapper.INSTANCE.toUserEntity(user)); + userRepository.save(userEntityMapper.toUserEntity(user)); } } diff --git a/src/test/java/ru/team58/profileservice/ProfileServiceTest.java b/src/test/java/ru/team58/profileservice/ProfileServiceTest.java new file mode 100644 index 0000000..afeecdc --- /dev/null +++ b/src/test/java/ru/team58/profileservice/ProfileServiceTest.java @@ -0,0 +1,12 @@ +package ru.team58.profileservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class ProfileServiceTest { + @Test + public void contextLoads() { + + } +}