diff --git a/pom.xml b/pom.xml index 78cfbdb..69862f2 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ eu.ztsh wymiana-walut - 1.1.0 + 1.0.0 @@ -28,7 +28,6 @@ 3.5.4 - 2.5.0 1.2.1 @@ -63,11 +62,6 @@ lombok provided - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${openapi.version} - @@ -116,7 +110,6 @@ ${basedir}/src/main/resources/schema eu.ztsh.wymiana.model - true diff --git a/readme.md b/readme.md deleted file mode 100644 index f2ce86f..0000000 --- a/readme.md +++ /dev/null @@ -1,202 +0,0 @@ -# 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" - }, - "initial": { - "type": "number", - "description": "początkowy stan konta w domyślnej walucie" - } - }, - "required": [ - "name", - "surname", - "pesel", - "initial" - ] - } - ``` - ⇐ 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": { - "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 - -``` - -## 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 | diff --git a/src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java b/src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java deleted file mode 100644 index 9cfbce1..0000000 --- a/src/main/java/eu/ztsh/wymiana/config/CurrencyProperties.java +++ /dev/null @@ -1,9 +0,0 @@ -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 95615f0..441b224 100644 --- a/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java +++ b/src/main/java/eu/ztsh/wymiana/data/entity/CurrencyEntity.java @@ -1,17 +1,12 @@ 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; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; - @Data @NoArgsConstructor @AllArgsConstructor @@ -22,8 +17,7 @@ public class CurrencyEntity { @Id String pesel; @Id - @Enumerated(EnumType.STRING) - Symbol symbol; - BigDecimal amount; + String symbol; + Double amount; } diff --git a/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java b/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java index 1472b0b..8da9ad6 100644 --- a/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java +++ b/src/main/java/eu/ztsh/wymiana/exception/NoDataException.java @@ -1,10 +1,8 @@ package eu.ztsh.wymiana.exception; -import eu.ztsh.wymiana.model.Symbol; - public class NoDataException extends RuntimeException { - public NoDataException(Symbol code, String date) { + public NoDataException(String 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 05e7ab1..0cc6b16 100644 --- a/src/main/java/eu/ztsh/wymiana/model/Currency.java +++ b/src/main/java/eu/ztsh/wymiana/model/Currency.java @@ -1,7 +1,5 @@ package eu.ztsh.wymiana.model; -import java.math.BigDecimal; - -public record Currency(Symbol symbol, BigDecimal amount) { +public record Currency(String symbol, double amount) { } diff --git a/src/main/java/eu/ztsh/wymiana/model/Symbol.java b/src/main/java/eu/ztsh/wymiana/model/Symbol.java deleted file mode 100644 index 4d38bbd..0000000 --- a/src/main/java/eu/ztsh/wymiana/model/Symbol.java +++ /dev/null @@ -1,6 +0,0 @@ -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 7ae46a1..a1f28f1 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 deleted file mode 100644 index b4a3619..0000000 --- a/src/main/java/eu/ztsh/wymiana/model/UserCreateRequestConfiguredWrapper.java +++ /dev/null @@ -1,65 +0,0 @@ -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 wrap(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 e9736d7..401626a 100644 --- a/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java +++ b/src/main/java/eu/ztsh/wymiana/service/CurrencyService.java @@ -4,7 +4,6 @@ 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; @@ -29,56 +28,59 @@ public class CurrencyService { public User exchange(CurrencyExchangeRequest request) { validator.validate(request); return userService.get(request.pesel()).map(user -> { - if (!request.from().equals(Symbol.PLN) && !request.to().equals(Symbol.PLN)) { + 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 from = user.currencies().get(request.from()); + 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())).orElse(create(request.to())), - Optional.ofNullable(request.toSell()).orElse(BigDecimal.ZERO), - Optional.ofNullable(request.toBuy()).orElse(BigDecimal.ZERO)); + 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); return userService.update(user); }) .orElseThrow(() -> new UserNotFoundException(request)); } - private Currency create(Symbol symbol) { - return new Currency(symbol, BigDecimal.ZERO); + private Currency create(String symbol) { + // TODO: check if supported - now limited to PLN <-> USD + return new Currency(symbol.toUpperCase(), 0D); } - private Map performExchange(Currency from, Currency to, BigDecimal toSell, BigDecimal toBuy) { - BigDecimal exchangeRate; - BigDecimal neededFromAmount; - BigDecimal requestedToAmount; - if (from.symbol().equals(Symbol.PLN)) { + 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 = round(toBuy.signum() != 0 ? toBuy.multiply(exchangeRate) : toSell); - requestedToAmount = round(toBuy.signum() != 0 ? toBuy : divide(toSell, exchangeRate)); + neededFromAmount = round(toBuy != 0 ? toBuy * exchangeRate : toSell); + requestedToAmount = round(toBuy != 0 ? toBuy : toSell / exchangeRate); } else { exchangeRate = nbpService.getBuyRate(from.symbol()); - neededFromAmount = round(toBuy.signum() != 0 ? divide(toBuy, exchangeRate) : toSell); - requestedToAmount = round(toBuy.signum() != 0 ? toBuy : toSell.multiply(exchangeRate)); + neededFromAmount = round(toBuy != 0 ? toBuy / exchangeRate : toSell); + requestedToAmount = round(toBuy != 0 ? toBuy : toSell * exchangeRate); } - if (neededFromAmount.compareTo(from.amount()) > 0) { + if (neededFromAmount > from.amount()) { throw new InsufficientFundsException(); } - var newFrom = new Currency(from.symbol(), from.amount().subtract(neededFromAmount)); - var newTo = new Currency(to.symbol(), to.amount().add(requestedToAmount)); + 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)); } - 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); + private double round(double input) { + return BigDecimal.valueOf(input).setScale(2, RoundingMode.HALF_UP).doubleValue(); } } diff --git a/src/main/java/eu/ztsh/wymiana/service/NbpService.java b/src/main/java/eu/ztsh/wymiana/service/NbpService.java index 3d5edd3..e612e0a 100644 --- a/src/main/java/eu/ztsh/wymiana/service/NbpService.java +++ b/src/main/java/eu/ztsh/wymiana/service/NbpService.java @@ -2,14 +2,12 @@ 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; 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,28 +28,28 @@ 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(Symbol currency) { - return getCurrency(currency).sell(); + public double getSellRate(String currency) { + return getCurrency(currency.toUpperCase()).sell(); } - public BigDecimal getBuyRate(Symbol currency) { - return getCurrency(currency).buy(); + public double getBuyRate(String currency) { + return getCurrency(currency.toUpperCase()).buy(); } - private synchronized RatesCache getCurrency(Symbol currency) { + 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().getFirst(); + var rate = fresh.getRates().get(0); cacheObject = new RatesCache( LocalDate.parse(rate.getEffectiveDate(), dtf), rate.getBid(), rate.getAsk() ); - cache.put(Symbol.valueOf(fresh.getCode().toUpperCase()), cacheObject); + cache.put(fresh.getCode(), cacheObject); } return cacheObject; } @@ -70,8 +68,8 @@ public class NbpService { } @VisibleForTesting - Rates fetchData(Symbol code, String date) { - return restClient.get().uri(URI_PATTERN, code.name().toLowerCase(), date) + Rates fetchData(String code, String date) { + return restClient.get().uri(URI_PATTERN, code.toLowerCase(), date) .retrieve() .onStatus(HttpStatusCode::is4xxClientError, ((request, response) -> { throw new NoDataException(code, date); @@ -84,7 +82,7 @@ public class NbpService { || today.getDayOfWeek() == DayOfWeek.SUNDAY; } - private record RatesCache(LocalDate date, BigDecimal buy, BigDecimal sell) { + private record RatesCache(LocalDate date, double buy, double sell) { } diff --git a/src/main/java/eu/ztsh/wymiana/service/UserService.java b/src/main/java/eu/ztsh/wymiana/service/UserService.java index 2205d19..857bc0f 100644 --- a/src/main/java/eu/ztsh/wymiana/service/UserService.java +++ b/src/main/java/eu/ztsh/wymiana/service/UserService.java @@ -1,10 +1,8 @@ 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; @@ -22,16 +20,13 @@ 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( - UserCreateRequestConfiguredWrapper.wrap(request).withInitial(currencyProperties.initial()).build() - ))); + return UserMapper.entityToPojo(userRepository.save(UserMapper.requestToEntity(request))); } 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 697e956..b962ddc 100644 --- a/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/CurrencyMapper.java @@ -2,7 +2,6 @@ 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; @@ -18,12 +17,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 31c2a20..39985fb 100644 --- a/src/main/java/eu/ztsh/wymiana/util/UserMapper.java +++ b/src/main/java/eu/ztsh/wymiana/util/UserMapper.java @@ -3,8 +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.model.UserCreateRequestConfiguredWrapper; -import eu.ztsh.wymiana.web.model.UserResponse; +import eu.ztsh.wymiana.web.model.UserCreateRequest; import java.util.List; @@ -20,13 +19,9 @@ 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(UserCreateRequestConfiguredWrapper request) { + public static UserEntity requestToEntity(UserCreateRequest request) { return new UserEntity(request.pesel(), request.name(), request.surname(), - List.of(new CurrencyEntity(request.pesel(), request.initialSymbol(), request.initial()))); + List.of(new CurrencyEntity(request.pesel(), "PLN", request.pln()))); } 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 9a01a0c..143876b 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().signum() >= 0) - || (request.toSell() != null && request.toSell().signum() >= 0)); + && ((request.toBuy() != null && request.toBuy() >= 0) + || (request.toSell() != null && request.toSell() >= 0)); } } 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 39c635d..fb0ee13 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/ExchangeController.java @@ -4,16 +4,9 @@ import eu.ztsh.wymiana.exception.InsufficientFundsException; import eu.ztsh.wymiana.exception.UserNotFoundException; 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; -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; @@ -29,22 +22,6 @@ 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 = UserResponse.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 dfa40b6..bca74ce 100644 --- a/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java +++ b/src/main/java/eu/ztsh/wymiana/web/controller/UserController.java @@ -2,21 +2,14 @@ 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; -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; @@ -30,23 +23,14 @@ 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) { + 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) { @@ -58,13 +42,6 @@ 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 { 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 c999dc5..54f192e 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/CurrencyExchangeRequest.java @@ -1,22 +1,18 @@ package eu.ztsh.wymiana.web.model; -import eu.ztsh.wymiana.model.Symbol; 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; -import java.math.BigDecimal; - @Builder @ValidExchangeRequest public record CurrencyExchangeRequest( - @NotNull @PESEL String pesel, - @NotNull Symbol from, - @NotNull Symbol to, - @Min(0) BigDecimal toBuy, - @Min(0) BigDecimal toSell + @PESEL String pesel, + @NotNull String from, + @NotNull String to, + Double toBuy, + Double 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 0614f6b..bd7b1b4 100644 --- a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java +++ b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java @@ -6,13 +6,11 @@ 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 @NotNull String pesel, - @NotNull @Min(0) BigDecimal initial) { + @PESEL @Adult String pesel, + @Min(0) double pln) { } diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java b/src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java deleted file mode 100644 index 2e73267..0000000 --- a/src/main/java/eu/ztsh/wymiana/web/model/UserResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -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) { - -} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 84ae7b8..47b720c 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,8 +4,6 @@ hsqldb: nbp: baseurl: "http://api.nbp.pl" -currency: - initial: PLN spring: datasource: @@ -16,9 +14,6 @@ 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 0f3b662..617cbfa 100644 --- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java +++ b/src/test/java/eu/ztsh/wymiana/EntityCreator.java @@ -5,13 +5,10 @@ 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; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -27,11 +24,13 @@ public class EntityCreator { public static String ANOTHER_PESEL = "08280959342"; public static String NAME = "Janina"; public static String SURNAME = "Kowalska"; - 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 BigDecimal BUY_RATE = createScaled(3.8804, 4); - public static BigDecimal SELL_RATE = createScaled(3.9572, 4); + 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; } @@ -40,29 +39,25 @@ public class EntityCreator { } public static User user() { - return user(Constants.PLN, BigDecimal.ZERO); + return user(Constants.PLN, 0); } - public static User user(BigDecimal pln, BigDecimal usd) { - Map currencies = new HashMap<>(); - if (pln.signum() > 0) { - currencies.put(Symbol.PLN, new Currency(Symbol.PLN, pln)); + public static User user(double pln, double usd) { + Map currencies = new HashMap<>(); + if (pln > 0) { + currencies.put("PLN", new Currency("PLN", pln)); } - if (usd.signum() > 0) { - currencies.put(Symbol.USD, new Currency(Symbol.USD, usd)); + if (usd > 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) - .initial(initial != null ? createScaled(initial, 2) : Constants.PLN); + .pln(Constants.PLN); } public static CurrencyExchangeRequest.CurrencyExchangeRequestBuilder exchangeRequest() { @@ -73,7 +68,7 @@ public class EntityCreator { var rates = new Rates(); rates.setTable("C"); rates.setCurrency("dolar amerykański"); - rates.setCode(Symbol.USD.toString()); + rates.setCode("USD"); var rate = new Rate(); rate.setNo("096/C/NBP/2024"); rate.setEffectiveDate(date); @@ -88,8 +83,8 @@ public class EntityCreator { String name; String surname; String pesel; - BigDecimal pln = BigDecimal.valueOf(-1); - BigDecimal usd = BigDecimal.valueOf(-1); + double pln = -1; + double usd = -1; public UserEntityBuilder name(String name) { this.name = name; @@ -107,34 +102,26 @@ public class EntityCreator { } public UserEntityBuilder pln(double pln) { - return this.pln(BigDecimal.valueOf(pln)); - } - - public UserEntityBuilder pln(BigDecimal pln) { - this.pln = pln.setScale(2, RoundingMode.HALF_UP); + this.pln = pln; return this; } public UserEntityBuilder usd(double usd) { - return this.usd(BigDecimal.valueOf(usd)); - } - - public UserEntityBuilder usd(BigDecimal usd) { - this.usd = usd.setScale(2, RoundingMode.HALF_UP); + this.usd = usd; return this; } public UserEntity build() { var nonnulPesel = Optional.ofNullable(pesel).orElse(Constants.PESEL); List currencies = new ArrayList<>(); - if (pln.signum() > -1) { - currencies.add(new CurrencyEntity(nonnulPesel, Symbol.PLN, pln)); + if (pln > -1) { + currencies.add(new CurrencyEntity(nonnulPesel, "PLN", pln)); } - if (usd.signum() > -1) { - currencies.add(new CurrencyEntity(nonnulPesel, Symbol.USD, usd)); + if (usd > -1) { + currencies.add(new CurrencyEntity(nonnulPesel, "USD", usd)); } if (currencies.isEmpty()) { - currencies.add(new CurrencyEntity(nonnulPesel, Symbol.PLN, Constants.PLN)); + currencies.add(new CurrencyEntity(nonnulPesel, "PLN", Constants.PLN)); } return new UserEntity( nonnulPesel, @@ -146,8 +133,4 @@ 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/RepositoryBasedTest.java b/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java index 5e0bc54..cd0ffcf 100644 --- a/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java +++ b/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java @@ -29,7 +29,6 @@ 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 14f7ea3..c44625e 100644 --- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java @@ -2,11 +2,10 @@ 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; @@ -17,8 +16,6 @@ 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.*; @@ -30,14 +27,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { private final CurrencyService currencyService; @Autowired - public CurrencyServiceTest(UserRepository userRepository, InstanceValidator instanceValidator, - CurrencyProperties currencyProperties) { + public CurrencyServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { super(userRepository); var nbp = Mockito.mock(NbpService.class); - 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); + 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); } @Transactional @@ -46,12 +41,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() - .from(Symbol.PLN) - .to(Symbol.USD) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) .toSell(PLN) .build()); assertThat(result.currencies()) - .matches(map -> map.get(Symbol.PLN).amount().signum() == 0 && Objects.equals(map.get(Symbol.USD).amount(), USD_BUY), "USD 5.08"); + .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @@ -62,12 +57,12 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var result = currencyService.exchange(EntityCreator.exchangeRequest() - .from(Symbol.PLN) - .to(Symbol.USD) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) .toBuy(USD_BUY) .build()); assertThat(result.currencies()) - .matches(map -> map.get(Symbol.PLN).amount().signum() == 0 && Objects.equals(map.get(Symbol.USD).amount(), USD_BUY)); + .matches(map -> map.get(PLN_SYMBOL).amount() == 0 && map.get(USD_SYMBOL).amount() == USD_BUY); var expected = EntityCreator.userEntity().pln(0).usd(USD_BUY).build(); expect(expected); } @@ -78,12 +73,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(Symbol.USD) - .to(Symbol.PLN) + .from(USD_SYMBOL) + .to(PLN_SYMBOL) .toSell(USD_SELL) .build()); assertThat(result.currencies()) - .matches(map -> Objects.equals(map.get(Symbol.PLN).amount(), PLN) && map.get(Symbol.USD).amount().signum() == 0, "PLN 20.10"); + .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @@ -94,12 +89,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(Symbol.USD) - .to(Symbol.PLN) + .from(USD_SYMBOL) + .to(PLN_SYMBOL) .toBuy(PLN) .build()); assertThat(result.currencies()) - .matches(map -> Objects.equals(map.get(Symbol.PLN).amount(), PLN) && map.get(Symbol.USD).amount().signum() == 0, "PLN 20.10"); + .matches(map -> map.get(PLN_SYMBOL).amount() == PLN && map.get(USD_SYMBOL).amount() == 0); var expected = EntityCreator.userEntity().pln(PLN).usd(0).build(); expect(expected); } @@ -110,8 +105,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var request = EntityCreator.exchangeRequest() - .from(Symbol.USD) - .to(Symbol.PLN) + .from(USD_SYMBOL) + .to(PLN_SYMBOL) .toBuy(PLN) .build(); assertThatThrownBy(() -> currencyService.exchange(request)) @@ -121,17 +116,17 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Transactional @Test void doubleExchangeTest() { - var initialValue = BigDecimal.valueOf(100); + var initialValue = 100; var entity = EntityCreator.userEntity().pln(initialValue).build(); userRepository.save(entity); - currencyService.exchange(EntityCreator.exchangeRequest() - .from(Symbol.PLN) - .to(Symbol.USD) + var result1 = currencyService.exchange(EntityCreator.exchangeRequest() + .from(PLN_SYMBOL) + .to(USD_SYMBOL) .toBuy(USD_BUY) .build()); - currencyService.exchange(EntityCreator.exchangeRequest() - .from(Symbol.USD) - .to(Symbol.PLN) + var result2 = currencyService.exchange(EntityCreator.exchangeRequest() + .from(USD_SYMBOL) + .to(PLN_SYMBOL) .toSell(USD_BUY) .build()); var resultOptional = userRepository.findById(entity.getPesel()); @@ -140,8 +135,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { var resultEntity = resultOptional.get(); assertThat(resultEntity.getCurrencies() .stream() - .filter(c -> c.getSymbol().equals(Symbol.PLN)) - .findFirst()).isNotEmpty().get().matches(currencyEntity -> currencyEntity.getAmount().compareTo(initialValue) < 0); + .filter(c -> c.getSymbol().equalsIgnoreCase("PLN")) + .findFirst()).isNotEmpty().get().matches(currencyEntity -> currencyEntity.getAmount() < initialValue); } @Transactional @@ -150,8 +145,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { var entity = EntityCreator.userEntity().build(); userRepository.save(entity); var request = EntityCreator.exchangeRequest() - .from(Symbol.PLN) - .to(Symbol.USD) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) .toBuy(PLN) .build(); assertThatThrownBy(() -> currencyService.exchange(request)) @@ -164,8 +159,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { void invalidPeselTest(String pesel) { var entity = EntityCreator.exchangeRequest() .pesel(pesel) - .from(Symbol.PLN) - .to(Symbol.USD) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) @@ -176,8 +171,8 @@ class CurrencyServiceTest extends RepositoryBasedTest { @Test void notExistingUserTest() { var entity = EntityCreator.exchangeRequest() - .from(Symbol.PLN) - .to(Symbol.USD) + .from(PLN_SYMBOL) + .to(USD_SYMBOL) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) @@ -188,7 +183,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @DisplayName("Empty 'from' value") void emptyFromTest() { var entity = EntityCreator.exchangeRequest() - .to(Symbol.USD) + .to(USD_SYMBOL) .toSell(USD_SELL) .build(); assertThatThrownBy(() -> currencyService.exchange(entity)) @@ -200,7 +195,7 @@ class CurrencyServiceTest extends RepositoryBasedTest { @DisplayName("Empty 'to' value") void emptyToTest() { var entity = EntityCreator.exchangeRequest() - .from(Symbol.PLN) + .from(PLN_SYMBOL) .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 0ec2838..7424fbe 100644 --- a/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/NbpServiceTest.java @@ -5,7 +5,6 @@ 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; @@ -80,7 +79,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(Symbol.USD)).isEqualTo(EntityCreator.Constants.SELL_RATE); + assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); } finally { WireMockExtension.verifyGet(1, url); } @@ -93,9 +92,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(Symbol.USD)).isEqualTo(EntityCreator.Constants.SELL_RATE); + assertThat(nbpService.getSellRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.SELL_RATE); // get from cache - assertThat(nbpService.getBuyRate(Symbol.USD)).isEqualTo(EntityCreator.Constants.BUY_RATE); + assertThat(nbpService.getBuyRate(EntityCreator.Constants.USD_SYMBOL)).isEqualTo(EntityCreator.Constants.BUY_RATE); WireMockExtension.verifyGet(1, url); } @@ -103,9 +102,9 @@ class NbpServiceTest { @Test void getInvalidCurrencyTest() { var date = dtf.format(updateClock(DayOfWeek.FRIDAY)); - var url = "/api/exchangerates/rates/c/usd/%s/".formatted(date); + var url = "/api/exchangerates/rates/c/usb/%s/".formatted(date); WireMockExtension.response(url, 404, "404 NotFound - Not Found - Brak danych"); - assertThatThrownBy(() -> nbpService.getSellRate(Symbol.USD)).isInstanceOf(NoDataException.class); + assertThatThrownBy(() -> nbpService.getSellRate("usb")).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 33ea330..1ab7690 100644 --- a/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java +++ b/src/test/java/eu/ztsh/wymiana/service/UserServiceTest.java @@ -2,7 +2,6 @@ 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; @@ -22,10 +21,9 @@ class UserServiceTest extends RepositoryBasedTest { private final UserService userService; @Autowired - public UserServiceTest(UserRepository userRepository, InstanceValidator instanceValidator, - CurrencyProperties currencyProperties) { + public UserServiceTest(UserRepository userRepository, InstanceValidator instanceValidator) { super(userRepository); - userService = new UserService(userRepository, instanceValidator, currencyProperties); + userService = new UserService(userRepository, instanceValidator); } @Test @@ -44,22 +42,23 @@ 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 @DisplayName("Try to create another user with same PESEL") void createDuplicatedPeselTest() { var first = EntityCreator.userRequest().build(); - var second = EntityCreator.userRequest(30.30) - .name("Jan") - .surname("Kowalski") - .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)); + .isInstanceOf(UserAlreadyExistsException.class) + .hasMessage("User with PESEL %s already exists".formatted(EntityCreator.Constants.PESEL)); } @Test @@ -67,8 +66,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 @@ -80,10 +79,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 121c03d..11503aa 100644 --- a/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java +++ b/src/test/java/eu/ztsh/wymiana/util/UserMapperTest.java @@ -1,10 +1,12 @@ package eu.ztsh.wymiana.util; import eu.ztsh.wymiana.EntityCreator; -import eu.ztsh.wymiana.model.Symbol; -import eu.ztsh.wymiana.model.UserCreateRequestConfiguredWrapper; +import eu.ztsh.wymiana.model.Currency; +import eu.ztsh.wymiana.model.User; import org.junit.jupiter.api.Test; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThat; class UserMapperTest { @@ -29,9 +31,7 @@ class UserMapperTest { @Test void requestToEntityTest() { - var request = UserCreateRequestConfiguredWrapper.wrap(EntityCreator.userRequest().build()) - .withInitial(Symbol.PLN) - .build() ; + var request = EntityCreator.userRequest().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 4edd903..5226e14 100644 --- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java +++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java @@ -1,15 +1,14 @@ 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 { @@ -21,8 +20,8 @@ class ValidExchangeRequestValidatorTest extends ValidatorTest