From 5555e57f34e8cb1d7e08596ef9b3a8ca10ef8bda Mon Sep 17 00:00:00 2001 From: Piotr Dec Date: Thu, 23 May 2024 00:06:32 +0200 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 04/16] 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 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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")