diff --git a/src/main/java/ru/team58/profileservice/controller/UserController.java b/src/main/java/ru/team58/profileservice/controller/UserController.java index a8affb8..446b742 100644 --- a/src/main/java/ru/team58/profileservice/controller/UserController.java +++ b/src/main/java/ru/team58/profileservice/controller/UserController.java @@ -24,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) { @@ -36,7 +48,7 @@ public class UserController { throw new UserNotFoundException(); } - return UserResponseMapper.INSTANCE.toUserResponse(userService.getByUsername(principal.getName())); + return userResponseMapper.toUserResponse(userService.getByUsername(principal.getName())); } @PutMapping(value = "/", consumes = {MediaType.APPLICATION_JSON_VALUE}) @@ -51,7 +63,7 @@ public class UserController { throw new UserNotFoundException(); } - userService.updateUser(UpdateUserMapper.INSTANCE.toUserDTO(request)); + userService.updateUser(updateUserMapper.toUserDTO(request)); } @DeleteMapping("/") @@ -73,7 +85,7 @@ public class UserController { @PostMapping(value = "/", consumes = MediaType.APPLICATION_JSON_VALUE) public void createMe(@Valid @RequestBody CreateUserRequest request) { - UserDTO user = CreateUserMapper.INSTANCE.toUserDTO(request); + UserDTO user = createUserMapper.toUserDTO(request); try { userService.createUser(user); @@ -94,7 +106,7 @@ public class UserController { throw new UserNotFoundException(); } - return GetUserMapper.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 d72c55f..b9f7546 100644 --- a/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java +++ b/src/main/java/ru/team58/profileservice/controller/advice/UserControllerExceptionHandler.java @@ -6,53 +6,59 @@ 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( + public ResponseEntity handleValidationExceptions( MethodArgumentNotValidException ex) { - Map errors = new HashMap<>(); + var errors = new ArrayList(); ex.getBindingResult().getAllErrors().forEach((error) -> { - String fieldName = ((FieldError) error).getField(); - String errorMessage = error.getDefaultMessage(); - errors.put(fieldName, errorMessage); + var fieldName = ((FieldError) error).getField(); + var errorMessage = error.getDefaultMessage(); + errors.add(String.format("%s: %s", fieldName, errorMessage)); }); - return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); + + 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/schemes/UserScheme.java b/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java index 8965b6e..49246ba 100644 --- a/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java +++ b/src/main/java/ru/team58/profileservice/controller/schemes/UserScheme.java @@ -32,6 +32,7 @@ public class UserScheme { @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".""") diff --git a/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java b/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java index ca6e501..b1a6df8 100644 --- a/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/CreateUserMapper.java @@ -2,15 +2,11 @@ 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 +@Mapper(componentModel = "spring") 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 index 44321f1..7750f75 100644 --- a/src/main/java/ru/team58/profileservice/mapper/GetUserMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/GetUserMapper.java @@ -5,9 +5,7 @@ import org.mapstruct.factory.Mappers; import ru.team58.profileservice.controller.schemes.GetUserResponse; import ru.team58.profileservice.service.UserDTO; -@Mapper +@Mapper(componentModel = "spring") 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 index 165dd8f..f8e67ca 100644 --- a/src/main/java/ru/team58/profileservice/mapper/UpdateUserMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/UpdateUserMapper.java @@ -1,13 +1,10 @@ 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 +@Mapper(componentModel = "spring") 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 index 91e8300..9d39f48 100644 --- a/src/main/java/ru/team58/profileservice/mapper/UserDTOMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/UserDTOMapper.java @@ -1,13 +1,10 @@ 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 +@Mapper(componentModel = "spring") 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 index 75b85c1..6840427 100644 --- a/src/main/java/ru/team58/profileservice/mapper/UserEntityMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/UserEntityMapper.java @@ -1,13 +1,10 @@ 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 +@Mapper(componentModel = "spring") public interface UserEntityMapper { - UserEntityMapper INSTANCE = Mappers.getMapper(UserEntityMapper.class); - UserEntity toUserEntity(UserDTO dto); } diff --git a/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java b/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java index d79cf3b..c810ba6 100644 --- a/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/UserResponseMapper.java @@ -1,13 +1,10 @@ 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 +@Mapper(componentModel = "spring") 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 index de00ed4..34a826c 100644 --- a/src/main/java/ru/team58/profileservice/mapper/UserSchemeMapper.java +++ b/src/main/java/ru/team58/profileservice/mapper/UserSchemeMapper.java @@ -2,14 +2,11 @@ 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/service/UserServiceImpl.java b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java index 69a9ddc..1b2fb5e 100644 --- a/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java +++ b/src/main/java/ru/team58/profileservice/service/UserServiceImpl.java @@ -16,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 UserDTOMapper.INSTANCE.toUserDTO(user); + return userDTOMapper.toUserDTO(user); } @Override public UserDTO getByUsername(String username) { UserEntity user = userRepository.findByUsername(username).orElseThrow(UserNotFoundException::new); - return UserDTOMapper.INSTANCE.toUserDTO(user); + return userDTOMapper.toUserDTO(user); } @Override @@ -33,7 +38,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(userEntityMapper.toUserEntity(user)).getId(); } @Override @@ -45,6 +50,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(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() { + + } +}