From 7e38b5a2e0416831cfe1657e379b03fde3709abc Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Wed, 22 May 2024 23:28:22 +0200 Subject: [PATCH 01/44] fix: Request validation in UserService --- .../eu/ztsh/wymiana/service/UserService.java | 6 +- .../eu/ztsh/wymiana/validation/Adult.java | 5 +- .../wymiana/validation/InstanceValidator.java | 20 +++++++ .../validation/InstanceValidatorFactory.java | 18 ++++++ .../validation/ValidationFailedException.java | 20 +++++++ .../wymiana/web/model/UserCreateRequest.java | 2 + .../java/eu/ztsh/wymiana/EntityCreator.java | 7 ++- .../ztsh/wymiana/service/UserServiceTest.java | 56 +++++++++++++++---- .../eu/ztsh/wymiana/util/UserMapperTest.java | 18 +++--- 9 files changed, 126 insertions(+), 26 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/validation/InstanceValidator.java create mode 100644 src/main/java/eu/ztsh/wymiana/validation/InstanceValidatorFactory.java create mode 100644 src/main/java/eu/ztsh/wymiana/validation/ValidationFailedException.java diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index 01cba7c..d23dc2c 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -4,8 +4,8 @@ import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.util.UserMapper; +import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.web.model.UserCreateRequest; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -16,8 +16,10 @@ import java.util.Optional; public class UserService { private final UserRepository userRepository; + private final InstanceValidator validator; - public User create(@Valid UserCreateRequest request) { + public User create(UserCreateRequest request) { + validator.validate(request); if (userRepository.findById(request.pesel()).isPresent()) { throw new UserAlreadyExistsException(request); } diff --git a/src/main/java/eu/ztsh/wymiana/validation/Adult.java b/src/main/java/eu/ztsh/wymiana/validation/Adult.java index affba90..0d7448f 100644 --- a/src/main/java/eu/ztsh/wymiana/validation/Adult.java +++ b/src/main/java/eu/ztsh/wymiana/validation/Adult.java @@ -16,9 +16,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Constraint(validatedBy = AdultValidator.class) @Documented public @interface Adult { - String message() default "{jakarta.validation.constraints.Adult.message}"; + String message() default MESSAGE; Class[] groups() default { }; Class[] payload() default { }; + + String MESSAGE = "The person has not reached the age of 18"; + } diff --git a/src/main/java/eu/ztsh/wymiana/validation/InstanceValidator.java b/src/main/java/eu/ztsh/wymiana/validation/InstanceValidator.java new file mode 100644 index 0000000..664f5c4 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/validation/InstanceValidator.java @@ -0,0 +1,20 @@ +package eu.ztsh.wymiana.validation; + +import jakarta.validation.Validator; + +public class InstanceValidator { + + private final Validator validator; + + public InstanceValidator(Validator validator) { + this.validator = validator; + } + + public void validate(T t, Class... classes) { + var violations = validator.validate(t, classes); + if (!violations.isEmpty()) { + throw new ValidationFailedException(violations); + } + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/validation/InstanceValidatorFactory.java b/src/main/java/eu/ztsh/wymiana/validation/InstanceValidatorFactory.java new file mode 100644 index 0000000..69289ab --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/validation/InstanceValidatorFactory.java @@ -0,0 +1,18 @@ +package eu.ztsh.wymiana.validation; + +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class InstanceValidatorFactory { + + @Bean + public InstanceValidator instanceValidator() { + try (ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) { + return new InstanceValidator(factory.getValidator()); + } + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/validation/ValidationFailedException.java b/src/main/java/eu/ztsh/wymiana/validation/ValidationFailedException.java new file mode 100644 index 0000000..7ed17fa --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/validation/ValidationFailedException.java @@ -0,0 +1,20 @@ +package eu.ztsh.wymiana.validation; + +import jakarta.validation.ConstraintViolation; +import lombok.Getter; + +import java.util.Set; +import java.util.stream.Collectors; + +@Getter +public class ValidationFailedException extends RuntimeException { + + private final transient Set violations; + + public ValidationFailedException(Set> violations) { + super("Validation failed: %s".formatted(violations.stream() + .map(ConstraintViolation::getMessage).collect(Collectors.joining(System.lineSeparator())))); + this.violations = violations; + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java index 35c7a94..6c15a62 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java @@ -3,7 +3,9 @@ package eu.ztsh.wymiana.web.model; import eu.ztsh.wymiana.validation.Adult; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; +import lombok.Builder; +@Builder public record UserCreateRequest( @NotNull String name, @NotNull String surname, diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index 77ae953..4f7fcd7 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -23,8 +23,11 @@ public class EntityCreator { return new UserEntityBuilder(); } - public static UserCreateRequest userRequest() { - return new UserCreateRequest(Constants.NAME, Constants.SURNAME, Constants.PESEL, Constants.PLN); + public static UserCreateRequest.UserCreateRequestBuilder userRequest() { + return UserCreateRequest.builder().name(Constants.NAME) + .surname(Constants.SURNAME) + .pesel(Constants.PESEL) + .pln(Constants.PLN); } public static class UserEntityBuilder { diff --git a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java index 4a9b94b..8a0f9fc 100644 --- a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java @@ -5,7 +5,11 @@ import eu.ztsh.wymiana.RepositoryBasedTest; import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.util.UserMapper; +import eu.ztsh.wymiana.validation.Adult; +import eu.ztsh.wymiana.validation.InstanceValidator; +import eu.ztsh.wymiana.validation.ValidationFailedException; import jakarta.transaction.Transactional; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -17,44 +21,72 @@ class UserServiceTest extends RepositoryBasedTest { private final UserService userService; @Autowired - public UserServiceTest(UserRepository userRepository) { + public UserServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { super(userRepository); - userService = new UserService(userRepository); + userService = new UserService(userRepository, instanceValidator); } @Test @Transactional + @DisplayName("Create new user") void createNewUserTest() { - userService.create(EntityCreator.userRequest()); + userService.create(EntityCreator.userRequest().build()); var entity = EntityCreator.user().build(); expect(entity); } @Test - void createDuplicatedUser() { - var first = EntityCreator.userRequest(); - var second = EntityCreator.userRequest(); + @DisplayName("Try to create user that already exists") + void createDuplicatedUserTest() { + var first = EntityCreator.userRequest().build(); + var second = EntityCreator.userRequest().build(); userService.create(first); assertThatThrownBy(() -> userService.create(second)) - .isInstanceOf(UserAlreadyExistsException.class) - .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); + .isInstanceOf(UserAlreadyExistsException.class) + .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); + } + + @Test + @DisplayName("Try to create another user with same PESEL") + void createDuplicatedPeselTest() { + var first = EntityCreator.userRequest().build(); + var second = EntityCreator.userRequest() + .name("Jan") + .surname("Kowalski") + .pln(30.30) + .build(); + userService.create(first); + assertThatThrownBy(() -> userService.create(second)) + .isInstanceOf(UserAlreadyExistsException.class) + .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); + } + + @Test + @DisplayName("Try to create too young user") + void youngUserTest() { + var request = EntityCreator.userRequest().pesel("08280959342").build(); + assertThatThrownBy(() -> userService.create(request)) + .isInstanceOf(ValidationFailedException.class) + .hasMessageContaining(Adult.MESSAGE); } @Test @Transactional + @DisplayName("Get existing user") void getExistingUserTest() { var entity = EntityCreator.user().build(); userRepository.save(entity); var userOptional = userService.get(EntityCreator.Constants.PESEL); var expected = UserMapper.entityToPojo(entity); assertThat(userOptional) - .isNotEmpty() - .get() - .usingRecursiveComparison() - .isEqualTo(expected); + .isNotEmpty() + .get() + .usingRecursiveComparison() + .isEqualTo(expected); } @Test + @DisplayName("Try get non-existing user") void getNonExistingUserTest() { var userOptional = userService.get(EntityCreator.Constants.PESEL); assertThat(userOptional).isEmpty(); diff --git a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java index f3fc91d..0479332 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -15,23 +15,23 @@ class UserMapperTest { void entityToPojoTest() { var entity = EntityCreator.user().build(); var expected = new User( - EntityCreator.Constants.NAME, - EntityCreator.Constants.SURNAME, - EntityCreator.Constants.PESEL, - Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) + EntityCreator.Constants.NAME, + EntityCreator.Constants.SURNAME, + EntityCreator.Constants.PESEL, + Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) ); assertThat(UserMapper.entityToPojo(entity)) - .usingRecursiveComparison() - .isEqualTo(expected); + .usingRecursiveComparison() + .isEqualTo(expected); } @Test void requestToEntityTest() { - var request = EntityCreator.userRequest(); + var request = EntityCreator.userRequest().build(); var expected = EntityCreator.user().build(); assertThat(UserMapper.requestToEntity(request)) - .usingRecursiveComparison() - .isEqualTo(expected); + .usingRecursiveComparison() + .isEqualTo(expected); } } From 5555e57f34e8cb1d7e08596ef9b3a8ca10ef8bda Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 00:06:32 +0200 Subject: [PATCH 02/44] refactor: AdultValidatorTest refactored --- .../validation/AdultValidatorTest.java | 32 +++++-------------- .../wymiana/validation/ValidatorTest.java | 31 ++++++++++++++++++ 2 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 src/test/java/eu/ztsh/wymiana/validation/ValidatorTest.java diff --git a/src/test/java/eu/ztsh/wymiana/validation/AdultValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/AdultValidatorTest.java index ca24718..d4a2ed1 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/AdultValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/AdultValidatorTest.java @@ -1,58 +1,42 @@ package eu.ztsh.wymiana.validation; -import jakarta.validation.ConstraintValidatorContext; -import org.hibernate.validator.internal.engine.DefaultClockProvider; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import static org.assertj.core.api.Assertions.assertThat; +class AdultValidatorTest extends ValidatorTest { -class AdultValidatorTest { - - private static AdultValidator validator; - private static ConstraintValidatorContext validatorContext; - - @BeforeAll - static void prepare() { - validator = new AdultValidator(); - validatorContext = Mockito.mock(ConstraintValidatorContext.class); - Mockito.when(validatorContext.getClockProvider()).thenReturn(DefaultClockProvider.INSTANCE); + protected AdultValidatorTest() { + super(new AdultValidator()); } @Test @DisplayName("No digits in PESEL") void invalidPatternTest() { - assertThat(call("notAPesel")).isFalse(); + assertThatValidation("notAPesel").isFalse(); } @Test @DisplayName("Not an adult") void notAnAdultTest() { - assertThat(call("24242400000")).isFalse(); + assertThatValidation("24242400000").isFalse(); } @Test @DisplayName("Adult") void adultTest() { - assertThat(call("88010100000")).isTrue(); + assertThatValidation("88010100000").isTrue(); } @Test @DisplayName("Elderly person") void seniorTest() { - assertThat(call("00010100000")).isTrue(); + assertThatValidation("00010100000").isTrue(); } @Test @DisplayName("Invalid date") void notAValidDateTest() { - assertThat(call("00919100000")).isFalse(); - } - - private boolean call(String value) { - return validator.isValid(value, validatorContext); + assertThatValidation("00919100000").isFalse(); } } diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidatorTest.java new file mode 100644 index 0000000..7dc4bd8 --- /dev/null +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidatorTest.java @@ -0,0 +1,31 @@ +package eu.ztsh.wymiana.validation; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.assertj.core.api.AbstractBooleanAssert; +import org.hibernate.validator.internal.engine.DefaultClockProvider; +import org.junit.jupiter.api.BeforeAll; +import org.mockito.Mockito; + +import static org.assertj.core.api.Assertions.assertThat; + +public abstract class ValidatorTest, C> { + + private final V validator; + private static ConstraintValidatorContext validatorContext; + + protected ValidatorTest(V validator) { + this.validator = validator; + } + + @BeforeAll + static void prepare() { + validatorContext = Mockito.mock(ConstraintValidatorContext.class); + Mockito.when(validatorContext.getClockProvider()).thenReturn(DefaultClockProvider.INSTANCE); + } + + protected AbstractBooleanAssert assertThatValidation(C value) { + return assertThat(validator.isValid(value, validatorContext)); + } + +} From ca2a6c179562583f8510227dcef7b280ec8ebb36 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 00:16:29 +0200 Subject: [PATCH 03/44] feat: CurrencyExchangeRequest with validator and validator's tests outline --- .../validation/ValidExchangeRequest.java | 24 +++++++++ .../ValidExchangeRequestValidator.java | 15 ++++++ .../web/model/CurrencyExchangeRequest.java | 18 +++++++ .../ValidExchangeRequestValidatorTest.java | 54 +++++++++++++++++++ 4 files changed, 111 insertions(+) create mode 100644 src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequest.java create mode 100644 src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java create mode 100644 src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java create mode 100644 src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java diff --git a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequest.java b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequest.java new file mode 100644 index 0000000..608bc3c --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequest.java @@ -0,0 +1,24 @@ +package eu.ztsh.wymiana.validation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE_USE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + + +@Retention(RUNTIME) +@Target({ TYPE_USE }) +@Documented +@Constraint(validatedBy = {ValidExchangeRequestValidator.class }) +public @interface ValidExchangeRequest { + + String message() default "Exchange request is not valid"; + Class[] groups() default { }; + Class[] payload() default { }; + +} diff --git a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java new file mode 100644 index 0000000..43d4f1f --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java @@ -0,0 +1,15 @@ +package eu.ztsh.wymiana.validation; + +import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class ValidExchangeRequestValidator implements ConstraintValidator { + + @Override + public boolean isValid(CurrencyExchangeRequest currencyExchangeRequest, + ConstraintValidatorContext constraintValidatorContext) { + return false; + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java new file mode 100644 index 0000000..54f192e --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java @@ -0,0 +1,18 @@ +package eu.ztsh.wymiana.web.model; + +import eu.ztsh.wymiana.validation.ValidExchangeRequest; +import jakarta.validation.constraints.NotNull; +import lombok.Builder; +import org.hibernate.validator.constraints.pl.PESEL; + +@Builder +@ValidExchangeRequest +public record CurrencyExchangeRequest( + @PESEL String pesel, + @NotNull String from, + @NotNull String to, + Double toBuy, + Double toSell +) { + +} diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java new file mode 100644 index 0000000..e990658 --- /dev/null +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -0,0 +1,54 @@ +package eu.ztsh.wymiana.validation; + +import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class ValidExchangeRequestValidatorTest extends ValidatorTest { + + protected ValidExchangeRequestValidatorTest() { + super(new ValidExchangeRequestValidator()); + } + + @Test + @DisplayName("Valid request with buy value specified") + void validRequestWithBuyTest() { + + } + + @Test + @DisplayName("Valid request with sell value specified") + void validRequestWithSellTest() { + + } + + @Test + @DisplayName("Invalid PESEL value") + void invalidPeselTest() { + + } + + @Test + @DisplayName("From and To have same value") + void sameFromToTest() { + + } + + @Test + @DisplayName("Empty amounts") + void emptyBuySellTest() { + + } + + @Test + @DisplayName("Both Buy and Sell params filled in") + void bothFilledBuySellTest() { + + } + @Test + @DisplayName("Negative amount value") + void negativeAmountTest() { + + } + +} From 8d722e3ce477e3aab9896972dcfa9fbce9779766 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 17:31:34 +0200 Subject: [PATCH 04/44] test: ValidExchangeRequestValidatorTest test cases --- .../java/eu/ztsh/wymiana/EntityCreator.java | 12 ++++ .../ValidExchangeRequestValidatorTest.java | 67 ++++++++++++++++--- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index 4f7fcd7..f7219c9 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -2,6 +2,7 @@ package eu.ztsh.wymiana; import eu.ztsh.wymiana.data.entity.CurrencyEntity; import eu.ztsh.wymiana.data.entity.UserEntity; +import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import eu.ztsh.wymiana.web.model.UserCreateRequest; import java.util.ArrayList; @@ -16,6 +17,12 @@ public class EntityCreator { public static String NAME = "Janina"; public static String SURNAME = "Kowalska"; public static double PLN = 20.10; + public static double USD_SELL = 5.18; + public static double USD_BUY = 5.08; + public static String PLN_SYMBOL = "PLN"; + public static String USD_SYMBOL = "USD"; + public static double BUY_RATE = 3.8804; + public static double SELL_RATE = 3.9572; } @@ -30,6 +37,11 @@ public class EntityCreator { .pln(Constants.PLN); } + public static CurrencyExchangeRequest.CurrencyExchangeRequestBuilder exchangeRequest() { + return CurrencyExchangeRequest.builder().pesel(Constants.PESEL); + } + + public static class UserEntityBuilder { String name; diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java index e990658..0e6ebb8 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -1,9 +1,12 @@ package eu.ztsh.wymiana.validation; +import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import static eu.ztsh.wymiana.EntityCreator.Constants.*; + class ValidExchangeRequestValidatorTest extends ValidatorTest { protected ValidExchangeRequestValidatorTest() { @@ -13,42 +16,88 @@ class ValidExchangeRequestValidatorTest extends ValidatorTest Date: Thu, 23 May 2024 18:22:25 +0200 Subject: [PATCH 05/44] test: ValidExchangeRequestValidatorTest more test cases & validator implementation TODO: move disabled tests to future service / endpoint suite --- .../ValidExchangeRequestValidator.java | 15 +++++-- .../ValidExchangeRequestValidatorTest.java | 43 +++++++++++++++---- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java index 43d4f1f..0895d92 100644 --- a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java +++ b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java @@ -4,12 +4,21 @@ import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -public class ValidExchangeRequestValidator implements ConstraintValidator { +public class ValidExchangeRequestValidator implements + ConstraintValidator { @Override - public boolean isValid(CurrencyExchangeRequest currencyExchangeRequest, + public boolean isValid(CurrencyExchangeRequest request, ConstraintValidatorContext constraintValidatorContext) { - return false; + if (request == null) { + return false; + } + + return !request.from().equals(request.to()) + && !((request.toBuy() == null && request.toSell() == null) + || (request.toBuy() != null && request.toSell() != null)) + && ((request.toBuy() != null && request.toBuy() >= 0) + || (request.toSell() != null && request.toSell() >= 0)); } } diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java index 0e6ebb8..85161e6 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -2,8 +2,13 @@ package eu.ztsh.wymiana.validation; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; import static eu.ztsh.wymiana.EntityCreator.Constants.*; @@ -33,17 +38,13 @@ class ValidExchangeRequestValidatorTest extends ValidatorTest invalidPeselTest() { + return Stream.of("INVALID", PESEL.replace('6', '7')); + } + } From d6e9136a687302f29f630ae45a00445a16d7a7ba Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 18:41:51 +0200 Subject: [PATCH 06/44] test: NBP rates model --- .editorconfig | 2 +- pom.xml | 17 +++++++++ src/main/resources/schema/rates.json | 53 ++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/schema/rates.json diff --git a/.editorconfig b/.editorconfig index 72a7d08..54a8570 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,5 +6,5 @@ indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true -[*.yaml] +[{*.yaml,*.json}] indent_size = 2 diff --git a/pom.xml b/pom.xml index 5cbeab4..1ad6a08 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ + 1.2.1 @@ -85,6 +86,22 @@ org.springframework.boot spring-boot-maven-plugin + + org.jsonschema2pojo + jsonschema2pojo-maven-plugin + ${jsonschema2pojo.version} + + ${basedir}/src/main/resources/schema + eu.ztsh.wymiana.model + + + + + generate + + + + diff --git a/src/main/resources/schema/rates.json b/src/main/resources/schema/rates.json new file mode 100644 index 0000000..2ed42d0 --- /dev/null +++ b/src/main/resources/schema/rates.json @@ -0,0 +1,53 @@ +{ + "$id": "https://api.nbp.pl/c/rates.json", + "$schema": "http://json-schema.org/draft/2020-12/schema", + "type": "object", + "def": { + "rate": { + "type": "object", + "properties": { + "no": { + "type": "string" + }, + "effectiveDate": { + "type": "string" + }, + "bid": { + "type": "number" + }, + "ask": { + "type": "number" + } + }, + "required": [ + "no", + "effectiveDate", + "bid", + "ask" + ] + } + }, + "properties": { + "table": { + "type": "string" + }, + "currency": { + "type": "string" + }, + "code": { + "type": "string" + }, + "rates": { + "type": "array", + "items": { + "$ref": "#/def/rate" + } + } + }, + "required": [ + "table", + "currency", + "code", + "rates" + ] +} From ef5125fb0dcef4c3c7b06a011658b611d1836dd8 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 18:54:53 +0200 Subject: [PATCH 07/44] feat: NBP service outline --- .../eu/ztsh/wymiana/service/NbpService.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/main/java/eu/ztsh/wymiana/service/NbpService.java diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java new file mode 100644 index 0000000..a838d38 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -0,0 +1,44 @@ +package eu.ztsh.wymiana.service; + +import eu.ztsh.wymiana.model.Rates; +import org.assertj.core.util.VisibleForTesting; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; + +/** + * NBP exchange rates service + */ +@Service +public class NbpService { + + public double getSellRate(String currency) { + throw new UnsupportedOperationException("Not implemented yet"); + } + + public double getBuyRate(String currency) { + throw new UnsupportedOperationException("Not implemented yet"); + } + + /** + * Calculates date for data fetch. + *

+ * Usually this would be today, but as rates are set only Mon-Fri, during weekends it is needed to fetch last friday rates. + * + * @return date for data fetch + */ + @VisibleForTesting + LocalDate getFetchDate() { + throw new UnsupportedOperationException("Not implemented yet"); + } + + @VisibleForTesting + Rates fetchData(String date) { + throw new UnsupportedOperationException("Not implemented yet"); + } + + private record RatesCache(LocalDate date, double buy, double sell) { + + } + +} From 2e4ca845f8a76bd6cd6acfdc9816cd3eec6a1383 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 20:20:07 +0200 Subject: [PATCH 08/44] test: NBP service test outline --- .../ztsh/wymiana/service/NbpServiceTest.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java new file mode 100644 index 0000000..c04fb1a --- /dev/null +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -0,0 +1,32 @@ +package eu.ztsh.wymiana.service; + +import org.junit.jupiter.api.Test; + +class NbpServiceTest { + + @Test + void getFetchDateOnWorkingDayTest() { + + } + + @Test + void getFetchDateOnWeekendTest() { + + } + + @Test + void getWithoutCacheTest() { + + } + + @Test + void getWithCacheTest() { + + } + + @Test + void getInvalidCurrencyTest() { + + } + +} From 310a4c40872999e99174989098a78fa289a5c7b5 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 21:08:26 +0200 Subject: [PATCH 09/44] test: NbpService#getFetchDate tests --- .../wymiana/config/ClockConfiguration.java | 16 +++++ .../eu/ztsh/wymiana/service/NbpService.java | 5 ++ .../java/eu/ztsh/wymiana/EntityCreator.java | 15 +++++ .../ztsh/wymiana/service/NbpServiceTest.java | 62 +++++++++++++++++-- 4 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/config/ClockConfiguration.java diff --git a/src/main/java/eu/ztsh/wymiana/config/ClockConfiguration.java b/src/main/java/eu/ztsh/wymiana/config/ClockConfiguration.java new file mode 100644 index 0000000..eea21a3 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/config/ClockConfiguration.java @@ -0,0 +1,16 @@ +package eu.ztsh.wymiana.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.time.Clock; + +@Configuration +public class ClockConfiguration { + + @Bean + public Clock clock() { + return Clock.systemDefaultZone(); + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index a838d38..159ca0e 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -1,17 +1,22 @@ package eu.ztsh.wymiana.service; import eu.ztsh.wymiana.model.Rates; +import lombok.RequiredArgsConstructor; import org.assertj.core.util.VisibleForTesting; import org.springframework.stereotype.Service; +import java.time.Clock; import java.time.LocalDate; /** * NBP exchange rates service */ @Service +@RequiredArgsConstructor public class NbpService { + private final Clock clock; + public double getSellRate(String currency) { throw new UnsupportedOperationException("Not implemented yet"); } diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index f7219c9..df78b20 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -2,6 +2,8 @@ package eu.ztsh.wymiana; import eu.ztsh.wymiana.data.entity.CurrencyEntity; import eu.ztsh.wymiana.data.entity.UserEntity; +import eu.ztsh.wymiana.model.Rate; +import eu.ztsh.wymiana.model.Rates; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import eu.ztsh.wymiana.web.model.UserCreateRequest; @@ -41,6 +43,19 @@ public class EntityCreator { return CurrencyExchangeRequest.builder().pesel(Constants.PESEL); } + public static Rates rates(String date) { + var rates = new Rates(); + rates.setTable("C"); + rates.setCurrency("dolar amerykański"); + rates.setCode("USD"); + var rate = new Rate(); + rate.setNo("096/C/NBP/2024"); + rate.setEffectiveDate(date); + rate.setBid(Constants.BUY_RATE); + rate.setAsk(Constants.SELL_RATE); + rates.setRates(List.of(rate)); + return rates; + } public static class UserEntityBuilder { diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index c04fb1a..9f43ad6 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -1,32 +1,82 @@ package eu.ztsh.wymiana.service; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.mockito.Mockito; + +import java.time.Clock; +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.Month; +import java.time.ZoneId; +import java.time.temporal.TemporalAdjusters; + +import static org.assertj.core.api.Assertions.assertThat; class NbpServiceTest { - @Test - void getFetchDateOnWorkingDayTest() { + private static final ZoneId zone = ZoneId.of("Europe/Warsaw"); + private static final LocalDate today = LocalDate.of(2024, Month.MAY, 12); // Sunday + private static Clock clock; + private NbpService nbpService; + @BeforeAll + static void prepare() { + clock = Mockito.mock(Clock.class); + Mockito.when(clock.getZone()).thenReturn(zone); } - @Test - void getFetchDateOnWeekendTest() { + @BeforeEach + void prepareTest() { + nbpService = new NbpService(clock); + } + @ParameterizedTest + @EnumSource(value = DayOfWeek.class, names = {"SATURDAY","SUNDAY"}, mode = EnumSource.Mode.EXCLUDE) + void getFetchDateOnWorkingDayTest(DayOfWeek dayOfWeek) { + updateClock(dayOfWeek); + assertThat(nbpService.getFetchDate()).isEqualTo( + switch (dayOfWeek) { + case MONDAY -> LocalDate.of(2024, Month.MAY, 6); + case TUESDAY -> LocalDate.of(2024, Month.MAY, 7); + case WEDNESDAY -> LocalDate.of(2024, Month.MAY, 8); + case THURSDAY -> LocalDate.of(2024, Month.MAY, 9); + case FRIDAY -> LocalDate.of(2024, Month.MAY, 10); + default -> null; + } + ); + } + + @ParameterizedTest + @EnumSource(value = DayOfWeek.class, names = {"SATURDAY","SUNDAY"}) + void getFetchDateOnWeekendTest(DayOfWeek dayOfWeek) { + updateClock(dayOfWeek); + assertThat(nbpService.getFetchDate()).isEqualTo(LocalDate.of(2024, Month.MAY, 10)); } @Test void getWithoutCacheTest() { - + throw new UnsupportedOperationException("Not implemented yet"); } @Test void getWithCacheTest() { - + throw new UnsupportedOperationException("Not implemented yet"); } @Test void getInvalidCurrencyTest() { + throw new UnsupportedOperationException("Not implemented yet"); + } + private void updateClock(DayOfWeek dayOfWeek) { + Mockito.when(clock.instant()).thenReturn( + today.with(TemporalAdjusters.previousOrSame(dayOfWeek)) + .atStartOfDay(zone) + .toInstant()); } } From 497574b618e6b4a526107bfcbfa71acf825ea896 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 21:10:18 +0200 Subject: [PATCH 10/44] feat: NbpService#getFetchDate implementation --- src/main/java/eu/ztsh/wymiana/service/NbpService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index 159ca0e..1871f54 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -6,7 +6,9 @@ import org.assertj.core.util.VisibleForTesting; import org.springframework.stereotype.Service; import java.time.Clock; +import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; /** * NBP exchange rates service @@ -34,7 +36,8 @@ public class NbpService { */ @VisibleForTesting LocalDate getFetchDate() { - throw new UnsupportedOperationException("Not implemented yet"); + var today = LocalDate.now(clock); + return isWeekend(today) ? today.with(TemporalAdjusters.previous(DayOfWeek.FRIDAY)) : today; } @VisibleForTesting @@ -42,6 +45,10 @@ public class NbpService { throw new UnsupportedOperationException("Not implemented yet"); } + private static boolean isWeekend(LocalDate today) { + return today.getDayOfWeek() == DayOfWeek.SATURDAY + || today.getDayOfWeek() == DayOfWeek.SUNDAY; + } private record RatesCache(LocalDate date, double buy, double sell) { } From b2cbfad2ac8efbb538faec50df94d7e85637b58a Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 22:01:24 +0200 Subject: [PATCH 11/44] test: Wiremock extension --- pom.xml | 7 +++ .../eu/ztsh/wymiana/WireMockExtension.java | 45 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 src/test/java/eu/ztsh/wymiana/WireMockExtension.java diff --git a/pom.xml b/pom.xml index 1ad6a08..dddde47 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ ${java.version} + 3.5.4 1.2.1 @@ -78,6 +79,12 @@ org.assertj assertj-core + + org.wiremock + wiremock + ${wiremock.version} + test + diff --git a/src/test/java/eu/ztsh/wymiana/WireMockExtension.java b/src/test/java/eu/ztsh/wymiana/WireMockExtension.java new file mode 100644 index 0000000..7a7904f --- /dev/null +++ b/src/test/java/eu/ztsh/wymiana/WireMockExtension.java @@ -0,0 +1,45 @@ +package eu.ztsh.wymiana; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; + +public class WireMockExtension implements BeforeAllCallback, AfterEachCallback, ExtensionContext.Store.CloseableResource { + + public static final String baseUrl = "http://localhost:38080"; + + public static void response(String endpoint, int status, String body) { + configureFor(38080); + stubFor(get(urlEqualTo(endpoint)).willReturn(WireMock.status(status).withBody(body))); + } + + public static void verifyGet(int count, String url) { + verify(exactly(count), getRequestedFor(urlEqualTo(url))); + } + + private static final WireMockServer wireMockServer = new WireMockServer(38080); + private boolean started; + + @Override + public void beforeAll(ExtensionContext extensionContext) throws Exception { + if (!started) { + wireMockServer.start(); + started = true; + } + } + @Override + public void afterEach(ExtensionContext extensionContext) throws Exception { + wireMockServer.listAllStubMappings().getMappings().forEach(wireMockServer::removeStub); + } + + @Override + public void close() throws Throwable { + wireMockServer.stop(); + } + + +} From b38a507ce9482dcc9af97f208d951aad3ab72c84 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 22:38:20 +0200 Subject: [PATCH 12/44] test: NbpServiceTest completed? --- pom.xml | 2 +- .../config/RestClientConfiguration.java | 18 +++++++ .../eu/ztsh/wymiana/service/NbpService.java | 6 ++- .../ztsh/wymiana/service/NbpServiceTest.java | 48 ++++++++++++++----- 4 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java diff --git a/pom.xml b/pom.xml index dddde47..3756469 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.wiremock - wiremock + wiremock-standalone ${wiremock.version} test diff --git a/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java b/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java new file mode 100644 index 0000000..74ee47b --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java @@ -0,0 +1,18 @@ +package eu.ztsh.wymiana.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestClient; + +@Configuration +public class RestClientConfiguration { + + @Bean + public RestClient restClient() { + return RestClient.builder() + .baseUrl("http://api.nbp.pl") + .defaultHeader("Accept", "application/json") + .build(); + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index 1871f54..9379b7a 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -4,6 +4,7 @@ import eu.ztsh.wymiana.model.Rates; import lombok.RequiredArgsConstructor; import org.assertj.core.util.VisibleForTesting; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestClient; import java.time.Clock; import java.time.DayOfWeek; @@ -18,6 +19,8 @@ import java.time.temporal.TemporalAdjusters; public class NbpService { private final Clock clock; + private final RestClient restClient; + private static final String URI_PATTERN = "/api/exchangerates/rates/c/{code}/{date}/"; public double getSellRate(String currency) { throw new UnsupportedOperationException("Not implemented yet"); @@ -41,7 +44,7 @@ public class NbpService { } @VisibleForTesting - Rates fetchData(String date) { + Rates fetchData(String code, String date) { throw new UnsupportedOperationException("Not implemented yet"); } @@ -49,6 +52,7 @@ public class NbpService { return today.getDayOfWeek() == DayOfWeek.SATURDAY || today.getDayOfWeek() == DayOfWeek.SUNDAY; } + private record RatesCache(LocalDate date, double buy, double sell) { } diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index 9f43ad6..74c02df 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -1,26 +1,36 @@ package eu.ztsh.wymiana.service; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.ztsh.wymiana.EntityCreator; +import eu.ztsh.wymiana.WireMockExtension; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.mockito.Mockito; +import org.springframework.web.client.RestClient; import java.time.Clock; import java.time.DayOfWeek; import java.time.LocalDate; import java.time.Month; import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import static org.assertj.core.api.Assertions.assertThat; +@ExtendWith(WireMockExtension.class) class NbpServiceTest { private static final ZoneId zone = ZoneId.of("Europe/Warsaw"); private static final LocalDate today = LocalDate.of(2024, Month.MAY, 12); // Sunday private static Clock clock; + private final DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + private final RestClient restClient = RestClient.builder().baseUrl(WireMockExtension.baseUrl).build(); private NbpService nbpService; @BeforeAll @@ -31,11 +41,11 @@ class NbpServiceTest { @BeforeEach void prepareTest() { - nbpService = new NbpService(clock); + nbpService = new NbpService(clock, restClient); } @ParameterizedTest - @EnumSource(value = DayOfWeek.class, names = {"SATURDAY","SUNDAY"}, mode = EnumSource.Mode.EXCLUDE) + @EnumSource(value = DayOfWeek.class, names = {"SATURDAY", "SUNDAY"}, mode = EnumSource.Mode.EXCLUDE) void getFetchDateOnWorkingDayTest(DayOfWeek dayOfWeek) { updateClock(dayOfWeek); assertThat(nbpService.getFetchDate()).isEqualTo( @@ -51,32 +61,44 @@ class NbpServiceTest { } @ParameterizedTest - @EnumSource(value = DayOfWeek.class, names = {"SATURDAY","SUNDAY"}) + @EnumSource(value = DayOfWeek.class, names = {"SATURDAY", "SUNDAY"}) void getFetchDateOnWeekendTest(DayOfWeek dayOfWeek) { updateClock(dayOfWeek); assertThat(nbpService.getFetchDate()).isEqualTo(LocalDate.of(2024, Month.MAY, 10)); } @Test - void getWithoutCacheTest() { - throw new UnsupportedOperationException("Not implemented yet"); + void getWithoutCacheTest() throws JsonProcessingException { + var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); + var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); + WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); + nbpService.fetchData(EntityCreator.Constants.USD_SYMBOL, date); + WireMockExtension.verifyGet(1, url); } @Test - void getWithCacheTest() { - throw new UnsupportedOperationException("Not implemented yet"); + void getWithCacheTest() throws JsonProcessingException { + var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); + var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); + WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); + nbpService.fetchData(EntityCreator.Constants.USD_SYMBOL, date); + nbpService.fetchData(EntityCreator.Constants.USD_SYMBOL, date); + WireMockExtension.verifyGet(1, url); } @Test void getInvalidCurrencyTest() { - throw new UnsupportedOperationException("Not implemented yet"); + var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); + var url = "/api/exchangerates/rates/c/usb/%s/".formatted(date); + WireMockExtension.response(url, 404, "404 NotFound - Not Found - Brak danych"); + nbpService.fetchData("usb", date); + WireMockExtension.verifyGet(1, url); } - private void updateClock(DayOfWeek dayOfWeek) { - Mockito.when(clock.instant()).thenReturn( - today.with(TemporalAdjusters.previousOrSame(dayOfWeek)) - .atStartOfDay(zone) - .toInstant()); + private LocalDate updateClock(DayOfWeek dayOfWeek) { + var date = today.with(TemporalAdjusters.previousOrSame(dayOfWeek)); + Mockito.when(clock.instant()).thenReturn(date.atStartOfDay(zone).toInstant()); + return LocalDate.from(date); } } From 4a2338d69915fcdd41cfc72d2d54f364a8dda465 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 22:40:54 +0200 Subject: [PATCH 13/44] test: NbpServiceTest polished --- src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index 74c02df..851c7a3 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -6,6 +6,7 @@ import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -44,6 +45,7 @@ class NbpServiceTest { nbpService = new NbpService(clock, restClient); } + @DisplayName("Check if fetch date is calculated properly: weekdays") @ParameterizedTest @EnumSource(value = DayOfWeek.class, names = {"SATURDAY", "SUNDAY"}, mode = EnumSource.Mode.EXCLUDE) void getFetchDateOnWorkingDayTest(DayOfWeek dayOfWeek) { @@ -60,6 +62,7 @@ class NbpServiceTest { ); } + @DisplayName("Check if fetch date is calculated properly: weekends") @ParameterizedTest @EnumSource(value = DayOfWeek.class, names = {"SATURDAY", "SUNDAY"}) void getFetchDateOnWeekendTest(DayOfWeek dayOfWeek) { @@ -67,6 +70,7 @@ class NbpServiceTest { assertThat(nbpService.getFetchDate()).isEqualTo(LocalDate.of(2024, Month.MAY, 10)); } + @DisplayName("Fetch rates straight from server") @Test void getWithoutCacheTest() throws JsonProcessingException { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); @@ -76,6 +80,7 @@ class NbpServiceTest { WireMockExtension.verifyGet(1, url); } + @DisplayName("Fetch rates from cache") @Test void getWithCacheTest() throws JsonProcessingException { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); @@ -86,6 +91,7 @@ class NbpServiceTest { WireMockExtension.verifyGet(1, url); } + @DisplayName("Support 404") @Test void getInvalidCurrencyTest() { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); From 157a1ebe688be56930bef3ce7a6cc8d794677bb9 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 22:58:55 +0200 Subject: [PATCH 14/44] test: NbpServiceTest invocation fixed --- .../ztsh/wymiana/exception/NoDataException.java | 9 +++++++++ .../eu/ztsh/wymiana/service/NbpServiceTest.java | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/exception/NoDataException.java diff --git a/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java b/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java new file mode 100644 index 0000000..8da9ad6 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java @@ -0,0 +1,9 @@ +package eu.ztsh.wymiana.exception; + +public class NoDataException extends RuntimeException { + + public NoDataException(String code, String date) { + super("No data for code %s and date %s".formatted(code, date)); + } + +} diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index 851c7a3..9371da1 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; +import eu.ztsh.wymiana.exception.NoDataException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -23,6 +24,7 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; @ExtendWith(WireMockExtension.class) class NbpServiceTest { @@ -76,28 +78,26 @@ class NbpServiceTest { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); - nbpService.fetchData(EntityCreator.Constants.USD_SYMBOL, date); + assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); WireMockExtension.verifyGet(1, url); } @DisplayName("Fetch rates from cache") @Test - void getWithCacheTest() throws JsonProcessingException { + void getWithCacheTest() { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); - WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); - nbpService.fetchData(EntityCreator.Constants.USD_SYMBOL, date); - nbpService.fetchData(EntityCreator.Constants.USD_SYMBOL, date); - WireMockExtension.verifyGet(1, url); + assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); + WireMockExtension.verifyGet(0, url); } - @DisplayName("Support 404") + @DisplayName("Support 404: invalid currency or no data") @Test void getInvalidCurrencyTest() { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); var url = "/api/exchangerates/rates/c/usb/%s/".formatted(date); WireMockExtension.response(url, 404, "404 NotFound - Not Found - Brak danych"); - nbpService.fetchData("usb", date); + assertThatThrownBy(() -> nbpService.getSellRate("usb")).isInstanceOf(NoDataException.class); WireMockExtension.verifyGet(1, url); } From 9e69a47b3e0f3fb12cab9591e156cda4711cda4e Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 23:27:06 +0200 Subject: [PATCH 15/44] test: WireMockExtension response header --- src/test/java/eu/ztsh/wymiana/WireMockExtension.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/eu/ztsh/wymiana/WireMockExtension.java b/src/test/java/eu/ztsh/wymiana/WireMockExtension.java index 7a7904f..99ebc73 100644 --- a/src/test/java/eu/ztsh/wymiana/WireMockExtension.java +++ b/src/test/java/eu/ztsh/wymiana/WireMockExtension.java @@ -14,7 +14,10 @@ public class WireMockExtension implements BeforeAllCallback, AfterEachCallback, public static void response(String endpoint, int status, String body) { configureFor(38080); - stubFor(get(urlEqualTo(endpoint)).willReturn(WireMock.status(status).withBody(body))); + stubFor(get(urlEqualTo(endpoint)) + .willReturn(WireMock.status(status) + .withHeader("Content-Type", "application/json") + .withBody(body))); } public static void verifyGet(int count, String url) { @@ -34,6 +37,8 @@ public class WireMockExtension implements BeforeAllCallback, AfterEachCallback, @Override public void afterEach(ExtensionContext extensionContext) throws Exception { wireMockServer.listAllStubMappings().getMappings().forEach(wireMockServer::removeStub); + wireMockServer.findAllUnmatchedRequests().forEach(System.out::println); + wireMockServer.resetRequests(); } @Override From 1ae5dd9957023bf3929d79aac4e7413a1cb933db Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 23:30:02 +0200 Subject: [PATCH 16/44] feat: NbpService & tests implementation --- .../java/eu/ztsh/wymiana/service/NbpService.java | 15 ++++++++++++--- .../eu/ztsh/wymiana/service/NbpServiceTest.java | 10 ++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index 9379b7a..7406c93 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -1,14 +1,17 @@ package eu.ztsh.wymiana.service; +import eu.ztsh.wymiana.exception.NoDataException; import eu.ztsh.wymiana.model.Rates; import lombok.RequiredArgsConstructor; import org.assertj.core.util.VisibleForTesting; +import org.springframework.http.HttpStatusCode; import org.springframework.stereotype.Service; import org.springframework.web.client.RestClient; import java.time.Clock; import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; /** @@ -21,13 +24,14 @@ public class NbpService { private final Clock clock; private final RestClient restClient; private static final String URI_PATTERN = "/api/exchangerates/rates/c/{code}/{date}/"; + private final DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); public double getSellRate(String currency) { - throw new UnsupportedOperationException("Not implemented yet"); + return fetchData(currency, dtf.format(getFetchDate())).getRates().get(0).getAsk(); } public double getBuyRate(String currency) { - throw new UnsupportedOperationException("Not implemented yet"); + return fetchData(currency, dtf.format(getFetchDate())).getRates().get(0).getBid(); } /** @@ -45,7 +49,12 @@ public class NbpService { @VisibleForTesting Rates fetchData(String code, String date) { - throw new UnsupportedOperationException("Not implemented yet"); + return restClient.get().uri(URI_PATTERN, code.toLowerCase(), date) + .retrieve() + .onStatus(HttpStatusCode::is4xxClientError, ((request, response) -> { + throw new NoDataException(code, date); + })) + .body(Rates.class); } private static boolean isWeekend(LocalDate today) { diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index 9371da1..b244083 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -2,6 +2,7 @@ package eu.ztsh.wymiana.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.tomakehurst.wiremock.client.WireMock; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; import eu.ztsh.wymiana.exception.NoDataException; @@ -78,8 +79,12 @@ class NbpServiceTest { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); - assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); - WireMockExtension.verifyGet(1, url); + try { + assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); + assertThat(nbpService.getBuyRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.BUY_RATE); + } finally { + WireMockExtension.verifyGet(2, url); + } } @DisplayName("Fetch rates from cache") @@ -88,6 +93,7 @@ class NbpServiceTest { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); + assertThat(nbpService.getBuyRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.BUY_RATE); WireMockExtension.verifyGet(0, url); } From 52ff4a67b3c8d0f900b68ac1f738f36edf309543 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 23:55:33 +0200 Subject: [PATCH 17/44] fix: NbpService cache & tests fixes --- .../eu/ztsh/wymiana/service/NbpService.java | 24 +++++++++++++++++-- .../ztsh/wymiana/service/NbpServiceTest.java | 11 +++++---- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index 7406c93..da26238 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -13,6 +13,8 @@ import java.time.DayOfWeek; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; /** * NBP exchange rates service @@ -26,12 +28,30 @@ public class NbpService { private static final String URI_PATTERN = "/api/exchangerates/rates/c/{code}/{date}/"; private final DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + private final ConcurrentMap cache = new ConcurrentHashMap<>(1); + public double getSellRate(String currency) { - return fetchData(currency, dtf.format(getFetchDate())).getRates().get(0).getAsk(); + return getCurrency(currency).sell(); } public double getBuyRate(String currency) { - return fetchData(currency, dtf.format(getFetchDate())).getRates().get(0).getBid(); + return getCurrency(currency).buy(); + } + + private synchronized RatesCache getCurrency(String currency) { + var today = getFetchDate(); + var cacheObject = cache.get(currency); + if (cacheObject == null || cacheObject.date().isBefore(today)) { + var fresh = fetchData(currency, dtf.format(today)); + var rate = fresh.getRates().get(0); + cacheObject = new RatesCache( + LocalDate.parse(rate.getEffectiveDate(), dtf), + rate.getBid(), + rate.getAsk() + ); + cache.put(fresh.getCode(), cacheObject); + } + return cacheObject; } /** diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index b244083..7424fbe 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -2,7 +2,6 @@ package eu.ztsh.wymiana.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.tomakehurst.wiremock.client.WireMock; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; import eu.ztsh.wymiana.exception.NoDataException; @@ -81,20 +80,22 @@ class NbpServiceTest { WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); try { assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); - assertThat(nbpService.getBuyRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.BUY_RATE); } finally { - WireMockExtension.verifyGet(2, url); + WireMockExtension.verifyGet(1, url); } } @DisplayName("Fetch rates from cache") @Test - void getWithCacheTest() { + void getWithCacheTest() throws JsonProcessingException { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); + WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); + // save to cache assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); + // get from cache assertThat(nbpService.getBuyRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.BUY_RATE); - WireMockExtension.verifyGet(0, url); + WireMockExtension.verifyGet(1, url); } @DisplayName("Support 404: invalid currency or no data") From b07fa4cb65c20ba30919459c6a2dbf690a3cf8b8 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 01:22:34 +0200 Subject: [PATCH 18/44] feat: CurrencyService outline & tests --- .../exception/InsufficientFundsException.java | 9 ++++ .../ztsh/wymiana/service/CurrencyService.java | 21 ++++++++ .../wymiana/service/CurrencyServiceTest.java | 50 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 src/main/java/eu/ztsh/wymiana/exception/InsufficientFundsException.java create mode 100644 src/main/java/eu/ztsh/wymiana/service/CurrencyService.java create mode 100644 src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java diff --git a/src/main/java/eu/ztsh/wymiana/exception/InsufficientFundsException.java b/src/main/java/eu/ztsh/wymiana/exception/InsufficientFundsException.java new file mode 100644 index 0000000..4c8f314 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/exception/InsufficientFundsException.java @@ -0,0 +1,9 @@ +package eu.ztsh.wymiana.exception; + +public class InsufficientFundsException extends RuntimeException { + + public InsufficientFundsException() { + super("Insufficient funds"); + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java new file mode 100644 index 0000000..53d401e --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -0,0 +1,21 @@ +package eu.ztsh.wymiana.service; + +import eu.ztsh.wymiana.model.User; +import eu.ztsh.wymiana.validation.InstanceValidator; +import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@RequiredArgsConstructor +@Service +public class CurrencyService { + + private final UserService userService; + private final NbpService nbpService; + private final InstanceValidator validator; + + public User exchange(CurrencyExchangeRequest request) { + throw new UnsupportedOperationException("Not implemented yet"); + } + +} diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java new file mode 100644 index 0000000..c49396c --- /dev/null +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -0,0 +1,50 @@ +package eu.ztsh.wymiana.service; + +import eu.ztsh.wymiana.EntityCreator; +import eu.ztsh.wymiana.RepositoryBasedTest; +import eu.ztsh.wymiana.data.repository.UserRepository; +import eu.ztsh.wymiana.exception.InsufficientFundsException; +import eu.ztsh.wymiana.validation.InstanceValidator; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; + +import static eu.ztsh.wymiana.EntityCreator.Constants.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class CurrencyServiceTest extends RepositoryBasedTest { + + private final CurrencyService currencyService; + + @Autowired + public CurrencyServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { + super(userRepository); + var nbp = Mockito.mock(NbpService.class); + Mockito.when(nbp.getSellRate("USD")).thenReturn(USD_SELL); + Mockito.when(nbp.getBuyRate("USD")).thenReturn(USD_BUY); + currencyService = new CurrencyService(new UserService(userRepository, instanceValidator), nbp, instanceValidator); + } + + @Test + void successTest() { + var result = currencyService.exchange(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(PLN) + .build()); + assertThat(result.currencies()) + .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); + } + + @Test + void insufficientFundsTest() { + assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toBuy(PLN) + .build())) + .isInstanceOf(InsufficientFundsException.class); + } + +} From af187e3daa7fbf314c5a378698943914c5297a71 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 08:31:23 +0200 Subject: [PATCH 19/44] test: Moved disabled tests from validator to service tests --- .../wymiana/service/CurrencyServiceTest.java | 61 ++++++++++++++++++- .../ValidExchangeRequestValidatorTest.java | 37 ----------- 2 files changed, 60 insertions(+), 38 deletions(-) diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index c49396c..c64e9b2 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -5,10 +5,17 @@ import eu.ztsh.wymiana.RepositoryBasedTest; import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.validation.InstanceValidator; +import eu.ztsh.wymiana.validation.ValidationFailedException; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; +import java.util.stream.Stream; + import static eu.ztsh.wymiana.EntityCreator.Constants.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,7 +34,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { } @Test - void successTest() { + void toSellSuccessTest() { var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(PLN_SYMBOL) .to(USD_SYMBOL) @@ -35,6 +42,21 @@ class CurrencyServiceTest extends RepositoryBasedTest { .build()); assertThat(result.currencies()) .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); + var expected = EntityCreator.user().pln(0).usd(USD_BUY).build(); + expect(expected); + } + + @Test + void toBuySuccessTest() { + var result = currencyService.exchange(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toBuy(USD_BUY) + .build()); + assertThat(result.currencies()) + .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); + var expected = EntityCreator.user().pln(0).usd(USD_BUY).build(); + expect(expected); } @Test @@ -47,4 +69,41 @@ class CurrencyServiceTest extends RepositoryBasedTest { .isInstanceOf(InsufficientFundsException.class); } + @DisplayName("Invalid PESEL value") + @ParameterizedTest + @MethodSource + void invalidPeselTest(String pesel) { + assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + .pesel(pesel) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(USD_SELL) + .build())) + .isInstanceOf(ValidationFailedException.class); + } + + @Test + @DisplayName("Empty 'from' value") + void emptyFromTest() { + assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + .to(USD_SYMBOL) + .toSell(USD_SELL) + .build())) + .isInstanceOf(ValidationFailedException.class); + } + + @Test + @DisplayName("Empty 'to' value") + void emptyToTest() { + assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .toSell(USD_SELL) + .build())) + .isInstanceOf(ValidationFailedException.class); + } + + private static Stream invalidPeselTest() { + return Stream.of("INVALID", PESEL.replace('6', '7')); + } + } diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java index 85161e6..3a3a4d1 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -38,19 +38,6 @@ class ValidExchangeRequestValidatorTest extends ValidatorTest invalidPeselTest() { - return Stream.of("INVALID", PESEL.replace('6', '7')); - } - } From 6d8a2093b91f48af9246ae55bde362c1fada44ee Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 08:33:57 +0200 Subject: [PATCH 20/44] test: SonarLint fixes --- .../wymiana/service/CurrencyServiceTest.java | 21 +++++++++++-------- .../ValidExchangeRequestValidatorTest.java | 10 ++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index c64e9b2..c26f5ad 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -6,7 +6,6 @@ import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.validation.ValidationFailedException; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -61,11 +60,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Test void insufficientFundsTest() { - assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + var entity = EntityCreator.exchangeRequest() .from(PLN_SYMBOL) .to(USD_SYMBOL) .toBuy(PLN) - .build())) + .build(); + assertThatThrownBy(() -> currencyService.exchange(entity)) .isInstanceOf(InsufficientFundsException.class); } @@ -73,32 +73,35 @@ class CurrencyServiceTest extends RepositoryBasedTest { @ParameterizedTest @MethodSource void invalidPeselTest(String pesel) { - assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + var entity = EntityCreator.exchangeRequest() .pesel(pesel) .from(PLN_SYMBOL) .to(USD_SYMBOL) .toSell(USD_SELL) - .build())) + .build(); + assertThatThrownBy(() -> currencyService.exchange(entity)) .isInstanceOf(ValidationFailedException.class); } @Test @DisplayName("Empty 'from' value") void emptyFromTest() { - assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + var entity = EntityCreator.exchangeRequest() .to(USD_SYMBOL) .toSell(USD_SELL) - .build())) + .build(); + assertThatThrownBy(() -> currencyService.exchange(entity)) .isInstanceOf(ValidationFailedException.class); } @Test @DisplayName("Empty 'to' value") void emptyToTest() { - assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest() + var entity = EntityCreator.exchangeRequest() .from(PLN_SYMBOL) .toSell(USD_SELL) - .build())) + .build(); + assertThatThrownBy(() -> currencyService.exchange(entity)) .isInstanceOf(ValidationFailedException.class); } diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java index 3a3a4d1..5226e14 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -2,15 +2,13 @@ package eu.ztsh.wymiana.validation; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import java.util.stream.Stream; - -import static eu.ztsh.wymiana.EntityCreator.Constants.*; +import static eu.ztsh.wymiana.EntityCreator.Constants.PLN_SYMBOL; +import static eu.ztsh.wymiana.EntityCreator.Constants.USD_BUY; +import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SELL; +import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SYMBOL; class ValidExchangeRequestValidatorTest extends ValidatorTest { From c87bcc8b54af6c9658c61b252a8adee7a0a40203 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 16:25:19 +0200 Subject: [PATCH 21/44] test: CurrencyServiceTest completed? --- .../exception/ExchangeFailedException.java | 13 ++++ .../ztsh/wymiana/service/CurrencyService.java | 50 ++++++++++++++- .../eu/ztsh/wymiana/service/NbpService.java | 4 +- .../eu/ztsh/wymiana/service/UserService.java | 4 ++ .../ValidExchangeRequestValidator.java | 3 +- .../wymiana/service/CurrencyServiceTest.java | 63 +++++++++++++++++-- 6 files changed, 128 insertions(+), 9 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java diff --git a/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java b/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java new file mode 100644 index 0000000..481d330 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java @@ -0,0 +1,13 @@ +package eu.ztsh.wymiana.exception; + +public class ExchangeFailedException extends RuntimeException{ + + public ExchangeFailedException() { + this("An exchange error has occurred"); + } + + public ExchangeFailedException(String message) { + super(message); + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java index 53d401e..a26b0bc 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -1,11 +1,19 @@ package eu.ztsh.wymiana.service; +import eu.ztsh.wymiana.exception.ExchangeFailedException; +import eu.ztsh.wymiana.exception.InsufficientFundsException; +import eu.ztsh.wymiana.model.Currency; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; + @RequiredArgsConstructor @Service public class CurrencyService { @@ -15,7 +23,47 @@ public class CurrencyService { private final InstanceValidator validator; public User exchange(CurrencyExchangeRequest request) { - throw new UnsupportedOperationException("Not implemented yet"); + validator.validate(request); + return userService.get(request.pesel()).map(user -> { + if (!request.from().equalsIgnoreCase("PLN") && !request.to().equalsIgnoreCase("PLN")) { + throw new ExchangeFailedException("Either 'from' or 'to' has to be PLN"); + } + // As we support only USD now, we need to limit second parameter too + // Begin: unlock other currencies + if (!request.from().equalsIgnoreCase("USD") && !request.to().equalsIgnoreCase("USD")) { + throw new ExchangeFailedException("Either 'from' or 'to' has to be USD"); + } + // End: unlock other currencies + + var exchanged = performExchange(user.currencies().get(request.from().toUpperCase()), + user.currencies().get(request.to().toUpperCase()), + Optional.ofNullable(request.toSell()).orElse(0D), + Optional.ofNullable(request.toBuy()).orElse(0D)); + user.currencies().putAll(exchanged); + return userService.update(user); + }) + .orElseThrow(ExchangeFailedException::new); + } + + private Map performExchange(Currency from, Currency to, double toSell, double toBuy) { + double exchangeRate; + double neededFromAmount; + double requestedToAmount; + if (from.symbol().equalsIgnoreCase("PLN")) { + exchangeRate = nbpService.getSellRate(to.symbol()); + neededFromAmount = toBuy != 0 ? toBuy * exchangeRate : toSell; + requestedToAmount = toBuy != 0 ? toBuy : toSell / exchangeRate; + } else { + exchangeRate = nbpService.getSellRate(from.symbol()); + neededFromAmount = toBuy != 0 ? toBuy / exchangeRate : toSell; + requestedToAmount = toBuy != 0 ? toBuy : toSell * exchangeRate; + } + if (neededFromAmount > from.amount()) { + throw new InsufficientFundsException(); + } + var newFrom = new Currency(from.symbol(), from.amount() - neededFromAmount); + var newTo = new Currency(to.symbol(), to.amount() + requestedToAmount); + return Stream.of(newFrom, newTo).collect(Collectors.toMap(Currency::symbol, currency -> currency)); } } diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index da26238..e612e0a 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -31,11 +31,11 @@ public class NbpService { private final ConcurrentMap cache = new ConcurrentHashMap<>(1); public double getSellRate(String currency) { - return getCurrency(currency).sell(); + return getCurrency(currency.toUpperCase()).sell(); } public double getBuyRate(String currency) { - return getCurrency(currency).buy(); + return getCurrency(currency.toUpperCase()).buy(); } private synchronized RatesCache getCurrency(String currency) { diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index d23dc2c..e5b26f6 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -30,4 +30,8 @@ public class UserService { return userRepository.findById(pesel).map(UserMapper::entityToPojo); } + public User update(User user) { + throw new UnsupportedOperationException("Not implemented yet"); + } + } diff --git a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java index 0895d92..143876b 100644 --- a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java +++ b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java @@ -14,7 +14,8 @@ public class ValidExchangeRequestValidator implements return false; } - return !request.from().equals(request.to()) + // Apart from @NotNull annotation we need to check if request.from() != null to avoid NPE in equals + return (request.from() != null && !request.from().equals(request.to())) && !((request.toBuy() == null && request.toSell() == null) || (request.toBuy() != null && request.toSell() != null)) && ((request.toBuy() != null && request.toBuy() >= 0) diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index c26f5ad..13ae4ec 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -3,9 +3,11 @@ package eu.ztsh.wymiana.service; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.RepositoryBasedTest; import eu.ztsh.wymiana.data.repository.UserRepository; +import eu.ztsh.wymiana.exception.ExchangeFailedException; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.validation.ValidationFailedException; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -32,8 +34,11 @@ class CurrencyServiceTest extends RepositoryBasedTest { currencyService = new CurrencyService(new UserService(userRepository, instanceValidator), nbp, instanceValidator); } + @Transactional @Test - void toSellSuccessTest() { + void plnToUsdToSellSuccessTest() { + var entity = EntityCreator.user().build(); + userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(PLN_SYMBOL) .to(USD_SYMBOL) @@ -45,8 +50,11 @@ class CurrencyServiceTest extends RepositoryBasedTest { expect(expected); } + @Transactional @Test - void toBuySuccessTest() { + void plnToUsdToBuySuccessTest() { + var entity = EntityCreator.user().build(); + userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(PLN_SYMBOL) .to(USD_SYMBOL) @@ -57,6 +65,37 @@ class CurrencyServiceTest extends RepositoryBasedTest { var expected = EntityCreator.user().pln(0).usd(USD_BUY).build(); expect(expected); } + @Transactional + @Test + void usdToPlnToSellSuccessTest() { + var entity = EntityCreator.user().build(); + userRepository.save(entity); + var result = currencyService.exchange(EntityCreator.exchangeRequest() + .from(USD_SYMBOL) + .to(PLN_SYMBOL) + .toSell(USD_SELL) + .build()); + assertThat(result.currencies()) + .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); + var expected = EntityCreator.user().pln(PLN).usd(0).build(); + expect(expected); + } + + @Transactional + @Test + void usdToPlnToBuySuccessTest() { + var entity = EntityCreator.user().build(); + userRepository.save(entity); + var result = currencyService.exchange(EntityCreator.exchangeRequest() + .from(USD_SYMBOL) + .to(PLN_SYMBOL) + .toBuy(PLN) + .build()); + assertThat(result.currencies()) + .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); + var expected = EntityCreator.user().pln(PLN).usd(0).build(); + expect(expected); + } @Test void insufficientFundsTest() { @@ -80,7 +119,19 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) - .isInstanceOf(ValidationFailedException.class); + .isInstanceOf(ValidationFailedException.class) + .hasMessageContaining("PESEL"); + } + + @Test + void notExistingUserTest() { + var entity = EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(USD_SELL) + .build(); + assertThatThrownBy(() -> currencyService.exchange(entity)) + .isInstanceOf(ExchangeFailedException.class); } @Test @@ -91,7 +142,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) - .isInstanceOf(ValidationFailedException.class); + .isInstanceOf(ValidationFailedException.class) + .hasMessageContaining("null"); } @Test @@ -102,7 +154,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) - .isInstanceOf(ValidationFailedException.class); + .isInstanceOf(ValidationFailedException.class) + .hasMessageContaining("null"); } private static Stream invalidPeselTest() { From 71109174f7dc5dcfbf5723d1967302c325fbfbfc Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 17:19:30 +0200 Subject: [PATCH 22/44] fix: exchange method fixes --- .../ztsh/wymiana/service/CurrencyService.java | 30 +++++++--- .../wymiana/service/CurrencyServiceTest.java | 56 +++++++++++++++++-- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java index a26b0bc..f43d6b6 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -9,6 +9,8 @@ import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -35,8 +37,13 @@ public class CurrencyService { } // End: unlock other currencies - var exchanged = performExchange(user.currencies().get(request.from().toUpperCase()), - user.currencies().get(request.to().toUpperCase()), + var from = user.currencies().get(request.from().toUpperCase()); + if (from == null) { + // There is no currency 'from' opened so no need to check if user has funds to exchange + throw new InsufficientFundsException(); + } + var exchanged = performExchange(from, + Optional.ofNullable(user.currencies().get(request.to().toUpperCase())).orElse(create(request.to())), Optional.ofNullable(request.toSell()).orElse(0D), Optional.ofNullable(request.toBuy()).orElse(0D)); user.currencies().putAll(exchanged); @@ -45,18 +52,23 @@ public class CurrencyService { .orElseThrow(ExchangeFailedException::new); } + private Currency create(String symbol) { + // TODO: check if supported + return new Currency(symbol.toUpperCase(), 0D); + } + private Map performExchange(Currency from, Currency to, double toSell, double toBuy) { double exchangeRate; double neededFromAmount; double requestedToAmount; if (from.symbol().equalsIgnoreCase("PLN")) { exchangeRate = nbpService.getSellRate(to.symbol()); - neededFromAmount = toBuy != 0 ? toBuy * exchangeRate : toSell; - requestedToAmount = toBuy != 0 ? toBuy : toSell / exchangeRate; + neededFromAmount = round(toBuy != 0 ? toBuy * exchangeRate : toSell); + requestedToAmount = round(toBuy != 0 ? toBuy : toSell / exchangeRate); } else { - exchangeRate = nbpService.getSellRate(from.symbol()); - neededFromAmount = toBuy != 0 ? toBuy / exchangeRate : toSell; - requestedToAmount = toBuy != 0 ? toBuy : toSell * exchangeRate; + exchangeRate = nbpService.getBuyRate(from.symbol()); + neededFromAmount = round(toBuy != 0 ? toBuy / exchangeRate : toSell); + requestedToAmount = round(toBuy != 0 ? toBuy : toSell * exchangeRate); } if (neededFromAmount > from.amount()) { throw new InsufficientFundsException(); @@ -66,4 +78,8 @@ public class CurrencyService { return Stream.of(newFrom, newTo).collect(Collectors.toMap(Currency::symbol, currency -> currency)); } + private double round(double input) { + return BigDecimal.valueOf(input).setScale(2, RoundingMode.HALF_UP).doubleValue(); + } + } diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index 13ae4ec..cc640a0 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -29,8 +29,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { public CurrencyServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { super(userRepository); var nbp = Mockito.mock(NbpService.class); - Mockito.when(nbp.getSellRate("USD")).thenReturn(USD_SELL); - Mockito.when(nbp.getBuyRate("USD")).thenReturn(USD_BUY); + Mockito.when(nbp.getSellRate("USD")).thenReturn(SELL_RATE); + Mockito.when(nbp.getBuyRate("USD")).thenReturn(BUY_RATE); currencyService = new CurrencyService(new UserService(userRepository, instanceValidator), nbp, instanceValidator); } @@ -65,10 +65,11 @@ class CurrencyServiceTest extends RepositoryBasedTest { var expected = EntityCreator.user().pln(0).usd(USD_BUY).build(); expect(expected); } + @Transactional @Test void usdToPlnToSellSuccessTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.user().pln(0).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(USD_SYMBOL) @@ -84,7 +85,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void usdToPlnToBuySuccessTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.user().pln(0).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(USD_SYMBOL) @@ -97,14 +98,57 @@ class CurrencyServiceTest extends RepositoryBasedTest { expect(expected); } + @Transactional + @Test + void usdToPlnNoUsdCurrencyTest() { + var entity = EntityCreator.user().build(); + userRepository.save(entity); + var request = EntityCreator.exchangeRequest() + .from(USD_SYMBOL) + .to(PLN_SYMBOL) + .toBuy(PLN) + .build(); + assertThatThrownBy(() -> currencyService.exchange(request)) + .isInstanceOf(InsufficientFundsException.class); + } + + @Transactional + @Test + void doubleExchangeTest() { + var initialValue = 100; + var entity = EntityCreator.user().pln(initialValue).build(); + userRepository.save(entity); + var result1 = currencyService.exchange(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toBuy(USD_BUY) + .build()); + var result2 = currencyService.exchange(EntityCreator.exchangeRequest() + .from(USD_SYMBOL) + .to(PLN_SYMBOL) + .toSell(USD_BUY) + .build()); + var resultOptional = userRepository.findById(entity.getPesel()); + assertThat(resultOptional) + .isNotEmpty(); + var resultEntity = resultOptional.get(); + assertThat(resultEntity.getCurrencies() + .stream() + .filter(c -> c.getSymbol().equalsIgnoreCase("PLN")) + .findFirst()).isNotEmpty().get().matches(currencyEntity -> currencyEntity.getAmount() < initialValue); + } + + @Transactional @Test void insufficientFundsTest() { - var entity = EntityCreator.exchangeRequest() + var entity = EntityCreator.user().build(); + userRepository.save(entity); + var request = EntityCreator.exchangeRequest() .from(PLN_SYMBOL) .to(USD_SYMBOL) .toBuy(PLN) .build(); - assertThatThrownBy(() -> currencyService.exchange(entity)) + assertThatThrownBy(() -> currencyService.exchange(request)) .isInstanceOf(InsufficientFundsException.class); } From 94dd43c138b58febe48512577286d746c9bd6391 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 17:44:51 +0200 Subject: [PATCH 23/44] fix: Fixed user persistence after exchange --- .../java/eu/ztsh/wymiana/service/UserService.java | 2 +- .../java/eu/ztsh/wymiana/util/CurrencyMapper.java | 8 ++++++++ src/main/java/eu/ztsh/wymiana/util/UserMapper.java | 5 +++++ src/test/java/eu/ztsh/wymiana/EntityCreator.java | 8 ++++---- .../ztsh/wymiana/service/CurrencyServiceTest.java | 4 ++-- .../java/eu/ztsh/wymiana/util/UserMapperTest.java | 14 ++++++++++++++ 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index e5b26f6..f9e7cde 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -31,7 +31,7 @@ public class UserService { } public User update(User user) { - throw new UnsupportedOperationException("Not implemented yet"); + return UserMapper.entityToPojo(userRepository.save(UserMapper.pojoToEntity(user))); } } diff --git a/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java b/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java index 7542187..b962ddc 100644 --- a/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java @@ -13,11 +13,19 @@ public class CurrencyMapper { return new Currency(entity.getSymbol(), entity.getAmount()); } + public static CurrencyEntity pojoToEntity(Currency pojo, String pesel) { + return new CurrencyEntity(pesel, pojo.symbol(), pojo.amount()); + } + public static Map entitiesToPojoMap(List values) { return values.stream().map(CurrencyMapper::entityToPojo) .collect(Collectors.toMap(Currency::symbol, pojo -> pojo)); } + public static List pojoMapToEntities(Map currencies, String pesel) { + return currencies.values().stream().map(entry -> pojoToEntity(entry, pesel)).toList(); + } + private CurrencyMapper() { } diff --git a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java index b4aff44..39985fb 100644 --- a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java @@ -14,6 +14,11 @@ public class UserMapper { CurrencyMapper.entitiesToPojoMap(entity.getCurrencies())); } + public static UserEntity pojoToEntity(User pojo) { + return new UserEntity(pojo.pesel(), pojo.name(), pojo.surname(), + CurrencyMapper.pojoMapToEntities(pojo.currencies(), pojo.pesel())); + } + public static UserEntity requestToEntity(UserCreateRequest request) { return new UserEntity(request.pesel(), request.name(), request.surname(), List.of(new CurrencyEntity(request.pesel(), "PLN", request.pln()))); diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index df78b20..c0bb186 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -62,8 +62,8 @@ public class EntityCreator { String name; String surname; String pesel; - double pln; - double usd; + double pln = -1; + double usd = -1; public UserEntityBuilder name(String name) { this.name = name; @@ -93,10 +93,10 @@ public class EntityCreator { public UserEntity build() { var nonnulPesel = Optional.ofNullable(pesel).orElse(Constants.PESEL); List currencies = new ArrayList<>(); - if (pln > 0) { + if (pln > -1) { currencies.add(new CurrencyEntity(nonnulPesel, "PLN", pln)); } - if (usd > 0) { + if (usd > -1) { currencies.add(new CurrencyEntity(nonnulPesel, "USD", usd)); } if (currencies.isEmpty()) { diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index cc640a0..95b1442 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -69,7 +69,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void usdToPlnToSellSuccessTest() { - var entity = EntityCreator.user().pln(0).usd(USD_SELL).build(); + var entity = EntityCreator.user().pln(-1).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(USD_SYMBOL) @@ -85,7 +85,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void usdToPlnToBuySuccessTest() { - var entity = EntityCreator.user().pln(0).usd(USD_SELL).build(); + var entity = EntityCreator.user().pln(-1).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(USD_SYMBOL) diff --git a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java index 0479332..0b4a7d9 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -25,6 +25,20 @@ class UserMapperTest { .isEqualTo(expected); } + @Test + void pojoToEntityTest() { + var entity = new User( + EntityCreator.Constants.NAME, + EntityCreator.Constants.SURNAME, + EntityCreator.Constants.PESEL, + Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) + ); + var expected = EntityCreator.user().build(); + assertThat(UserMapper.pojoToEntity(entity)) + .usingRecursiveComparison() + .isEqualTo(expected); + } + @Test void requestToEntityTest() { var request = EntityCreator.userRequest().build(); From 4fcc395a61717c87a7b4add13c298a8bc36b61b1 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 17:50:39 +0200 Subject: [PATCH 24/44] chore: Formatting fixes --- .../exception/ExchangeFailedException.java | 2 +- .../ztsh/wymiana/service/CurrencyService.java | 2 +- .../eu/ztsh/wymiana/util/UserMapperTest.java | 28 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java b/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java index 481d330..b32bb5e 100644 --- a/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java +++ b/src/main/java/eu/ztsh/wymiana/exception/ExchangeFailedException.java @@ -1,6 +1,6 @@ package eu.ztsh.wymiana.exception; -public class ExchangeFailedException extends RuntimeException{ +public class ExchangeFailedException extends RuntimeException { public ExchangeFailedException() { this("An exchange error has occurred"); diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java index f43d6b6..b00f761 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -53,7 +53,7 @@ public class CurrencyService { } private Currency create(String symbol) { - // TODO: check if supported + // TODO: check if supported - now limited to PLN <-> USD return new Currency(symbol.toUpperCase(), 0D); } diff --git a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java index 0b4a7d9..dc1eeb8 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -15,28 +15,28 @@ class UserMapperTest { void entityToPojoTest() { var entity = EntityCreator.user().build(); var expected = new User( - EntityCreator.Constants.NAME, - EntityCreator.Constants.SURNAME, - EntityCreator.Constants.PESEL, - Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) + EntityCreator.Constants.NAME, + EntityCreator.Constants.SURNAME, + EntityCreator.Constants.PESEL, + Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) ); assertThat(UserMapper.entityToPojo(entity)) - .usingRecursiveComparison() - .isEqualTo(expected); + .usingRecursiveComparison() + .isEqualTo(expected); } @Test void pojoToEntityTest() { var entity = new User( - EntityCreator.Constants.NAME, - EntityCreator.Constants.SURNAME, - EntityCreator.Constants.PESEL, - Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) + EntityCreator.Constants.NAME, + EntityCreator.Constants.SURNAME, + EntityCreator.Constants.PESEL, + Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) ); var expected = EntityCreator.user().build(); assertThat(UserMapper.pojoToEntity(entity)) - .usingRecursiveComparison() - .isEqualTo(expected); + .usingRecursiveComparison() + .isEqualTo(expected); } @Test @@ -44,8 +44,8 @@ class UserMapperTest { var request = EntityCreator.userRequest().build(); var expected = EntityCreator.user().build(); assertThat(UserMapper.requestToEntity(request)) - .usingRecursiveComparison() - .isEqualTo(expected); + .usingRecursiveComparison() + .isEqualTo(expected); } } From a78ecaeadb1ada1e9a4e4b576c06cc1508630877 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 19:36:58 +0200 Subject: [PATCH 25/44] feat: UserController --- .../web/controller/UserController.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/java/eu/ztsh/wymiana/web/controller/UserController.java diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java new file mode 100644 index 0000000..c9f7bdc --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -0,0 +1,36 @@ +package eu.ztsh.wymiana.web.controller; + +import eu.ztsh.wymiana.model.User; +import eu.ztsh.wymiana.service.UserService; +import eu.ztsh.wymiana.web.model.UserCreateRequest; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequiredArgsConstructor +@Validated +@RestController +@RequestMapping("/api/user") +public class UserController { + + private final UserService userService; + + @GetMapping("{pesel}") + public ResponseEntity get(@PathVariable("pesel") String pesel) { + return ResponseEntity.of(userService.get(pesel)); + } + + @PostMapping + public ResponseEntity create(@Valid @RequestBody UserCreateRequest request) { + userService.create(request); + return ResponseEntity.status(204).build(); + } + +} From 2f7e7065486742e99370d90c32e299485a3e4f57 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 19:37:20 +0200 Subject: [PATCH 26/44] fix: UserService hardening --- src/main/java/eu/ztsh/wymiana/service/UserService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index f9e7cde..0bb7945 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -7,6 +7,7 @@ import eu.ztsh.wymiana.util.UserMapper; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.web.model.UserCreateRequest; import lombok.RequiredArgsConstructor; +import org.hibernate.validator.constraints.pl.PESEL; import org.springframework.stereotype.Service; import java.util.Optional; @@ -26,7 +27,7 @@ public class UserService { return UserMapper.entityToPojo(userRepository.save(UserMapper.requestToEntity(request))); } - public Optional get(String pesel) { + public Optional get(@PESEL String pesel) { return userRepository.findById(pesel).map(UserMapper::entityToPojo); } From 2981691ffc86a14634eb4f42ad0260c7bbffef2c Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 19:37:56 +0200 Subject: [PATCH 27/44] test: Integration tests outline --- pom.xml | 36 +++++ .../eu/ztsh/wymiana/config/NbpProperties.java | 8 ++ .../config/RestClientConfiguration.java | 4 +- src/main/resources/application.yaml | 12 ++ .../web/ApplicationIntegrationTests.java | 131 ++++++++++++++++++ src/test/resources/application-it.yaml | 2 + 6 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/config/NbpProperties.java create mode 100644 src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java create mode 100644 src/test/resources/application-it.yaml diff --git a/pom.xml b/pom.xml index 3756469..257ebbb 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,10 @@ org.springframework.boot spring-boot-starter-data-jpa + + org.springframework.boot + spring-boot-starter-actuator + @@ -69,6 +73,12 @@ org.springframework.boot spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-webflux + test org.junit.jupiter @@ -109,6 +119,32 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + default-test + + + **/*Tests.java + + + + + integration-tests + test + + test + + + + **/*Test.java + + + + + diff --git a/src/main/java/eu/ztsh/wymiana/config/NbpProperties.java b/src/main/java/eu/ztsh/wymiana/config/NbpProperties.java new file mode 100644 index 0000000..0ed6c42 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/config/NbpProperties.java @@ -0,0 +1,8 @@ +package eu.ztsh.wymiana.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("nbp") +public record NbpProperties(String baseurl) { + +} diff --git a/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java b/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java index 74ee47b..f264dbe 100644 --- a/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java +++ b/src/main/java/eu/ztsh/wymiana/config/RestClientConfiguration.java @@ -8,9 +8,9 @@ import org.springframework.web.client.RestClient; public class RestClientConfiguration { @Bean - public RestClient restClient() { + public RestClient restClient(NbpProperties nbpProperties) { return RestClient.builder() - .baseUrl("http://api.nbp.pl") + .baseUrl(nbpProperties.baseurl()) .defaultHeader("Accept", "application/json") .build(); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index ae6306d..47b720c 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -2,6 +2,9 @@ hsqldb: name: db port: 9090 +nbp: + baseurl: "http://api.nbp.pl" + spring: datasource: username: sa @@ -11,3 +14,12 @@ spring: jpa: hibernate: ddl-auto: create + +management: + endpoints: + jmx: + exposure: + exclude: '*' + web: + exposure: + include: health diff --git a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java new file mode 100644 index 0000000..8781c04 --- /dev/null +++ b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java @@ -0,0 +1,131 @@ +package eu.ztsh.wymiana.web; + +import eu.ztsh.wymiana.WireMockExtension; +import org.junit.jupiter.api.ClassOrderer; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestClassOrder; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.reactive.server.WebTestClient; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Integration test suite. + * Contrary to the principle of test independence, tests are dependent on one another to create continuous suite. + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("it") +@ExtendWith(WireMockExtension.class) +@TestMethodOrder(MethodOrderer.DisplayName.class) +@TestClassOrder(ClassOrderer.DisplayName.class) +class ApplicationIntegrationTests { + + private final WebTestClient webTestClient; + + @Autowired + public ApplicationIntegrationTests(WebTestClient webTestClient) { + this.webTestClient = webTestClient; + } + + @Nested + @TestMethodOrder(MethodOrderer.DisplayName.class) + @DisplayName("01: Context") + class ContextTests { + + @Test + @DisplayName("01.1: Load context") + void contextLoads() { + assertThat(webTestClient).isNotNull(); + webTestClient.get().uri("/actuator/health").exchange().expectBody().json("{\"status\":\"UP\"}"); + } + + } + + @Nested + @TestMethodOrder(MethodOrderer.DisplayName.class) + @DisplayName("02: User") + class UserTests { + + @Test + @DisplayName("02.1: Create valid user") + void createUserTest() { + + } + + @Test + @DisplayName("02.2: Try to create invalid user") + void createInvalidUserTest() { + + } + + @Test + @DisplayName("02.3: Try to create duplicated user") + void createDuplicatedUserTest() { + + } + + @Test + @DisplayName("02.4: Get valid user") + void getValidUserTest() { + + } + + @Test + @DisplayName("02.5: Try to get non-existing user") + void getNonExistingUserTest() { + + } + + @Test + @DisplayName("02.6: Get user by incorrect PESEL") + void getIncorrectPeselUserTest() { + + } + + } + + @Nested + @TestMethodOrder(MethodOrderer.DisplayName.class) + @DisplayName("03: Exchange") + class ExchangeTests { + + @Test + @DisplayName("03.1: Try to perform invalid money exchange: no data") + void noNbpDataTest() { + + } + + @Test + @DisplayName("03.2: Perform valid money exchange") + void exchangeTest() { + + } + + @Test + @DisplayName("03.3: Try to perform invalid money exchange: not existing user") + void exchangeNotExistingUserTest() { + + } + + @Test + @DisplayName("03.4: Try to perform invalid money exchange: invalid PESEL") + void invalidPeselTest() { + + } + + @Test + @DisplayName("03.5: Try to perform invalid money exchange: insufficient funds") + void insufficientFundsTest() { + + } + + } + +} diff --git a/src/test/resources/application-it.yaml b/src/test/resources/application-it.yaml new file mode 100644 index 0000000..198e366 --- /dev/null +++ b/src/test/resources/application-it.yaml @@ -0,0 +1,2 @@ +nbp: + baseurl: "http://localhost:38080" From 720937bd6c1b98f64aa3d7b80dad7d26a37a9fee Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 24 May 2024 23:37:44 +0200 Subject: [PATCH 28/44] feat!: JDK21 -> pattern matching, integration tests implementation & small fixes --- .woodpecker/maven.yaml | 2 +- pom.xml | 2 +- .../web/controller/UserController.java | 18 ++- .../wymiana/web/model/UserCreateRequest.java | 3 +- .../java/eu/ztsh/wymiana/EntityCreator.java | 23 ++- .../data/repository/UserRepositoryTest.java | 2 +- .../wymiana/service/CurrencyServiceTest.java | 24 ++-- .../ztsh/wymiana/service/UserServiceTest.java | 6 +- .../eu/ztsh/wymiana/util/UserMapperTest.java | 20 +-- .../web/ApplicationIntegrationTests.java | 133 ++++++++++++++++-- 10 files changed, 184 insertions(+), 49 deletions(-) diff --git a/.woodpecker/maven.yaml b/.woodpecker/maven.yaml index 82461b2..6458761 100644 --- a/.woodpecker/maven.yaml +++ b/.woodpecker/maven.yaml @@ -1,5 +1,5 @@ variables: - &maven_image maven:3.9.6-eclipse-temurin-17-alpine + &maven_image maven:3.9.6-eclipse-temurin-21-alpine steps: - name: build diff --git a/pom.xml b/pom.xml index 257ebbb..9ae7829 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ ${source.encoding} - 17 + 21 ${java.version} ${java.version} diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java index c9f7bdc..da83862 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -1,10 +1,13 @@ package eu.ztsh.wymiana.web.controller; +import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.service.UserService; +import eu.ztsh.wymiana.validation.ValidationFailedException; import eu.ztsh.wymiana.web.model.UserCreateRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -17,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor @Validated @RestController -@RequestMapping("/api/user") +@RequestMapping(path = "/api/user", produces = "application/json") public class UserController { private final UserService userService; @@ -28,8 +31,17 @@ public class UserController { } @PostMapping - public ResponseEntity create(@Valid @RequestBody UserCreateRequest request) { - userService.create(request); + public ResponseEntity create(@Valid @RequestBody UserCreateRequest request) { + try { + userService.create(request); + } catch (Exception e) { + var status = switch (e) { + case ValidationFailedException ignored -> HttpStatus.BAD_REQUEST; + case UserAlreadyExistsException ignored -> HttpStatus.CONFLICT; + default -> HttpStatus.INTERNAL_SERVER_ERROR; + }; + return ResponseEntity.status(status).body(e.getMessage()); + } return ResponseEntity.status(204).build(); } diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java index 6c15a62..bd7b1b4 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java @@ -4,12 +4,13 @@ import eu.ztsh.wymiana.validation.Adult; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Builder; +import org.hibernate.validator.constraints.pl.PESEL; @Builder public record UserCreateRequest( @NotNull String name, @NotNull String surname, - @Adult String pesel, + @PESEL @Adult String pesel, @Min(0) double pln) { } diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index c0bb186..5cb9498 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -2,13 +2,17 @@ package eu.ztsh.wymiana; import eu.ztsh.wymiana.data.entity.CurrencyEntity; import eu.ztsh.wymiana.data.entity.UserEntity; +import eu.ztsh.wymiana.model.Currency; import eu.ztsh.wymiana.model.Rate; import eu.ztsh.wymiana.model.Rates; +import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import eu.ztsh.wymiana.web.model.UserCreateRequest; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; public class EntityCreator { @@ -16,6 +20,8 @@ public class EntityCreator { public static class Constants { public static String PESEL = "00281018264"; + public static String INVALID_PESEL = PESEL.replace('6', '7'); + public static String ANOTHER_PESEL = "08280959342"; public static String NAME = "Janina"; public static String SURNAME = "Kowalska"; public static double PLN = 20.10; @@ -28,10 +34,25 @@ public class EntityCreator { } - public static UserEntityBuilder user() { + public static UserEntityBuilder userEntity() { return new UserEntityBuilder(); } + public static User user() { + return user(Constants.PLN, 0); + } + + public static User user(double pln, double usd) { + Map currencies = new HashMap<>(); + if (pln > 0) { + currencies.put("PLN", new Currency("PLN", pln)); + } + if (usd > 0) { + currencies.put("USD", new Currency("USD", pln)); + } + return new User(Constants.NAME, Constants.SURNAME, Constants.PESEL, currencies); + } + public static UserCreateRequest.UserCreateRequestBuilder userRequest() { return UserCreateRequest.builder().name(Constants.NAME) .surname(Constants.SURNAME) diff --git a/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java b/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java index 63cd478..20b7868 100644 --- a/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java +++ b/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java @@ -18,7 +18,7 @@ class UserRepositoryTest extends RepositoryBasedTest { @Transactional @DisplayName("Basic insert & get test") void basicTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); userRepository.save(entity); expect(entity); } diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index 95b1442..9603e00 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -37,7 +37,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void plnToUsdToSellSuccessTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(PLN_SYMBOL) @@ -46,14 +46,14 @@ class CurrencyServiceTest extends RepositoryBasedTest { .build()); assertThat(result.currencies()) .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); - var expected = EntityCreator.user().pln(0).usd(USD_BUY).build(); + var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @Transactional @Test void plnToUsdToBuySuccessTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(PLN_SYMBOL) @@ -62,14 +62,14 @@ class CurrencyServiceTest extends RepositoryBasedTest { .build()); assertThat(result.currencies()) .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); - var expected = EntityCreator.user().pln(0).usd(USD_BUY).build(); + var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @Transactional @Test void usdToPlnToSellSuccessTest() { - var entity = EntityCreator.user().pln(-1).usd(USD_SELL).build(); + var entity = EntityCreator.userEntity().pln(-1).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(USD_SYMBOL) @@ -78,14 +78,14 @@ class CurrencyServiceTest extends RepositoryBasedTest { .build()); assertThat(result.currencies()) .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); - var expected = EntityCreator.user().pln(PLN).usd(0).build(); + var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @Transactional @Test void usdToPlnToBuySuccessTest() { - var entity = EntityCreator.user().pln(-1).usd(USD_SELL).build(); + var entity = EntityCreator.userEntity().pln(-1).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() .from(USD_SYMBOL) @@ -94,14 +94,14 @@ class CurrencyServiceTest extends RepositoryBasedTest { .build()); assertThat(result.currencies()) .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); - var expected = EntityCreator.user().pln(PLN).usd(0).build(); + var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @Transactional @Test void usdToPlnNoUsdCurrencyTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var request = EntityCreator.exchangeRequest() .from(USD_SYMBOL) @@ -116,7 +116,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Test void doubleExchangeTest() { var initialValue = 100; - var entity = EntityCreator.user().pln(initialValue).build(); + var entity = EntityCreator.userEntity().pln(initialValue).build(); userRepository.save(entity); var result1 = currencyService.exchange(EntityCreator.exchangeRequest() .from(PLN_SYMBOL) @@ -141,7 +141,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void insufficientFundsTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var request = EntityCreator.exchangeRequest() .from(PLN_SYMBOL) @@ -203,7 +203,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { } private static Stream invalidPeselTest() { - return Stream.of("INVALID", PESEL.replace('6', '7')); + return Stream.of("INVALID", INVALID_PESEL); } } diff --git a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java index 8a0f9fc..1ab7690 100644 --- a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java @@ -31,7 +31,7 @@ class UserServiceTest extends RepositoryBasedTest { @DisplayName("Create new user") void createNewUserTest() { userService.create(EntityCreator.userRequest().build()); - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); expect(entity); } @@ -64,7 +64,7 @@ class UserServiceTest extends RepositoryBasedTest { @Test @DisplayName("Try to create too young user") void youngUserTest() { - var request = EntityCreator.userRequest().pesel("08280959342").build(); + var request = EntityCreator.userRequest().pesel("").build(); assertThatThrownBy(() -> userService.create(request)) .isInstanceOf(ValidationFailedException.class) .hasMessageContaining(Adult.MESSAGE); @@ -74,7 +74,7 @@ class UserServiceTest extends RepositoryBasedTest { @Transactional @DisplayName("Get existing user") void getExistingUserTest() { - var entity = EntityCreator.user().build(); + var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var userOptional = userService.get(EntityCreator.Constants.PESEL); var expected = UserMapper.entityToPojo(entity); diff --git a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java index dc1eeb8..11503aa 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -13,13 +13,8 @@ class UserMapperTest { @Test void entityToPojoTest() { - var entity = EntityCreator.user().build(); - var expected = new User( - EntityCreator.Constants.NAME, - EntityCreator.Constants.SURNAME, - EntityCreator.Constants.PESEL, - Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) - ); + var entity = EntityCreator.userEntity().build(); + var expected = EntityCreator.user(); assertThat(UserMapper.entityToPojo(entity)) .usingRecursiveComparison() .isEqualTo(expected); @@ -27,13 +22,8 @@ class UserMapperTest { @Test void pojoToEntityTest() { - var entity = new User( - EntityCreator.Constants.NAME, - EntityCreator.Constants.SURNAME, - EntityCreator.Constants.PESEL, - Map.of("PLN", new Currency("PLN", EntityCreator.Constants.PLN)) - ); - var expected = EntityCreator.user().build(); + var entity = EntityCreator.user(); + var expected = EntityCreator.userEntity().build(); assertThat(UserMapper.pojoToEntity(entity)) .usingRecursiveComparison() .isEqualTo(expected); @@ -42,7 +32,7 @@ class UserMapperTest { @Test void requestToEntityTest() { var request = EntityCreator.userRequest().build(); - var expected = EntityCreator.user().build(); + var expected = EntityCreator.userEntity().build(); assertThat(UserMapper.requestToEntity(request)) .usingRecursiveComparison() .isEqualTo(expected); diff --git a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java index 8781c04..38fdfae 100644 --- a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java +++ b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java @@ -1,6 +1,11 @@ package eu.ztsh.wymiana.web; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; +import eu.ztsh.wymiana.model.User; +import eu.ztsh.wymiana.util.UserMapper; import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.MethodOrderer; @@ -14,6 +19,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.reactive.server.WebTestClient; +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; + +import static eu.ztsh.wymiana.EntityCreator.Constants.*; import static org.assertj.core.api.Assertions.assertThat; /** @@ -28,10 +39,20 @@ import static org.assertj.core.api.Assertions.assertThat; class ApplicationIntegrationTests { private final WebTestClient webTestClient; + private final ObjectMapper objectMapper; @Autowired public ApplicationIntegrationTests(WebTestClient webTestClient) { this.webTestClient = webTestClient; + objectMapper = new ObjectMapper(); + } + + private String asJson(Object object) { + try { + return objectMapper.writeValueAsString(object); + } catch (JsonProcessingException e) { + throw new IllegalStateException(e); + } } @Nested @@ -53,40 +74,66 @@ class ApplicationIntegrationTests { @DisplayName("02: User") class UserTests { + private static final String endpoint = "/api/user"; + @Test @DisplayName("02.1: Create valid user") void createUserTest() { - + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.userRequest().pln(100).build()) + .exchange() + .expectStatus().is2xxSuccessful(); } @Test @DisplayName("02.2: Try to create invalid user") void createInvalidUserTest() { - + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.userRequest().pesel(INVALID_PESEL).build()) + .exchange() + .expectStatus() + .is4xxClientError(); } @Test @DisplayName("02.3: Try to create duplicated user") void createDuplicatedUserTest() { - + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.userRequest().build()) + .exchange() + .expectStatus().is4xxClientError() + .expectBody(String.class).isEqualTo("User with PESEL %s already exists".formatted(PESEL)); } @Test @DisplayName("02.4: Get valid user") void getValidUserTest() { - + webTestClient.get() + .uri(endpoint.concat("/").concat(PESEL)) + .exchange() + .expectStatus().is2xxSuccessful() + .expectBody().json(asJson(UserMapper.entityToPojo(EntityCreator.userEntity().pln(100).build()))); } @Test @DisplayName("02.5: Try to get non-existing user") void getNonExistingUserTest() { - + webTestClient.get() + .uri(endpoint.concat("/").concat(ANOTHER_PESEL)) + .exchange() + .expectStatus().is4xxClientError(); } @Test @DisplayName("02.6: Get user by incorrect PESEL") void getIncorrectPeselUserTest() { - + webTestClient.get() + .uri(endpoint.concat("/").concat(INVALID_PESEL)) + .exchange() + .expectStatus().is4xxClientError(); } } @@ -96,34 +143,98 @@ class ApplicationIntegrationTests { @DisplayName("03: Exchange") class ExchangeTests { + private static final String URI_PATTERN = "/api/exchangerates/rates/c/usd/%s/"; + private final DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + private static final String endpoint = "/api/exchange"; + @Test @DisplayName("03.1: Try to perform invalid money exchange: no data") void noNbpDataTest() { - + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(PLN) + .build()) + .exchange() + .expectStatus().is5xxServerError(); } @Test @DisplayName("03.2: Perform valid money exchange") - void exchangeTest() { - + void exchangeTest() throws JsonProcessingException { + var date = getTodayOrLastFriday(); + WireMockExtension.response( + URI_PATTERN.formatted(date), + 200, + new ObjectMapper().writeValueAsString(EntityCreator.rates(date)) + ); + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(PLN) + .build()) + .exchange() + .expectStatus().is2xxSuccessful() + .expectBody(User.class).isEqualTo(EntityCreator.user(100 - PLN, USD_BUY)); } @Test @DisplayName("03.3: Try to perform invalid money exchange: not existing user") void exchangeNotExistingUserTest() { - + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.exchangeRequest() + .pesel(ANOTHER_PESEL) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(PLN) + .build()) + .exchange() + .expectStatus().is4xxClientError() + .expectBody(String.class).isEqualTo("An exchange error has occurred"); } @Test @DisplayName("03.4: Try to perform invalid money exchange: invalid PESEL") void invalidPeselTest() { - + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.exchangeRequest() + .pesel(INVALID_PESEL) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) + .toSell(PLN) + .build()) + .exchange() + .expectStatus().is4xxClientError(); } @Test @DisplayName("03.5: Try to perform invalid money exchange: insufficient funds") void insufficientFundsTest() { + webTestClient.post() + .uri(endpoint) + .bodyValue(EntityCreator.exchangeRequest() + .pesel(ANOTHER_PESEL) + .from(USD_SYMBOL) + .to(PLN_SYMBOL) + .toBuy(PLN) + .build()) + .exchange() + .expectStatus().is4xxClientError(); + } + private String getTodayOrLastFriday() { + var today = LocalDate.now(); + if (today.getDayOfWeek() == DayOfWeek.SATURDAY + || today.getDayOfWeek() == DayOfWeek.SUNDAY) { + today = today.with(TemporalAdjusters.previous(DayOfWeek.FRIDAY)); + } + return today.format(dtf); } } From 95ed5f6ae73c2a53fb301a7ce31b90170d8a72d3 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Sat, 25 May 2024 00:33:33 +0200 Subject: [PATCH 29/44] feat: ExchangeController & tests --- .../exception/UserNotFoundException.java | 11 +++++ .../ztsh/wymiana/service/CurrencyService.java | 3 +- .../eu/ztsh/wymiana/service/UserService.java | 2 + .../web/controller/ExchangeController.java | 42 +++++++++++++++++++ .../web/controller/UserController.java | 9 +++- .../java/eu/ztsh/wymiana/EntityCreator.java | 2 +- .../wymiana/service/CurrencyServiceTest.java | 3 +- .../web/ApplicationIntegrationTests.java | 34 +++++++-------- 8 files changed, 85 insertions(+), 21 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java create mode 100644 src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java diff --git a/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java b/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java new file mode 100644 index 0000000..7390eb3 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java @@ -0,0 +1,11 @@ +package eu.ztsh.wymiana.exception; + +import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; + +public class UserNotFoundException extends RuntimeException { + + public UserNotFoundException(CurrencyExchangeRequest entity) { + super("User with PESEL %s not found".formatted(entity.pesel())); + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java index b00f761..401626a 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -2,6 +2,7 @@ package eu.ztsh.wymiana.service; import eu.ztsh.wymiana.exception.ExchangeFailedException; import eu.ztsh.wymiana.exception.InsufficientFundsException; +import eu.ztsh.wymiana.exception.UserNotFoundException; import eu.ztsh.wymiana.model.Currency; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.validation.InstanceValidator; @@ -49,7 +50,7 @@ public class CurrencyService { user.currencies().putAll(exchanged); return userService.update(user); }) - .orElseThrow(ExchangeFailedException::new); + .orElseThrow(() -> new UserNotFoundException(request)); } private Currency create(String symbol) { diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index 0bb7945..857bc0f 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -9,9 +9,11 @@ import eu.ztsh.wymiana.web.model.UserCreateRequest; import lombok.RequiredArgsConstructor; import org.hibernate.validator.constraints.pl.PESEL; import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import java.util.Optional; +@Validated @RequiredArgsConstructor @Service public class UserService { diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java new file mode 100644 index 0000000..ae666ef --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java @@ -0,0 +1,42 @@ +package eu.ztsh.wymiana.web.controller; + +import eu.ztsh.wymiana.exception.InsufficientFundsException; +import eu.ztsh.wymiana.exception.UserAlreadyExistsException; +import eu.ztsh.wymiana.exception.UserNotFoundException; +import eu.ztsh.wymiana.service.CurrencyService; +import eu.ztsh.wymiana.validation.ValidationFailedException; +import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequiredArgsConstructor +@Validated +@RestController +@RequestMapping(path = "/api/exchange", produces = "application/json") +public class ExchangeController { + + private final CurrencyService currencyService; + + @PostMapping + public ResponseEntity exchange(@Valid @RequestBody CurrencyExchangeRequest request) { + try { + return ResponseEntity.status(200).body(currencyService.exchange(request)); + } catch (Exception e) { + var status = switch (e) { + case InsufficientFundsException ignored -> HttpStatus.BAD_REQUEST; + case UserNotFoundException ignored -> HttpStatus.NOT_FOUND; + default -> HttpStatus.INTERNAL_SERVER_ERROR; + }; + return ResponseEntity.status(status).body(e.getMessage()); + } + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java index da83862..319d93a 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -6,6 +6,7 @@ import eu.ztsh.wymiana.service.UserService; import eu.ztsh.wymiana.validation.ValidationFailedException; import eu.ztsh.wymiana.web.model.UserCreateRequest; import jakarta.validation.Valid; +import jakarta.validation.ValidationException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -27,7 +28,13 @@ public class UserController { @GetMapping("{pesel}") public ResponseEntity get(@PathVariable("pesel") String pesel) { - return ResponseEntity.of(userService.get(pesel)); + try { + return userService.get(pesel) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } catch (ValidationException e) { + return ResponseEntity.badRequest().build(); + } } @PostMapping diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index 5cb9498..617cbfa 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -48,7 +48,7 @@ public class EntityCreator { currencies.put("PLN", new Currency("PLN", pln)); } if (usd > 0) { - currencies.put("USD", new Currency("USD", pln)); + currencies.put("USD", new Currency("USD", usd)); } return new User(Constants.NAME, Constants.SURNAME, Constants.PESEL, currencies); } diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index 9603e00..c44625e 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -5,6 +5,7 @@ import eu.ztsh.wymiana.RepositoryBasedTest; import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.ExchangeFailedException; import eu.ztsh.wymiana.exception.InsufficientFundsException; +import eu.ztsh.wymiana.exception.UserNotFoundException; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.validation.ValidationFailedException; import jakarta.transaction.Transactional; @@ -175,7 +176,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) - .isInstanceOf(ExchangeFailedException.class); + .isInstanceOf(UserNotFoundException.class); } @Test diff --git a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java index 38fdfae..816cc99 100644 --- a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java +++ b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; -import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.util.UserMapper; import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.DisplayName; @@ -83,7 +82,7 @@ class ApplicationIntegrationTests { .uri(endpoint) .bodyValue(EntityCreator.userRequest().pln(100).build()) .exchange() - .expectStatus().is2xxSuccessful(); + .expectStatus().isNoContent(); } @Test @@ -94,7 +93,7 @@ class ApplicationIntegrationTests { .bodyValue(EntityCreator.userRequest().pesel(INVALID_PESEL).build()) .exchange() .expectStatus() - .is4xxClientError(); + .isBadRequest(); } @Test @@ -104,7 +103,7 @@ class ApplicationIntegrationTests { .uri(endpoint) .bodyValue(EntityCreator.userRequest().build()) .exchange() - .expectStatus().is4xxClientError() + .expectStatus().isEqualTo(409) .expectBody(String.class).isEqualTo("User with PESEL %s already exists".formatted(PESEL)); } @@ -114,7 +113,7 @@ class ApplicationIntegrationTests { webTestClient.get() .uri(endpoint.concat("/").concat(PESEL)) .exchange() - .expectStatus().is2xxSuccessful() + .expectStatus().isOk() .expectBody().json(asJson(UserMapper.entityToPojo(EntityCreator.userEntity().pln(100).build()))); } @@ -124,7 +123,7 @@ class ApplicationIntegrationTests { webTestClient.get() .uri(endpoint.concat("/").concat(ANOTHER_PESEL)) .exchange() - .expectStatus().is4xxClientError(); + .expectStatus().isNotFound(); } @Test @@ -133,7 +132,7 @@ class ApplicationIntegrationTests { webTestClient.get() .uri(endpoint.concat("/").concat(INVALID_PESEL)) .exchange() - .expectStatus().is4xxClientError(); + .expectStatus().isBadRequest(); } } @@ -158,18 +157,19 @@ class ApplicationIntegrationTests { .toSell(PLN) .build()) .exchange() - .expectStatus().is5xxServerError(); + .expectStatus().isEqualTo(500); } @Test @DisplayName("03.2: Perform valid money exchange") - void exchangeTest() throws JsonProcessingException { + void exchangeTest() { var date = getTodayOrLastFriday(); WireMockExtension.response( URI_PATTERN.formatted(date), 200, - new ObjectMapper().writeValueAsString(EntityCreator.rates(date)) + asJson(EntityCreator.rates(date)) ); + var expected = asJson(EntityCreator.user(100 - PLN, USD_BUY)); webTestClient.post() .uri(endpoint) .bodyValue(EntityCreator.exchangeRequest() @@ -178,8 +178,9 @@ class ApplicationIntegrationTests { .toSell(PLN) .build()) .exchange() - .expectStatus().is2xxSuccessful() - .expectBody(User.class).isEqualTo(EntityCreator.user(100 - PLN, USD_BUY)); + .expectStatus().isOk() + .expectBody().json(expected); + WireMockExtension.verifyGet(2, URI_PATTERN.formatted(date)); } @Test @@ -194,8 +195,8 @@ class ApplicationIntegrationTests { .toSell(PLN) .build()) .exchange() - .expectStatus().is4xxClientError() - .expectBody(String.class).isEqualTo("An exchange error has occurred"); + .expectStatus().isNotFound() + .expectBody(String.class).isEqualTo("User with PESEL %s not found".formatted(ANOTHER_PESEL)); } @Test @@ -210,7 +211,7 @@ class ApplicationIntegrationTests { .toSell(PLN) .build()) .exchange() - .expectStatus().is4xxClientError(); + .expectStatus().isBadRequest(); } @Test @@ -219,13 +220,12 @@ class ApplicationIntegrationTests { webTestClient.post() .uri(endpoint) .bodyValue(EntityCreator.exchangeRequest() - .pesel(ANOTHER_PESEL) .from(USD_SYMBOL) .to(PLN_SYMBOL) .toBuy(PLN) .build()) .exchange() - .expectStatus().is4xxClientError(); + .expectStatus().isBadRequest(); } private String getTodayOrLastFriday() { From d0e21e9eff4671575051ad7d9cc60fe0b28db695 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Sat, 25 May 2024 00:36:32 +0200 Subject: [PATCH 30/44] test: Dummy fix --- .../java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java index 816cc99..272c140 100644 --- a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java +++ b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java @@ -180,7 +180,7 @@ class ApplicationIntegrationTests { .exchange() .expectStatus().isOk() .expectBody().json(expected); - WireMockExtension.verifyGet(2, URI_PATTERN.formatted(date)); + WireMockExtension.verifyGet(1, URI_PATTERN.formatted(date)); } @Test From ec0ee860eed779925c8af6ffdd234596de3267b3 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Sat, 25 May 2024 00:47:12 +0200 Subject: [PATCH 31/44] fix: SonarLint fixes --- .../ztsh/wymiana/exception/UserNotFoundException.java | 6 +++++- .../wymiana/web/controller/ExchangeController.java | 3 --- .../ztsh/wymiana/web/controller/UserController.java | 11 ++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java b/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java index 7390eb3..3cf38c2 100644 --- a/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java +++ b/src/main/java/eu/ztsh/wymiana/exception/UserNotFoundException.java @@ -5,7 +5,11 @@ import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; public class UserNotFoundException extends RuntimeException { public UserNotFoundException(CurrencyExchangeRequest entity) { - super("User with PESEL %s not found".formatted(entity.pesel())); + this(entity.pesel()); + } + + public UserNotFoundException(String pesel) { + super("User with PESEL %s not found".formatted(pesel)); } } diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java index ae666ef..fb0ee13 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java @@ -1,14 +1,11 @@ package eu.ztsh.wymiana.web.controller; import eu.ztsh.wymiana.exception.InsufficientFundsException; -import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.exception.UserNotFoundException; import eu.ztsh.wymiana.service.CurrencyService; -import eu.ztsh.wymiana.validation.ValidationFailedException; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpEntity; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java index 319d93a..bca74ce 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -1,6 +1,7 @@ package eu.ztsh.wymiana.web.controller; import eu.ztsh.wymiana.exception.UserAlreadyExistsException; +import eu.ztsh.wymiana.exception.UserNotFoundException; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.service.UserService; import eu.ztsh.wymiana.validation.ValidationFailedException; @@ -31,9 +32,13 @@ public class UserController { try { return userService.get(pesel) .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); - } catch (ValidationException e) { - return ResponseEntity.badRequest().build(); + .orElseThrow(() -> new UserNotFoundException(pesel)); + } catch (Exception e) { + return ResponseEntity.status(switch (e) { + case ValidationException ignore -> 400; + case UserNotFoundException ignore -> 404; + default -> 500; + }).build(); } } From c43aacc60b012f6d5530b4764de61441a32f0a61 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Sat, 25 May 2024 00:55:45 +0200 Subject: [PATCH 32/44] feat: Release 1.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ae7829..69862f2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ eu.ztsh wymiana-walut - 1.0.0-SNAPSHOT + 1.0.0 From 476410fba8d1833d9e070d5e977d9f2038b72898 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 7 Jun 2024 01:12:19 +0200 Subject: [PATCH 33/44] docs: Readme --- readme.md | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 readme.md diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..c1a193e --- /dev/null +++ b/readme.md @@ -0,0 +1,174 @@ +# Wymiana walut + +Prosty mikroserwis stworzony na potrzeby rekrutacji + +## Założenia + +- PESEL jedynym identyfikatorem +- Jedno konto na PESEL +- Użytkownik pełnoletni +- Wymiana walut na podstawie tabeli NBP +- Baza danych in-memory + +## Interfejsy + +- stworzenie konta + + ⇒ POST `/api/user` + ```json + { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "surname": { + "type": "string" + }, + "pesel": { + "type": "string" + }, + "pln": { + "type": "number", + "description": "początkowy stan konta w złotówkach" + } + }, + "required": [ + "name", + "surname", + "pesel", + "pln" + ] + } + ``` + ⇐ 204/400/409/500 + +- pobranie informacji o koncie + + ⇒ GET `/api/user/{pesel}` + + ⇐ 200/400/404/500 + ```json + { + "type": "object", + "def": { + "currency": { + "type": "object", + "properties": { + "symbol": { + "type": "string" + }, + "amount": { + "type": "number" + } + }, + "required": [ + "symbol", + "amount" + ] + } + }, + "properties": { + "name": { + "type": "string" + }, + "surname": { + "type": "string" + }, + "pesel": { + "type": "string" + }, + "currencies": { + "$comment": "TODO: Map -> List", + "type": "array", + "items": { + "$ref": "#/def/currency" + } + } + }, + "required": [ + "name", + "surname", + "pesel", + "currencies" + ] + } + ``` +- zlecenie wymiany walut + + ⇒ POST `/api/exchange/{pesel}` + ```json + { + "type": "object", + "properties": { + "pesel": { + "type": "string" + }, + "from": { + "type": "string", + "description": "waluta źródłowa" + }, + "to": { + "type": "string", + "description": "waluta docelowa" + }, + "toBuy": { + "type": "number", + "description": "ilość do zakupu" + }, + "toSell": { + "type": "number", + "description": "ilość do sprzedaży" + } + }, + "oneOf": [ + { + "required": [ + "pesel", + "from", + "to", + "toBuy" + ] + }, + { + "required": [ + "pesel", + "from", + "to", + "toSell" + ] + } + ] + } + ``` + + ⇐ 200/400/404/500 + + patrz: pobranie informacji o koncie + +## Architektura + +```mermaid + flowchart LR + actor["fa:fa-person"] + subgraph NBP + tabC["Tabela C"] + end + subgraph proces + subgraph spring-boot + core + subgraph endpoint + user + exchange + end + end + hsqldb + end + + actor <--> user + actor <--> exchange + endpoint <--> core + core <--> tabC + core <-- ${hsql.port} --> hsqldb + +``` From b11607088abbfb5731e6b2d1a5d549d69fca0b4c Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Fri, 7 Jun 2024 01:13:25 +0200 Subject: [PATCH 34/44] docs: Readme fix --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c1a193e..92a57f9 100644 --- a/readme.md +++ b/readme.md @@ -169,6 +169,6 @@ Prosty mikroserwis stworzony na potrzeby rekrutacji actor <--> exchange endpoint <--> core core <--> tabC - core <-- ${hsql.port} --> hsqldb + core <-- hsql.port --> hsqldb ``` From f42dcce74b304a9e5e94439def4ffe17b27cedef Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Mon, 10 Jun 2024 23:52:47 +0200 Subject: [PATCH 35/44] fix: Double to BigDecimal --- pom.xml | 1 + readme.md | 2 +- .../wymiana/data/entity/CurrencyEntity.java | 4 +- .../java/eu/ztsh/wymiana/model/Currency.java | 4 +- .../ztsh/wymiana/service/CurrencyService.java | 36 +++++++------ .../eu/ztsh/wymiana/service/NbpService.java | 9 ++-- .../java/eu/ztsh/wymiana/util/UserMapper.java | 2 +- .../ValidExchangeRequestValidator.java | 4 +- .../web/model/CurrencyExchangeRequest.java | 6 ++- .../wymiana/web/model/UserCreateRequest.java | 4 +- .../java/eu/ztsh/wymiana/EntityCreator.java | 50 +++++++++++++------ .../wymiana/service/CurrencyServiceTest.java | 14 +++--- .../ztsh/wymiana/service/UserServiceTest.java | 3 +- .../ValidExchangeRequestValidatorTest.java | 6 ++- .../web/ApplicationIntegrationTests.java | 5 +- 15 files changed, 93 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index 69862f2..d716a75 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ ${basedir}/src/main/resources/schema eu.ztsh.wymiana.model + true diff --git a/readme.md b/readme.md index 92a57f9..75a4586 100644 --- a/readme.md +++ b/readme.md @@ -37,7 +37,7 @@ Prosty mikroserwis stworzony na potrzeby rekrutacji "name", "surname", "pesel", - "pln" + "initial" ] } ``` diff --git a/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java b/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java index 441b224..f468a67 100644 --- a/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java +++ b/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java @@ -7,6 +7,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + @Data @NoArgsConstructor @AllArgsConstructor @@ -18,6 +20,6 @@ public class CurrencyEntity { String pesel; @Id String symbol; - Double amount; + BigDecimal amount; } diff --git a/src/main/java/eu/ztsh/wymiana/model/Currency.java b/src/main/java/eu/ztsh/wymiana/model/Currency.java index 0cc6b16..e644aff 100644 --- a/src/main/java/eu/ztsh/wymiana/model/Currency.java +++ b/src/main/java/eu/ztsh/wymiana/model/Currency.java @@ -1,5 +1,7 @@ package eu.ztsh.wymiana.model; -public record Currency(String symbol, double amount) { +import java.math.BigDecimal; + +public record Currency(String symbol, BigDecimal amount) { } diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java index 401626a..9480825 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -45,8 +45,8 @@ public class CurrencyService { } var exchanged = performExchange(from, Optional.ofNullable(user.currencies().get(request.to().toUpperCase())).orElse(create(request.to())), - Optional.ofNullable(request.toSell()).orElse(0D), - Optional.ofNullable(request.toBuy()).orElse(0D)); + Optional.ofNullable(request.toSell()).orElse(BigDecimal.ZERO), + Optional.ofNullable(request.toBuy()).orElse(BigDecimal.ZERO)); user.currencies().putAll(exchanged); return userService.update(user); }) @@ -55,32 +55,36 @@ public class CurrencyService { private Currency create(String symbol) { // TODO: check if supported - now limited to PLN <-> USD - return new Currency(symbol.toUpperCase(), 0D); + return new Currency(symbol.toUpperCase(), BigDecimal.ZERO); } - private Map performExchange(Currency from, Currency to, double toSell, double toBuy) { - double exchangeRate; - double neededFromAmount; - double requestedToAmount; + private Map performExchange(Currency from, Currency to, BigDecimal toSell, BigDecimal toBuy) { + BigDecimal exchangeRate; + BigDecimal neededFromAmount; + BigDecimal requestedToAmount; if (from.symbol().equalsIgnoreCase("PLN")) { exchangeRate = nbpService.getSellRate(to.symbol()); - neededFromAmount = round(toBuy != 0 ? toBuy * exchangeRate : toSell); - requestedToAmount = round(toBuy != 0 ? toBuy : toSell / exchangeRate); + neededFromAmount = round(toBuy.signum() != 0 ? toBuy.multiply(exchangeRate) : toSell); + requestedToAmount = round(toBuy.signum() != 0 ? toBuy : divide(toSell, exchangeRate)); } else { exchangeRate = nbpService.getBuyRate(from.symbol()); - neededFromAmount = round(toBuy != 0 ? toBuy / exchangeRate : toSell); - requestedToAmount = round(toBuy != 0 ? toBuy : toSell * exchangeRate); + neededFromAmount = round(toBuy.signum() != 0 ? divide(toBuy, exchangeRate) : toSell); + requestedToAmount = round(toBuy.signum() != 0 ? toBuy : toSell.multiply(exchangeRate)); } - if (neededFromAmount > from.amount()) { + if (neededFromAmount.compareTo(from.amount()) > 0) { throw new InsufficientFundsException(); } - var newFrom = new Currency(from.symbol(), from.amount() - neededFromAmount); - var newTo = new Currency(to.symbol(), to.amount() + requestedToAmount); + var newFrom = new Currency(from.symbol(), from.amount().subtract(neededFromAmount)); + var newTo = new Currency(to.symbol(), to.amount().add(requestedToAmount)); return Stream.of(newFrom, newTo).collect(Collectors.toMap(Currency::symbol, currency -> currency)); } - private double round(double input) { - return BigDecimal.valueOf(input).setScale(2, RoundingMode.HALF_UP).doubleValue(); + private BigDecimal round(BigDecimal input) { + return input.setScale(2, RoundingMode.HALF_UP); + } + + private BigDecimal divide(BigDecimal input, BigDecimal division) { + return input.setScale(2, RoundingMode.HALF_UP).divide(division, RoundingMode.HALF_UP); } } diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index e612e0a..3fca0d1 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -8,6 +8,7 @@ import org.springframework.http.HttpStatusCode; import org.springframework.stereotype.Service; import org.springframework.web.client.RestClient; +import java.math.BigDecimal; import java.time.Clock; import java.time.DayOfWeek; import java.time.LocalDate; @@ -30,11 +31,11 @@ public class NbpService { private final ConcurrentMap cache = new ConcurrentHashMap<>(1); - public double getSellRate(String currency) { + public BigDecimal getSellRate(String currency) { return getCurrency(currency.toUpperCase()).sell(); } - public double getBuyRate(String currency) { + public BigDecimal getBuyRate(String currency) { return getCurrency(currency.toUpperCase()).buy(); } @@ -43,7 +44,7 @@ public class NbpService { var cacheObject = cache.get(currency); if (cacheObject == null || cacheObject.date().isBefore(today)) { var fresh = fetchData(currency, dtf.format(today)); - var rate = fresh.getRates().get(0); + var rate = fresh.getRates().getFirst(); cacheObject = new RatesCache( LocalDate.parse(rate.getEffectiveDate(), dtf), rate.getBid(), @@ -82,7 +83,7 @@ public class NbpService { || today.getDayOfWeek() == DayOfWeek.SUNDAY; } - private record RatesCache(LocalDate date, double buy, double sell) { + private record RatesCache(LocalDate date, BigDecimal buy, BigDecimal sell) { } diff --git a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java index 39985fb..15a9e5a 100644 --- a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java @@ -21,7 +21,7 @@ public class UserMapper { public static UserEntity requestToEntity(UserCreateRequest request) { return new UserEntity(request.pesel(), request.name(), request.surname(), - List.of(new CurrencyEntity(request.pesel(), "PLN", request.pln()))); + List.of(new CurrencyEntity(request.pesel(), "PLN", request.initial()))); } private UserMapper() { diff --git a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java index 143876b..9a01a0c 100644 --- a/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java +++ b/src/main/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidator.java @@ -18,8 +18,8 @@ public class ValidExchangeRequestValidator implements return (request.from() != null && !request.from().equals(request.to())) && !((request.toBuy() == null && request.toSell() == null) || (request.toBuy() != null && request.toSell() != null)) - && ((request.toBuy() != null && request.toBuy() >= 0) - || (request.toSell() != null && request.toSell() >= 0)); + && ((request.toBuy() != null && request.toBuy().signum() >= 0) + || (request.toSell() != null && request.toSell().signum() >= 0)); } } diff --git a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java index 54f192e..c804720 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java @@ -5,14 +5,16 @@ import jakarta.validation.constraints.NotNull; import lombok.Builder; import org.hibernate.validator.constraints.pl.PESEL; +import java.math.BigDecimal; + @Builder @ValidExchangeRequest public record CurrencyExchangeRequest( @PESEL String pesel, @NotNull String from, @NotNull String to, - Double toBuy, - Double toSell + BigDecimal toBuy, + BigDecimal toSell ) { } diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java index bd7b1b4..cb5de05 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java @@ -6,11 +6,13 @@ import jakarta.validation.constraints.NotNull; import lombok.Builder; import org.hibernate.validator.constraints.pl.PESEL; +import java.math.BigDecimal; + @Builder public record UserCreateRequest( @NotNull String name, @NotNull String surname, @PESEL @Adult String pesel, - @Min(0) double pln) { + @Min(0) BigDecimal initial) { } diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index 617cbfa..6535f11 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -9,6 +9,8 @@ import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import eu.ztsh.wymiana.web.model.UserCreateRequest; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -24,13 +26,13 @@ public class EntityCreator { public static String ANOTHER_PESEL = "08280959342"; public static String NAME = "Janina"; public static String SURNAME = "Kowalska"; - public static double PLN = 20.10; - public static double USD_SELL = 5.18; - public static double USD_BUY = 5.08; + public static BigDecimal PLN = createScaled(20.10, 2); + public static BigDecimal USD_SELL = createScaled(5.18, 2); + public static BigDecimal USD_BUY = createScaled(5.08, 2); public static String PLN_SYMBOL = "PLN"; public static String USD_SYMBOL = "USD"; - public static double BUY_RATE = 3.8804; - public static double SELL_RATE = 3.9572; + public static BigDecimal BUY_RATE = createScaled(3.8804, 4); + public static BigDecimal SELL_RATE = createScaled(3.9572, 4); } @@ -39,25 +41,29 @@ public class EntityCreator { } public static User user() { - return user(Constants.PLN, 0); + return user(Constants.PLN, BigDecimal.ZERO); } - public static User user(double pln, double usd) { + public static User user(BigDecimal pln, BigDecimal usd) { Map currencies = new HashMap<>(); - if (pln > 0) { + if (pln.signum() > 0) { currencies.put("PLN", new Currency("PLN", pln)); } - if (usd > 0) { + if (usd.signum() > 0) { currencies.put("USD", new Currency("USD", usd)); } return new User(Constants.NAME, Constants.SURNAME, Constants.PESEL, currencies); } public static UserCreateRequest.UserCreateRequestBuilder userRequest() { + return userRequest(null); + } + + public static UserCreateRequest.UserCreateRequestBuilder userRequest(Double initial) { return UserCreateRequest.builder().name(Constants.NAME) .surname(Constants.SURNAME) .pesel(Constants.PESEL) - .pln(Constants.PLN); + .initial(initial != null ? createScaled(initial, 2) : Constants.PLN); } public static CurrencyExchangeRequest.CurrencyExchangeRequestBuilder exchangeRequest() { @@ -83,8 +89,8 @@ public class EntityCreator { String name; String surname; String pesel; - double pln = -1; - double usd = -1; + BigDecimal pln = BigDecimal.valueOf(-1); + BigDecimal usd = BigDecimal.valueOf(-1); public UserEntityBuilder name(String name) { this.name = name; @@ -102,22 +108,30 @@ public class EntityCreator { } public UserEntityBuilder pln(double pln) { - this.pln = pln; + return this.pln(BigDecimal.valueOf(pln)); + } + + public UserEntityBuilder pln(BigDecimal pln) { + this.pln = pln.setScale(2, RoundingMode.HALF_UP); return this; } public UserEntityBuilder usd(double usd) { - this.usd = usd; + return this.usd(BigDecimal.valueOf(usd)); + } + + public UserEntityBuilder usd(BigDecimal usd) { + this.usd = usd.setScale(2, RoundingMode.HALF_UP); return this; } public UserEntity build() { var nonnulPesel = Optional.ofNullable(pesel).orElse(Constants.PESEL); List currencies = new ArrayList<>(); - if (pln > -1) { + if (pln.signum() > -1) { currencies.add(new CurrencyEntity(nonnulPesel, "PLN", pln)); } - if (usd > -1) { + if (usd.signum() > -1) { currencies.add(new CurrencyEntity(nonnulPesel, "USD", usd)); } if (currencies.isEmpty()) { @@ -133,4 +147,8 @@ public class EntityCreator { } + private static BigDecimal createScaled(double input, int scale) { + return BigDecimal.valueOf(input).setScale(scale, RoundingMode.HALF_UP); + } + } diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index c44625e..474f11f 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -16,6 +16,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; +import java.math.BigDecimal; +import java.util.Objects; import java.util.stream.Stream; import static eu.ztsh.wymiana.EntityCreator.Constants.*; @@ -46,7 +48,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toSell(PLN) .build()); assertThat(result.currencies()) - .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); + .matches(map -> map.get(PLN_SYMBOL).amount().signum() == 0 && Objects.equals(map.get(USD_SYMBOL).amount(), USD_BUY), "USD 5.08"); var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @@ -62,7 +64,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toBuy(USD_BUY) .build()); assertThat(result.currencies()) - .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); + .matches(map -> map.get(PLN_SYMBOL).amount().signum() == 0 && Objects.equals(map.get(USD_SYMBOL).amount(), USD_BUY)); var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @@ -78,7 +80,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toSell(USD_SELL) .build()); assertThat(result.currencies()) - .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); + .matches(map -> Objects.equals(map.get(PLN_SYMBOL).amount(), PLN) && map.get(USD_SYMBOL).amount().signum() == 0, "PLN 20.10"); var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @@ -94,7 +96,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { .toBuy(PLN) .build()); assertThat(result.currencies()) - .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); + .matches(map -> Objects.equals(map.get(PLN_SYMBOL).amount(), PLN) && map.get(USD_SYMBOL).amount().signum() == 0, "PLN 20.10"); var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @@ -116,7 +118,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void doubleExchangeTest() { - var initialValue = 100; + var initialValue = BigDecimal.valueOf(100); var entity = EntityCreator.userEntity().pln(initialValue).build(); userRepository.save(entity); var result1 = currencyService.exchange(EntityCreator.exchangeRequest() @@ -136,7 +138,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { assertThat(resultEntity.getCurrencies() .stream() .filter(c -> c.getSymbol().equalsIgnoreCase("PLN")) - .findFirst()).isNotEmpty().get().matches(currencyEntity -> currencyEntity.getAmount() < initialValue); + .findFirst()).isNotEmpty().get().matches(currencyEntity -> currencyEntity.getAmount().compareTo(initialValue) < 0); } @Transactional diff --git a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java index 1ab7690..fef02b9 100644 --- a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java @@ -50,10 +50,9 @@ class UserServiceTest extends RepositoryBasedTest { @DisplayName("Try to create another user with same PESEL") void createDuplicatedPeselTest() { var first = EntityCreator.userRequest().build(); - var second = EntityCreator.userRequest() + var second = EntityCreator.userRequest(30.30) .name("Jan") .surname("Kowalski") - .pln(30.30) .build(); userService.create(first); assertThatThrownBy(() -> userService.create(second)) diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java index 5226e14..e8ef550 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -5,6 +5,8 @@ import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import java.math.BigDecimal; + import static eu.ztsh.wymiana.EntityCreator.Constants.PLN_SYMBOL; import static eu.ztsh.wymiana.EntityCreator.Constants.USD_BUY; import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SELL; @@ -72,7 +74,7 @@ class ValidExchangeRequestValidatorTest extends ValidatorTest Date: Sat, 15 Jun 2024 00:04:06 +0200 Subject: [PATCH 36/44] feat: swagger & requests annotations --- pom.xml | 6 ++++++ .../eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java | 7 ++++--- .../java/eu/ztsh/wymiana/web/model/UserCreateRequest.java | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d716a75..7431833 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ 3.5.4 + 2.5.0 1.2.1 @@ -62,6 +63,11 @@ lombok provided + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${openapi.version} + diff --git a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java index c804720..5264636 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java @@ -1,6 +1,7 @@ package eu.ztsh.wymiana.web.model; import eu.ztsh.wymiana.validation.ValidExchangeRequest; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Builder; import org.hibernate.validator.constraints.pl.PESEL; @@ -10,11 +11,11 @@ import java.math.BigDecimal; @Builder @ValidExchangeRequest public record CurrencyExchangeRequest( - @PESEL String pesel, + @NotNull @PESEL String pesel, @NotNull String from, @NotNull String to, - BigDecimal toBuy, - BigDecimal toSell + @Min(0) BigDecimal toBuy, + @Min(0) BigDecimal toSell ) { } diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java index cb5de05..0614f6b 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; public record UserCreateRequest( @NotNull String name, @NotNull String surname, - @PESEL @Adult String pesel, - @Min(0) BigDecimal initial) { + @PESEL @Adult @NotNull String pesel, + @NotNull @Min(0) BigDecimal initial) { } From 11d6e41c983f2991a0001d366059150b4f19667b Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Tue, 25 Jun 2024 00:24:18 +0200 Subject: [PATCH 37/44] feat: Currency symbols enum --- .../wymiana/config/CurrencyProperties.java | 9 +++ .../wymiana/data/entity/CurrencyEntity.java | 6 +- .../wymiana/exception/NoDataException.java | 4 +- .../java/eu/ztsh/wymiana/model/Currency.java | 2 +- .../java/eu/ztsh/wymiana/model/Symbol.java | 6 ++ src/main/java/eu/ztsh/wymiana/model/User.java | 2 +- .../UserCreateRequestConfiguredWrapper.java | 65 +++++++++++++++++ .../ztsh/wymiana/service/CurrencyService.java | 22 +++--- .../eu/ztsh/wymiana/service/NbpService.java | 19 ++--- .../eu/ztsh/wymiana/service/UserService.java | 7 +- .../eu/ztsh/wymiana/util/CurrencyMapper.java | 5 +- .../java/eu/ztsh/wymiana/util/UserMapper.java | 6 +- .../web/model/CurrencyExchangeRequest.java | 5 +- src/main/resources/application.yaml | 5 ++ .../java/eu/ztsh/wymiana/EntityCreator.java | 17 +++-- .../eu/ztsh/wymiana/RepositoryBasedTest.java | 1 + .../wymiana/service/CurrencyServiceTest.java | 71 ++++++++++--------- .../ztsh/wymiana/service/NbpServiceTest.java | 11 +-- .../ztsh/wymiana/service/UserServiceTest.java | 32 +++++---- .../eu/ztsh/wymiana/util/UserMapperTest.java | 10 +-- .../ValidExchangeRequestValidatorTest.java | 31 ++++---- .../web/ApplicationIntegrationTests.java | 41 ++++++++--- 22 files changed, 248 insertions(+), 129 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java create mode 100644 src/main/java/eu/ztsh/wymiana/model/Symbol.java create mode 100644 src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java diff --git a/src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java b/src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java new file mode 100644 index 0000000..9cfbce1 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java @@ -0,0 +1,9 @@ +package eu.ztsh.wymiana.config; + +import eu.ztsh.wymiana.model.Symbol; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("currency") +public record CurrencyProperties(Symbol initial) { + +} diff --git a/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java b/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java index f468a67..95615f0 100644 --- a/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java +++ b/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java @@ -1,6 +1,9 @@ package eu.ztsh.wymiana.data.entity; +import eu.ztsh.wymiana.model.Symbol; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.Id; import jakarta.persistence.Table; import lombok.AllArgsConstructor; @@ -19,7 +22,8 @@ public class CurrencyEntity { @Id String pesel; @Id - String symbol; + @Enumerated(EnumType.STRING) + Symbol symbol; BigDecimal amount; } diff --git a/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java b/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java index 8da9ad6..1472b0b 100644 --- a/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java +++ b/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java @@ -1,8 +1,10 @@ package eu.ztsh.wymiana.exception; +import eu.ztsh.wymiana.model.Symbol; + public class NoDataException extends RuntimeException { - public NoDataException(String code, String date) { + public NoDataException(Symbol code, String date) { super("No data for code %s and date %s".formatted(code, date)); } diff --git a/src/main/java/eu/ztsh/wymiana/model/Currency.java b/src/main/java/eu/ztsh/wymiana/model/Currency.java index e644aff..05e7ab1 100644 --- a/src/main/java/eu/ztsh/wymiana/model/Currency.java +++ b/src/main/java/eu/ztsh/wymiana/model/Currency.java @@ -2,6 +2,6 @@ package eu.ztsh.wymiana.model; import java.math.BigDecimal; -public record Currency(String symbol, BigDecimal amount) { +public record Currency(Symbol symbol, BigDecimal amount) { } diff --git a/src/main/java/eu/ztsh/wymiana/model/Symbol.java b/src/main/java/eu/ztsh/wymiana/model/Symbol.java new file mode 100644 index 0000000..4d38bbd --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/model/Symbol.java @@ -0,0 +1,6 @@ +package eu.ztsh.wymiana.model; + +public enum Symbol { + PLN, + USD +} diff --git a/src/main/java/eu/ztsh/wymiana/model/User.java b/src/main/java/eu/ztsh/wymiana/model/User.java index a1f28f1..7ae46a1 100644 --- a/src/main/java/eu/ztsh/wymiana/model/User.java +++ b/src/main/java/eu/ztsh/wymiana/model/User.java @@ -2,6 +2,6 @@ package eu.ztsh.wymiana.model; import java.util.Map; -public record User(String name, String surname, String pesel, Map currencies) { +public record User(String name, String surname, String pesel, Map currencies) { } diff --git a/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java b/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java new file mode 100644 index 0000000..f61e4c3 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java @@ -0,0 +1,65 @@ +package eu.ztsh.wymiana.model; + +import eu.ztsh.wymiana.web.model.UserCreateRequest; + +import java.math.BigDecimal; + +public class UserCreateRequestConfiguredWrapper { + + private final UserCreateRequest request; + private final Symbol initialSymbol; + + public String name() { + return request.name(); + } + + public String surname() { + return request.surname(); + } + + public String pesel() { + return request.pesel(); + } + + public BigDecimal initial() { + return request.initial(); + } + + public Symbol initialSymbol() { + return initialSymbol; + } + + private UserCreateRequestConfiguredWrapper(Builder builder) { + this.request = builder.request; + this.initialSymbol = builder.initial; + } + + public static Builder of(UserCreateRequest request) { + return new Builder().withRequest(request); + } + + public static final class Builder { + + private UserCreateRequest request; + private Symbol initial; + + private Builder() { + } + + private Builder withRequest(UserCreateRequest request) { + this.request = request; + return this; + } + + public Builder withInitial(Symbol initial) { + this.initial = initial; + return this; + } + + public UserCreateRequestConfiguredWrapper build() { + return new UserCreateRequestConfiguredWrapper(this); + } + + } + +} diff --git a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java index 9480825..e9736d7 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -4,6 +4,7 @@ import eu.ztsh.wymiana.exception.ExchangeFailedException; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.exception.UserNotFoundException; import eu.ztsh.wymiana.model.Currency; +import eu.ztsh.wymiana.model.Symbol; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; @@ -28,23 +29,17 @@ public class CurrencyService { public User exchange(CurrencyExchangeRequest request) { validator.validate(request); return userService.get(request.pesel()).map(user -> { - if (!request.from().equalsIgnoreCase("PLN") && !request.to().equalsIgnoreCase("PLN")) { + if (!request.from().equals(Symbol.PLN) && !request.to().equals(Symbol.PLN)) { throw new ExchangeFailedException("Either 'from' or 'to' has to be PLN"); } - // As we support only USD now, we need to limit second parameter too - // Begin: unlock other currencies - if (!request.from().equalsIgnoreCase("USD") && !request.to().equalsIgnoreCase("USD")) { - throw new ExchangeFailedException("Either 'from' or 'to' has to be USD"); - } - // End: unlock other currencies - var from = user.currencies().get(request.from().toUpperCase()); + var from = user.currencies().get(request.from()); if (from == null) { // There is no currency 'from' opened so no need to check if user has funds to exchange throw new InsufficientFundsException(); } var exchanged = performExchange(from, - Optional.ofNullable(user.currencies().get(request.to().toUpperCase())).orElse(create(request.to())), + Optional.ofNullable(user.currencies().get(request.to())).orElse(create(request.to())), Optional.ofNullable(request.toSell()).orElse(BigDecimal.ZERO), Optional.ofNullable(request.toBuy()).orElse(BigDecimal.ZERO)); user.currencies().putAll(exchanged); @@ -53,16 +48,15 @@ public class CurrencyService { .orElseThrow(() -> new UserNotFoundException(request)); } - private Currency create(String symbol) { - // TODO: check if supported - now limited to PLN <-> USD - return new Currency(symbol.toUpperCase(), BigDecimal.ZERO); + private Currency create(Symbol symbol) { + return new Currency(symbol, BigDecimal.ZERO); } - private Map performExchange(Currency from, Currency to, BigDecimal toSell, BigDecimal toBuy) { + private Map performExchange(Currency from, Currency to, BigDecimal toSell, BigDecimal toBuy) { BigDecimal exchangeRate; BigDecimal neededFromAmount; BigDecimal requestedToAmount; - if (from.symbol().equalsIgnoreCase("PLN")) { + if (from.symbol().equals(Symbol.PLN)) { exchangeRate = nbpService.getSellRate(to.symbol()); neededFromAmount = round(toBuy.signum() != 0 ? toBuy.multiply(exchangeRate) : toSell); requestedToAmount = round(toBuy.signum() != 0 ? toBuy : divide(toSell, exchangeRate)); diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index 3fca0d1..3d5edd3 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -2,6 +2,7 @@ package eu.ztsh.wymiana.service; import eu.ztsh.wymiana.exception.NoDataException; import eu.ztsh.wymiana.model.Rates; +import eu.ztsh.wymiana.model.Symbol; import lombok.RequiredArgsConstructor; import org.assertj.core.util.VisibleForTesting; import org.springframework.http.HttpStatusCode; @@ -29,17 +30,17 @@ public class NbpService { private static final String URI_PATTERN = "/api/exchangerates/rates/c/{code}/{date}/"; private final DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - private final ConcurrentMap cache = new ConcurrentHashMap<>(1); + private final ConcurrentMap cache = new ConcurrentHashMap<>(1); - public BigDecimal getSellRate(String currency) { - return getCurrency(currency.toUpperCase()).sell(); + public BigDecimal getSellRate(Symbol currency) { + return getCurrency(currency).sell(); } - public BigDecimal getBuyRate(String currency) { - return getCurrency(currency.toUpperCase()).buy(); + public BigDecimal getBuyRate(Symbol currency) { + return getCurrency(currency).buy(); } - private synchronized RatesCache getCurrency(String currency) { + private synchronized RatesCache getCurrency(Symbol currency) { var today = getFetchDate(); var cacheObject = cache.get(currency); if (cacheObject == null || cacheObject.date().isBefore(today)) { @@ -50,7 +51,7 @@ public class NbpService { rate.getBid(), rate.getAsk() ); - cache.put(fresh.getCode(), cacheObject); + cache.put(Symbol.valueOf(fresh.getCode().toUpperCase()), cacheObject); } return cacheObject; } @@ -69,8 +70,8 @@ public class NbpService { } @VisibleForTesting - Rates fetchData(String code, String date) { - return restClient.get().uri(URI_PATTERN, code.toLowerCase(), date) + Rates fetchData(Symbol code, String date) { + return restClient.get().uri(URI_PATTERN, code.name().toLowerCase(), date) .retrieve() .onStatus(HttpStatusCode::is4xxClientError, ((request, response) -> { throw new NoDataException(code, date); diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index 857bc0f..75a1781 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -1,8 +1,10 @@ package eu.ztsh.wymiana.service; +import eu.ztsh.wymiana.config.CurrencyProperties; import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.model.User; +import eu.ztsh.wymiana.model.UserCreateRequestConfiguredWrapper; import eu.ztsh.wymiana.util.UserMapper; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.web.model.UserCreateRequest; @@ -20,13 +22,16 @@ public class UserService { private final UserRepository userRepository; private final InstanceValidator validator; + private final CurrencyProperties currencyProperties; public User create(UserCreateRequest request) { validator.validate(request); if (userRepository.findById(request.pesel()).isPresent()) { throw new UserAlreadyExistsException(request); } - return UserMapper.entityToPojo(userRepository.save(UserMapper.requestToEntity(request))); + return UserMapper.entityToPojo(userRepository.save(UserMapper.requestToEntity( + UserCreateRequestConfiguredWrapper.of(request).withInitial(currencyProperties.initial()).build() + ))); } public Optional get(@PESEL String pesel) { diff --git a/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java b/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java index b962ddc..697e956 100644 --- a/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java @@ -2,6 +2,7 @@ package eu.ztsh.wymiana.util; import eu.ztsh.wymiana.data.entity.CurrencyEntity; import eu.ztsh.wymiana.model.Currency; +import eu.ztsh.wymiana.model.Symbol; import java.util.List; import java.util.Map; @@ -17,12 +18,12 @@ public class CurrencyMapper { return new CurrencyEntity(pesel, pojo.symbol(), pojo.amount()); } - public static Map entitiesToPojoMap(List values) { + public static Map entitiesToPojoMap(List values) { return values.stream().map(CurrencyMapper::entityToPojo) .collect(Collectors.toMap(Currency::symbol, pojo -> pojo)); } - public static List pojoMapToEntities(Map currencies, String pesel) { + public static List pojoMapToEntities(Map currencies, String pesel) { return currencies.values().stream().map(entry -> pojoToEntity(entry, pesel)).toList(); } diff --git a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java index 15a9e5a..09ad887 100644 --- a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java @@ -3,7 +3,7 @@ package eu.ztsh.wymiana.util; import eu.ztsh.wymiana.data.entity.CurrencyEntity; import eu.ztsh.wymiana.data.entity.UserEntity; import eu.ztsh.wymiana.model.User; -import eu.ztsh.wymiana.web.model.UserCreateRequest; +import eu.ztsh.wymiana.model.UserCreateRequestConfiguredWrapper; import java.util.List; @@ -19,9 +19,9 @@ public class UserMapper { CurrencyMapper.pojoMapToEntities(pojo.currencies(), pojo.pesel())); } - public static UserEntity requestToEntity(UserCreateRequest request) { + public static UserEntity requestToEntity(UserCreateRequestConfiguredWrapper request) { return new UserEntity(request.pesel(), request.name(), request.surname(), - List.of(new CurrencyEntity(request.pesel(), "PLN", request.initial()))); + List.of(new CurrencyEntity(request.pesel(), request.initialSymbol(), request.initial()))); } private UserMapper() { diff --git a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java index c804720..f420134 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java @@ -1,5 +1,6 @@ package eu.ztsh.wymiana.web.model; +import eu.ztsh.wymiana.model.Symbol; import eu.ztsh.wymiana.validation.ValidExchangeRequest; import jakarta.validation.constraints.NotNull; import lombok.Builder; @@ -11,8 +12,8 @@ import java.math.BigDecimal; @ValidExchangeRequest public record CurrencyExchangeRequest( @PESEL String pesel, - @NotNull String from, - @NotNull String to, + @NotNull Symbol from, + @NotNull Symbol to, BigDecimal toBuy, BigDecimal toSell ) { diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 47b720c..84ae7b8 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,6 +4,8 @@ hsqldb: nbp: baseurl: "http://api.nbp.pl" +currency: + initial: PLN spring: datasource: @@ -14,6 +16,9 @@ spring: jpa: hibernate: ddl-auto: create + jackson: + mapper: + ACCEPT_CASE_INSENSITIVE_ENUMS: true management: endpoints: diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java index 6535f11..0f3b662 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -5,6 +5,7 @@ import eu.ztsh.wymiana.data.entity.UserEntity; import eu.ztsh.wymiana.model.Currency; import eu.ztsh.wymiana.model.Rate; import eu.ztsh.wymiana.model.Rates; +import eu.ztsh.wymiana.model.Symbol; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import eu.ztsh.wymiana.web.model.UserCreateRequest; @@ -29,8 +30,6 @@ public class EntityCreator { public static BigDecimal PLN = createScaled(20.10, 2); public static BigDecimal USD_SELL = createScaled(5.18, 2); public static BigDecimal USD_BUY = createScaled(5.08, 2); - public static String PLN_SYMBOL = "PLN"; - public static String USD_SYMBOL = "USD"; public static BigDecimal BUY_RATE = createScaled(3.8804, 4); public static BigDecimal SELL_RATE = createScaled(3.9572, 4); @@ -45,12 +44,12 @@ public class EntityCreator { } public static User user(BigDecimal pln, BigDecimal usd) { - Map currencies = new HashMap<>(); + Map currencies = new HashMap<>(); if (pln.signum() > 0) { - currencies.put("PLN", new Currency("PLN", pln)); + currencies.put(Symbol.PLN, new Currency(Symbol.PLN, pln)); } if (usd.signum() > 0) { - currencies.put("USD", new Currency("USD", usd)); + currencies.put(Symbol.USD, new Currency(Symbol.USD, usd)); } return new User(Constants.NAME, Constants.SURNAME, Constants.PESEL, currencies); } @@ -74,7 +73,7 @@ public class EntityCreator { var rates = new Rates(); rates.setTable("C"); rates.setCurrency("dolar amerykański"); - rates.setCode("USD"); + rates.setCode(Symbol.USD.toString()); var rate = new Rate(); rate.setNo("096/C/NBP/2024"); rate.setEffectiveDate(date); @@ -129,13 +128,13 @@ public class EntityCreator { var nonnulPesel = Optional.ofNullable(pesel).orElse(Constants.PESEL); List currencies = new ArrayList<>(); if (pln.signum() > -1) { - currencies.add(new CurrencyEntity(nonnulPesel, "PLN", pln)); + currencies.add(new CurrencyEntity(nonnulPesel, Symbol.PLN, pln)); } if (usd.signum() > -1) { - currencies.add(new CurrencyEntity(nonnulPesel, "USD", usd)); + currencies.add(new CurrencyEntity(nonnulPesel, Symbol.USD, usd)); } if (currencies.isEmpty()) { - currencies.add(new CurrencyEntity(nonnulPesel, "PLN", Constants.PLN)); + currencies.add(new CurrencyEntity(nonnulPesel, Symbol.PLN, Constants.PLN)); } return new UserEntity( nonnulPesel, diff --git a/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java b/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java index cd0ffcf..5e0bc54 100644 --- a/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java +++ b/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java @@ -29,6 +29,7 @@ public abstract class RepositoryBasedTest { .isNotEmpty() .get() .usingRecursiveComparison() + .ignoringCollectionOrder() .isEqualTo(entity); } diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java index 474f11f..14f7ea3 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -2,10 +2,11 @@ package eu.ztsh.wymiana.service; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.RepositoryBasedTest; +import eu.ztsh.wymiana.config.CurrencyProperties; import eu.ztsh.wymiana.data.repository.UserRepository; -import eu.ztsh.wymiana.exception.ExchangeFailedException; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.exception.UserNotFoundException; +import eu.ztsh.wymiana.model.Symbol; import eu.ztsh.wymiana.validation.InstanceValidator; import eu.ztsh.wymiana.validation.ValidationFailedException; import jakarta.transaction.Transactional; @@ -29,12 +30,14 @@ class CurrencyServiceTest extends RepositoryBasedTest { private final CurrencyService currencyService; @Autowired - public CurrencyServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { + public CurrencyServiceTest(UserRepository userRepository, InstanceValidator instanceValidator, + CurrencyProperties currencyProperties) { super(userRepository); var nbp = Mockito.mock(NbpService.class); - Mockito.when(nbp.getSellRate("USD")).thenReturn(SELL_RATE); - Mockito.when(nbp.getBuyRate("USD")).thenReturn(BUY_RATE); - currencyService = new CurrencyService(new UserService(userRepository, instanceValidator), nbp, instanceValidator); + Mockito.when(nbp.getSellRate(Symbol.USD)).thenReturn(SELL_RATE); + Mockito.when(nbp.getBuyRate(Symbol.USD)).thenReturn(BUY_RATE); + currencyService = new CurrencyService(new UserService(userRepository, instanceValidator, currencyProperties), + nbp, instanceValidator); } @Transactional @@ -43,12 +46,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() - .from(PLN_SYMBOL) - .to(USD_SYMBOL) + .from(Symbol.PLN) + .to(Symbol.USD) .toSell(PLN) .build()); assertThat(result.currencies()) - .matches(map -> map.get(PLN_SYMBOL).amount().signum() == 0 && Objects.equals(map.get(USD_SYMBOL).amount(), USD_BUY), "USD 5.08"); + .matches(map -> map.get(Symbol.PLN).amount().signum() == 0 && Objects.equals(map.get(Symbol.USD).amount(), USD_BUY), "USD 5.08"); var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @@ -59,12 +62,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() - .from(PLN_SYMBOL) - .to(USD_SYMBOL) + .from(Symbol.PLN) + .to(Symbol.USD) .toBuy(USD_BUY) .build()); assertThat(result.currencies()) - .matches(map -> map.get(PLN_SYMBOL).amount().signum() == 0 && Objects.equals(map.get(USD_SYMBOL).amount(), USD_BUY)); + .matches(map -> map.get(Symbol.PLN).amount().signum() == 0 && Objects.equals(map.get(Symbol.USD).amount(), USD_BUY)); var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @@ -75,12 +78,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().pln(-1).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() - .from(USD_SYMBOL) - .to(PLN_SYMBOL) + .from(Symbol.USD) + .to(Symbol.PLN) .toSell(USD_SELL) .build()); assertThat(result.currencies()) - .matches(map -> Objects.equals(map.get(PLN_SYMBOL).amount(), PLN) && map.get(USD_SYMBOL).amount().signum() == 0, "PLN 20.10"); + .matches(map -> Objects.equals(map.get(Symbol.PLN).amount(), PLN) && map.get(Symbol.USD).amount().signum() == 0, "PLN 20.10"); var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @@ -91,12 +94,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().pln(-1).usd(USD_SELL).build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() - .from(USD_SYMBOL) - .to(PLN_SYMBOL) + .from(Symbol.USD) + .to(Symbol.PLN) .toBuy(PLN) .build()); assertThat(result.currencies()) - .matches(map -> Objects.equals(map.get(PLN_SYMBOL).amount(), PLN) && map.get(USD_SYMBOL).amount().signum() == 0, "PLN 20.10"); + .matches(map -> Objects.equals(map.get(Symbol.PLN).amount(), PLN) && map.get(Symbol.USD).amount().signum() == 0, "PLN 20.10"); var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @@ -107,8 +110,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var request = EntityCreator.exchangeRequest() - .from(USD_SYMBOL) - .to(PLN_SYMBOL) + .from(Symbol.USD) + .to(Symbol.PLN) .toBuy(PLN) .build(); assertThatThrownBy(() -> currencyService.exchange(request)) @@ -121,14 +124,14 @@ class CurrencyServiceTest extends RepositoryBasedTest { var initialValue = BigDecimal.valueOf(100); var entity = EntityCreator.userEntity().pln(initialValue).build(); userRepository.save(entity); - var result1 = currencyService.exchange(EntityCreator.exchangeRequest() - .from(PLN_SYMBOL) - .to(USD_SYMBOL) + currencyService.exchange(EntityCreator.exchangeRequest() + .from(Symbol.PLN) + .to(Symbol.USD) .toBuy(USD_BUY) .build()); - var result2 = currencyService.exchange(EntityCreator.exchangeRequest() - .from(USD_SYMBOL) - .to(PLN_SYMBOL) + currencyService.exchange(EntityCreator.exchangeRequest() + .from(Symbol.USD) + .to(Symbol.PLN) .toSell(USD_BUY) .build()); var resultOptional = userRepository.findById(entity.getPesel()); @@ -137,7 +140,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { var resultEntity = resultOptional.get(); assertThat(resultEntity.getCurrencies() .stream() - .filter(c -> c.getSymbol().equalsIgnoreCase("PLN")) + .filter(c -> c.getSymbol().equals(Symbol.PLN)) .findFirst()).isNotEmpty().get().matches(currencyEntity -> currencyEntity.getAmount().compareTo(initialValue) < 0); } @@ -147,8 +150,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var request = EntityCreator.exchangeRequest() - .from(PLN_SYMBOL) - .to(USD_SYMBOL) + .from(Symbol.PLN) + .to(Symbol.USD) .toBuy(PLN) .build(); assertThatThrownBy(() -> currencyService.exchange(request)) @@ -161,8 +164,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { void invalidPeselTest(String pesel) { var entity = EntityCreator.exchangeRequest() .pesel(pesel) - .from(PLN_SYMBOL) - .to(USD_SYMBOL) + .from(Symbol.PLN) + .to(Symbol.USD) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) @@ -173,8 +176,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Test void notExistingUserTest() { var entity = EntityCreator.exchangeRequest() - .from(PLN_SYMBOL) - .to(USD_SYMBOL) + .from(Symbol.PLN) + .to(Symbol.USD) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) @@ -185,7 +188,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @DisplayName("Empty 'from' value") void emptyFromTest() { var entity = EntityCreator.exchangeRequest() - .to(USD_SYMBOL) + .to(Symbol.USD) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) @@ -197,7 +200,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @DisplayName("Empty 'to' value") void emptyToTest() { var entity = EntityCreator.exchangeRequest() - .from(PLN_SYMBOL) + .from(Symbol.PLN) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) diff --git a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java index 7424fbe..0ec2838 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.WireMockExtension; import eu.ztsh.wymiana.exception.NoDataException; +import eu.ztsh.wymiana.model.Symbol; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -79,7 +80,7 @@ class NbpServiceTest { var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); try { - assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); + assertThat(nbpService.getSellRate(Symbol.USD)).isEqualTo(EntityCreator.Constants.SELL_RATE); } finally { WireMockExtension.verifyGet(1, url); } @@ -92,9 +93,9 @@ class NbpServiceTest { var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); WireMockExtension.response(url, 200, new ObjectMapper().writeValueAsString(EntityCreator.rates(date))); // save to cache - assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); + assertThat(nbpService.getSellRate(Symbol.USD)).isEqualTo(EntityCreator.Constants.SELL_RATE); // get from cache - assertThat(nbpService.getBuyRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.BUY_RATE); + assertThat(nbpService.getBuyRate(Symbol.USD)).isEqualTo(EntityCreator.Constants.BUY_RATE); WireMockExtension.verifyGet(1, url); } @@ -102,9 +103,9 @@ class NbpServiceTest { @Test void getInvalidCurrencyTest() { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); - var url = "/api/exchangerates/rates/c/usb/%s/".formatted(date); + var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); WireMockExtension.response(url, 404, "404 NotFound - Not Found - Brak danych"); - assertThatThrownBy(() -> nbpService.getSellRate("usb")).isInstanceOf(NoDataException.class); + assertThatThrownBy(() -> nbpService.getSellRate(Symbol.USD)).isInstanceOf(NoDataException.class); WireMockExtension.verifyGet(1, url); } diff --git a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java index fef02b9..33ea330 100644 --- a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java @@ -2,6 +2,7 @@ package eu.ztsh.wymiana.service; import eu.ztsh.wymiana.EntityCreator; import eu.ztsh.wymiana.RepositoryBasedTest; +import eu.ztsh.wymiana.config.CurrencyProperties; import eu.ztsh.wymiana.data.repository.UserRepository; import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.util.UserMapper; @@ -21,9 +22,10 @@ class UserServiceTest extends RepositoryBasedTest { private final UserService userService; @Autowired - public UserServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { + public UserServiceTest(UserRepository userRepository, InstanceValidator instanceValidator, + CurrencyProperties currencyProperties) { super(userRepository); - userService = new UserService(userRepository, instanceValidator); + userService = new UserService(userRepository, instanceValidator, currencyProperties); } @Test @@ -42,8 +44,8 @@ class UserServiceTest extends RepositoryBasedTest { var second = EntityCreator.userRequest().build(); userService.create(first); assertThatThrownBy(() -> userService.create(second)) - .isInstanceOf(UserAlreadyExistsException.class) - .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); + .isInstanceOf(UserAlreadyExistsException.class) + .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); } @Test @@ -51,13 +53,13 @@ class UserServiceTest extends RepositoryBasedTest { void createDuplicatedPeselTest() { var first = EntityCreator.userRequest().build(); var second = EntityCreator.userRequest(30.30) - .name("Jan") - .surname("Kowalski") - .build(); + .name("Jan") + .surname("Kowalski") + .build(); userService.create(first); assertThatThrownBy(() -> userService.create(second)) - .isInstanceOf(UserAlreadyExistsException.class) - .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); + .isInstanceOf(UserAlreadyExistsException.class) + .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); } @Test @@ -65,8 +67,8 @@ class UserServiceTest extends RepositoryBasedTest { void youngUserTest() { var request = EntityCreator.userRequest().pesel("").build(); assertThatThrownBy(() -> userService.create(request)) - .isInstanceOf(ValidationFailedException.class) - .hasMessageContaining(Adult.MESSAGE); + .isInstanceOf(ValidationFailedException.class) + .hasMessageContaining(Adult.MESSAGE); } @Test @@ -78,10 +80,10 @@ class UserServiceTest extends RepositoryBasedTest { var userOptional = userService.get(EntityCreator.Constants.PESEL); var expected = UserMapper.entityToPojo(entity); assertThat(userOptional) - .isNotEmpty() - .get() - .usingRecursiveComparison() - .isEqualTo(expected); + .isNotEmpty() + .get() + .usingRecursiveComparison() + .isEqualTo(expected); } @Test diff --git a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java index 11503aa..01338eb 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -1,12 +1,10 @@ package eu.ztsh.wymiana.util; import eu.ztsh.wymiana.EntityCreator; -import eu.ztsh.wymiana.model.Currency; -import eu.ztsh.wymiana.model.User; +import eu.ztsh.wymiana.model.Symbol; +import eu.ztsh.wymiana.model.UserCreateRequestConfiguredWrapper; import org.junit.jupiter.api.Test; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; class UserMapperTest { @@ -31,7 +29,9 @@ class UserMapperTest { @Test void requestToEntityTest() { - var request = EntityCreator.userRequest().build(); + var request = UserCreateRequestConfiguredWrapper.of(EntityCreator.userRequest().build()) + .withInitial(Symbol.PLN) + .build() ; var expected = EntityCreator.userEntity().build(); assertThat(UserMapper.requestToEntity(request)) .usingRecursiveComparison() diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java index e8ef550..4edd903 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -1,16 +1,15 @@ package eu.ztsh.wymiana.validation; import eu.ztsh.wymiana.EntityCreator; +import eu.ztsh.wymiana.model.Symbol; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import java.math.BigDecimal; -import static eu.ztsh.wymiana.EntityCreator.Constants.PLN_SYMBOL; import static eu.ztsh.wymiana.EntityCreator.Constants.USD_BUY; import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SELL; -import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SYMBOL; class ValidExchangeRequestValidatorTest extends ValidatorTest { @@ -22,8 +21,8 @@ class ValidExchangeRequestValidatorTest extends ValidatorTest Date: Tue, 25 Jun 2024 00:52:06 +0200 Subject: [PATCH 38/44] fix: Request wrapper builder function name --- .../ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java | 2 +- src/main/java/eu/ztsh/wymiana/service/UserService.java | 2 +- src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java b/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java index f61e4c3..b4a3619 100644 --- a/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java +++ b/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java @@ -34,7 +34,7 @@ public class UserCreateRequestConfiguredWrapper { this.initialSymbol = builder.initial; } - public static Builder of(UserCreateRequest request) { + public static Builder wrap(UserCreateRequest request) { return new Builder().withRequest(request); } diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index 75a1781..2205d19 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -30,7 +30,7 @@ public class UserService { throw new UserAlreadyExistsException(request); } return UserMapper.entityToPojo(userRepository.save(UserMapper.requestToEntity( - UserCreateRequestConfiguredWrapper.of(request).withInitial(currencyProperties.initial()).build() + UserCreateRequestConfiguredWrapper.wrap(request).withInitial(currencyProperties.initial()).build() ))); } diff --git a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java index 01338eb..121c03d 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -29,7 +29,7 @@ class UserMapperTest { @Test void requestToEntityTest() { - var request = UserCreateRequestConfiguredWrapper.of(EntityCreator.userRequest().build()) + var request = UserCreateRequestConfiguredWrapper.wrap(EntityCreator.userRequest().build()) .withInitial(Symbol.PLN) .build() ; var expected = EntityCreator.userEntity().build(); From 5549c8618547098dd76866b19f0414e81e182e9a Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Tue, 25 Jun 2024 23:21:33 +0200 Subject: [PATCH 39/44] docs: Readme update --- readme.md | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 75a4586..e4c4278 100644 --- a/readme.md +++ b/readme.md @@ -28,9 +28,9 @@ Prosty mikroserwis stworzony na potrzeby rekrutacji "pesel": { "type": "string" }, - "pln": { + "initial": { "type": "number", - "description": "początkowy stan konta w złotówkach" + "description": "początkowy stan konta w domyślnej walucie" } }, "required": [ @@ -169,6 +169,35 @@ Prosty mikroserwis stworzony na potrzeby rekrutacji actor <--> exchange endpoint <--> core core <--> tabC - core <-- hsql.port --> hsqldb + core <-- hsql . port --> hsqldb ``` + +## Konfiguracja + +Aplikacja posiada dostosowaną konfigurację, która obejmuje własności: + +### `hsqldb` + +Konfiguracja bazy danych + +| Nazwa | Opis | Typ | Wartość domyślna | +|-------|------------------|--------|------------------| +| name | host bazy danych | string | db | +| port | port bazy danych | int | 9090 | + +### `nbp` + +Konfiguracja połączenia z Narodowym Bankiem Polskim + +| Nazwa | Opis | Typ | Wartość domyślna | +|---------|--------------|--------|-------------------| +| baseurl | host API nbp | string | http://api.nbp.pl | + +### `currency` + +Konfiguracja walut + +| Nazwa | Opis | Typ | Wartość domyślna | +|---------|-----------------------------------------|--------|------------------| +| initial | waluta początkowa przy zakładaniu konta | string | PLN | From a37f1c28341823f6029b8a49498fe19ec0b674a4 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 27 Jun 2024 01:06:33 +0200 Subject: [PATCH 40/44] feat: OpenAPI --- .../web/controller/ExchangeController.java | 22 +++++++++++++++++++ .../web/controller/UserController.java | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java index fb0ee13..6025a9d 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java @@ -2,11 +2,18 @@ package eu.ztsh.wymiana.web.controller; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.exception.UserNotFoundException; +import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.service.CurrencyService; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -22,6 +29,21 @@ public class ExchangeController { private final CurrencyService currencyService; + @Operation(summary = "Perform exchange") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", + description = "Exchange performed successfully", + content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = User.class))), + @ApiResponse(responseCode = "400", + description = "Insufficient funds", + content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)), + @ApiResponse(responseCode = "404", + description = "User not found", + content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)), + @ApiResponse(responseCode = "500", + description = "Another error has occurred", + content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)) + }) @PostMapping public ResponseEntity exchange(@Valid @RequestBody CurrencyExchangeRequest request) { try { diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java index bca74ce..1004803 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -6,10 +6,16 @@ import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.service.UserService; import eu.ztsh.wymiana.validation.ValidationFailedException; import eu.ztsh.wymiana.web.model.UserCreateRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import jakarta.validation.ValidationException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -23,10 +29,18 @@ import org.springframework.web.bind.annotation.RestController; @Validated @RestController @RequestMapping(path = "/api/user", produces = "application/json") +@Tag(name="User management", description = "Create or get user") public class UserController { private final UserService userService; + @Operation(summary = "Get user by PESEL") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "User found"), + @ApiResponse(responseCode = "400", description = "Request not valid", content = @Content), + @ApiResponse(responseCode = "404", description = "User not found", content = @Content), + @ApiResponse(responseCode = "500", description = "Another error has occurred", content = @Content) + }) @GetMapping("{pesel}") public ResponseEntity get(@PathVariable("pesel") String pesel) { try { @@ -42,6 +56,13 @@ public class UserController { } } + @Operation(summary = "Create user") + @ApiResponses(value = { + @ApiResponse(responseCode = "204", description = "User created", content = @Content), + @ApiResponse(responseCode = "400", description = "Request not valid", content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)), + @ApiResponse(responseCode = "409", description = "User already exists", content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)), + @ApiResponse(responseCode = "500", description = "Another error has occurred", content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)) + }) @PostMapping public ResponseEntity create(@Valid @RequestBody UserCreateRequest request) { try { From 177f67369613d9dcafc5ed18ac612838e28048e4 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 27 Jun 2024 01:19:30 +0200 Subject: [PATCH 41/44] fix: List in User response instead of Map --- src/main/java/eu/ztsh/wymiana/util/UserMapper.java | 5 +++++ .../ztsh/wymiana/web/controller/ExchangeController.java | 5 +++-- .../eu/ztsh/wymiana/web/controller/UserController.java | 6 ++++-- .../java/eu/ztsh/wymiana/web/model/UserResponse.java | 9 +++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java diff --git a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java index 15a9e5a..44f2524 100644 --- a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java @@ -4,6 +4,7 @@ import eu.ztsh.wymiana.data.entity.CurrencyEntity; import eu.ztsh.wymiana.data.entity.UserEntity; import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.web.model.UserCreateRequest; +import eu.ztsh.wymiana.web.model.UserResponse; import java.util.List; @@ -19,6 +20,10 @@ public class UserMapper { CurrencyMapper.pojoMapToEntities(pojo.currencies(), pojo.pesel())); } + public static UserResponse pojoToResponse(User pojo) { + return new UserResponse(pojo.name(), pojo.surname(), pojo.pesel(), pojo.currencies().values().stream().toList()); + } + public static UserEntity requestToEntity(UserCreateRequest request) { return new UserEntity(request.pesel(), request.name(), request.surname(), List.of(new CurrencyEntity(request.pesel(), "PLN", request.initial()))); diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java index 6025a9d..39c635d 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java @@ -2,9 +2,9 @@ package eu.ztsh.wymiana.web.controller; import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.exception.UserNotFoundException; -import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.service.CurrencyService; import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest; +import eu.ztsh.wymiana.web.model.UserResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -33,7 +33,8 @@ public class ExchangeController { @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Exchange performed successfully", - content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = User.class))), + content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, + schema = @Schema(implementation = UserResponse.class))), @ApiResponse(responseCode = "400", description = "Insufficient funds", content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE)), diff --git a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java index 1004803..dfa40b6 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -2,10 +2,11 @@ package eu.ztsh.wymiana.web.controller; import eu.ztsh.wymiana.exception.UserAlreadyExistsException; import eu.ztsh.wymiana.exception.UserNotFoundException; -import eu.ztsh.wymiana.model.User; import eu.ztsh.wymiana.service.UserService; +import eu.ztsh.wymiana.util.UserMapper; import eu.ztsh.wymiana.validation.ValidationFailedException; import eu.ztsh.wymiana.web.model.UserCreateRequest; +import eu.ztsh.wymiana.web.model.UserResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -42,9 +43,10 @@ public class UserController { @ApiResponse(responseCode = "500", description = "Another error has occurred", content = @Content) }) @GetMapping("{pesel}") - public ResponseEntity get(@PathVariable("pesel") String pesel) { + public ResponseEntity get(@PathVariable("pesel") String pesel) { try { return userService.get(pesel) + .map(UserMapper::pojoToResponse) .map(ResponseEntity::ok) .orElseThrow(() -> new UserNotFoundException(pesel)); } catch (Exception e) { diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java b/src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java new file mode 100644 index 0000000..2e73267 --- /dev/null +++ b/src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java @@ -0,0 +1,9 @@ +package eu.ztsh.wymiana.web.model; + +import eu.ztsh.wymiana.model.Currency; + +import java.util.List; + +public record UserResponse(String name, String surname, String pesel, List currencies) { + +} From 5950dec099137143197a4a2e128117923c783489 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 27 Jun 2024 01:19:45 +0200 Subject: [PATCH 42/44] docs: Readme update --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 75a4586..3e0fd54 100644 --- a/readme.md +++ b/readme.md @@ -79,7 +79,6 @@ Prosty mikroserwis stworzony na potrzeby rekrutacji "type": "string" }, "currencies": { - "$comment": "TODO: Map -> List", "type": "array", "items": { "$ref": "#/def/currency" From e501c59f869b12af0438f727ed2f0763abf7b3b5 Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 27 Jun 2024 01:29:36 +0200 Subject: [PATCH 43/44] test: Application tests response fix --- .../java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java index 01bb2df..9a14ef5 100644 --- a/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java +++ b/src/test/java/eu/ztsh/wymiana/web/ApplicationIntegrationTests.java @@ -116,7 +116,7 @@ class ApplicationIntegrationTests { .uri(endpoint.concat("/").concat(PESEL)) .exchange() .expectStatus().isOk() - .expectBody().json(asJson(UserMapper.entityToPojo(EntityCreator.userEntity().pln(100).build()))); + .expectBody().json(asJson(UserMapper.pojoToResponse(UserMapper.entityToPojo(EntityCreator.userEntity().pln(100).build())))); } @Test From d423aa58384b7676f1f213155f52d423fdca9c4f Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 27 Jun 2024 01:37:05 +0200 Subject: [PATCH 44/44] feat: Release 1.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7431833..78cfbdb 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ eu.ztsh wymiana-walut - 1.0.0 + 1.1.0