diff --git a/build.gradle.kts b/build.gradle.kts index 133f628..39bf11b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,6 @@ 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 a8affb8..2c18b1b 100644 --- a/src/main/java/ru/team58/profileservice/controller/UserController.java +++ b/src/main/java/ru/team58/profileservice/controller/UserController.java @@ -1,8 +1,6 @@ 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; @@ -11,7 +9,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.*; +import ru.team58.profileservice.mapper.UserMapper; import ru.team58.profileservice.service.UserDTO; import ru.team58.profileservice.service.UserService; import ru.team58.profileservice.service.exceptions.UserAlreadyExistsException; @@ -36,11 +34,11 @@ public class UserController { throw new UserNotFoundException(); } - return UserResponseMapper.INSTANCE.toUserResponse(userService.getByUsername(principal.getName())); + return UserMapper.INSTANCE.toUserResponse(userService.getByUsername(principal.getName())); } - @PutMapping(value = "/", consumes = {MediaType.APPLICATION_JSON_VALUE}) - public void updateMe(Principal principal, @Valid @RequestBody UpdateUserRequest request) { + @PutMapping("/") + public void updateMe(Principal principal, @RequestBody UpdateUserRequest request) { if (principal == null) { throw new UnauthorizedException(); } @@ -51,7 +49,7 @@ public class UserController { throw new UserNotFoundException(); } - userService.updateUser(UpdateUserMapper.INSTANCE.toUserDTO(request)); + userService.updateUser(UserMapper.INSTANCE.toUserDTO(request)); } @DeleteMapping("/") @@ -71,9 +69,9 @@ public class UserController { userService.deleteUser(user.getId()); } - @PostMapping(value = "/", consumes = MediaType.APPLICATION_JSON_VALUE) - public void createMe(@Valid @RequestBody CreateUserRequest request) { - UserDTO user = CreateUserMapper.INSTANCE.toUserDTO(request); + @PostMapping("/") + public void createMe(@RequestBody CreateUserRequest request) { + UserDTO user = UserMapper.INSTANCE.toUserDTO(request); try { userService.createUser(user); @@ -94,7 +92,7 @@ public class UserController { throw new UserNotFoundException(); } - return GetUserMapper.INSTANCE.toGetUserResponse(user); + return UserMapper.INSTANCE.toGetUserResponse(user); } @DeleteMapping("/{id}") 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 d72c55f..bd0d990 100644 --- a/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java +++ b/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java @@ -2,16 +2,10 @@ 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.ResponseStatus; import ru.team58.profileservice.controller.exceptions.*; -import java.util.HashMap; -import java.util.Map; - @ControllerAdvice public class UserControllerExceptionHandler { @ExceptionHandler(UserNotFoundException.class) @@ -43,16 +37,4 @@ public class UserControllerExceptionHandler { ErrorDetails errorDetails = new ErrorDetails("Unauthorized", HttpStatus.UNAUTHORIZED.value()); return new ResponseEntity<>(errorDetails, HttpStatus.UNAUTHORIZED); } - - @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity> handleValidationExceptions( - MethodArgumentNotValidException ex) { - Map errors = new HashMap<>(); - ex.getBindingResult().getAllErrors().forEach((error) -> { - String fieldName = ((FieldError) error).getField(); - String errorMessage = error.getDefaultMessage(); - errors.put(fieldName, errorMessage); - }); - return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); - } } diff --git a/src/main/java/ru/team58/profileservice/controller/exceptions/IncorrectEmailException.java b/src/main/java/ru/team58/profileservice/controller/exceptions/IncorrectEmailException.java deleted file mode 100644 index 7e35e40..0000000 --- a/src/main/java/ru/team58/profileservice/controller/exceptions/IncorrectEmailException.java +++ /dev/null @@ -1,4 +0,0 @@ -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 428ab9a..6344ece 100644 --- a/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java +++ b/src/main/java/ru/team58/profileservice/controller/schemes/CreateUserRequest.java @@ -1,10 +1,15 @@ package ru.team58.profileservice.controller.schemes; -import lombok.*; -import lombok.experimental.SuperBuilder; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; @Getter @Setter -@SuperBuilder -@NoArgsConstructor -public class CreateUserRequest extends UserScheme {} +@Builder +public class CreateUserRequest { + String username; + String firstName; + String lastName; + String email; +} 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 51cadcb..6548494 100644 --- a/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java +++ b/src/main/java/ru/team58/profileservice/controller/schemes/UpdateUserRequest.java @@ -1,13 +1,18 @@ package ru.team58.profileservice.controller.schemes; -import lombok.*; -import lombok.experimental.SuperBuilder; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; import java.util.UUID; @Getter @Setter -@SuperBuilder -@NoArgsConstructor -public class UpdateUserRequest extends UserScheme { +@Builder +public class UpdateUserRequest { + UUID id; + String username; + String firstName; + String lastName; + String email; } diff --git a/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java b/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java deleted file mode 100644 index 8965b6e..0000000 --- a/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java +++ /dev/null @@ -1,40 +0,0 @@ -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; - - @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 deleted file mode 100644 index ca6e501..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java +++ /dev/null @@ -1,16 +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.service.UserDTO; - -@Mapper -public interface CreateUserMapper { - CreateUserMapper INSTANCE = Mappers.getMapper(CreateUserMapper.class); - - @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 deleted file mode 100644 index 44321f1..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/GetUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -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 -public interface GetUserMapper { - GetUserMapper INSTANCE = Mappers.getMapper(GetUserMapper.class); - - 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 deleted file mode 100644 index 165dd8f..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/UpdateUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.team58.profileservice.mapper; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import ru.team58.profileservice.controller.schemes.UpdateUserRequest; -import ru.team58.profileservice.service.UserDTO; - -@Mapper -public interface UpdateUserMapper { - UpdateUserMapper INSTANCE = Mappers.getMapper(UpdateUserMapper.class); - - 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 deleted file mode 100644 index 91e8300..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/UserDTOMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.team58.profileservice.mapper; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import ru.team58.profileservice.persistence.entity.UserEntity; -import ru.team58.profileservice.service.UserDTO; - -@Mapper -public interface UserDTOMapper { - UserDTOMapper INSTANCE = Mappers.getMapper(UserDTOMapper.class); - - 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 deleted file mode 100644 index 75b85c1..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/UserEntityMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.team58.profileservice.mapper; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import ru.team58.profileservice.persistence.entity.UserEntity; -import ru.team58.profileservice.service.UserDTO; - -@Mapper -public interface UserEntityMapper { - UserEntityMapper INSTANCE = Mappers.getMapper(UserEntityMapper.class); - - 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 new file mode 100644 index 0000000..857bcae --- /dev/null +++ b/src/main/java/ru/team58/profileservice/mapper/UserMapper.java @@ -0,0 +1,27 @@ +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 deleted file mode 100644 index d79cf3b..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.team58.profileservice.mapper; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; -import ru.team58.profileservice.controller.schemes.UserResponse; -import ru.team58.profileservice.service.UserDTO; - -@Mapper -public interface UserResponseMapper { - UserResponseMapper INSTANCE = Mappers.getMapper(UserResponseMapper.class); - - 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 deleted file mode 100644 index de00ed4..0000000 --- a/src/main/java/ru/team58/profileservice/mapper/UserSchemeMapper.java +++ /dev/null @@ -1,15 +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.UserScheme; -import ru.team58.profileservice.service.UserDTO; - -@Mapper(uses = {CreateUserMapper.class, UpdateUserMapper.class}) -public interface UserSchemeMapper { - UserSchemeMapper INSTANCE = Mappers.getMapper(UserSchemeMapper.class); - - @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 6cb0d41..b509abe 100644 --- a/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java +++ b/src/main/java/ru/team58/profileservice/persistence/entity/UserEntity.java @@ -1,7 +1,6 @@ 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 d23bd29..d0834f6 100644 --- a/src/main/java/ru/team58/profileservice/service/UserDTO.java +++ b/src/main/java/ru/team58/profileservice/service/UserDTO.java @@ -1,7 +1,12 @@ 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 69a9ddc..821adcb 100644 --- a/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java +++ b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java @@ -2,8 +2,7 @@ package ru.team58.profileservice.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.team58.profileservice.mapper.UserDTOMapper; -import ru.team58.profileservice.mapper.UserEntityMapper; +import ru.team58.profileservice.mapper.UserMapper; import ru.team58.profileservice.persistence.entity.UserEntity; import ru.team58.profileservice.persistence.repo.UserRepository; import ru.team58.profileservice.service.exceptions.UserAlreadyExistsException; @@ -19,13 +18,13 @@ public class UserServiceImpl implements UserService { @Override public UserDTO getById(UUID id) { UserEntity user = userRepository.findById(id).orElseThrow(UserNotFoundException::new); - return UserDTOMapper.INSTANCE.toUserDTO(user); + return UserMapper.INSTANCE.toUserDTO(user); } @Override public UserDTO getByUsername(String username) { UserEntity user = userRepository.findByUsername(username).orElseThrow(UserNotFoundException::new); - return UserDTOMapper.INSTANCE.toUserDTO(user); + return UserMapper.INSTANCE.toUserDTO(user); } @Override @@ -33,7 +32,7 @@ public class UserServiceImpl implements UserService { userRepository.findByUsername(user.username).ifPresent(u -> { throw new UserAlreadyExistsException(); }); - return userRepository.save(UserEntityMapper.INSTANCE.toUserEntity(user)).getId(); + return userRepository.save(UserMapper.INSTANCE.toUserEntity(user)).getId(); } @Override @@ -45,6 +44,6 @@ public class UserServiceImpl implements UserService { @Override public void updateUser(UserDTO user) { userRepository.findById(user.getId()).orElseThrow(UserNotFoundException::new); - userRepository.save(UserEntityMapper.INSTANCE.toUserEntity(user)); + userRepository.save(UserMapper.INSTANCE.toUserEntity(user)); } }