🐞Solución de errores y ⚙️Ajustes en la funcionalidad

🐞Solución de errores - Cambios en ApiUtil y Quote para un body correcto de Quote - Cambios en Obj RestTemplate con un ObjMapper diferente para obtener un body correcto ⚙️Ajustes en la funcionalidad - Cambios en test unitarios: DolarServiceTest, OtherCurrenciesServiceTest y QuoteServiceTest - Cambios en test de integración: IntegrationControllerQuoteTest, IntegrationDollarControllerTest y IntegrationOtherCurrenciesControllerTest - Se agregaron perfiles para la config de spring: prod- dev- test - Pequeño cambio en los endpoints, se agregro "v1"
Marc0Franc0 · Oct 28, 2024 · fd954ed · fd954ed
1 parent 52f9272
commit fd954ed
Show file tree

Hide file tree

Showing 24 changed files with 574 additions and 266 deletions.
diff --git a/README.md b/README.md
@@ -22,18 +22,18 @@ Para construir y ejecutar la aplicación necesita:
 Ejecutar localmente
 
 ```shell
-docker pull marc0franc0/exchange-rates-api:1.3.0
+docker pull marc0franc0/exchange-rates-api:1.2.1
 ```
 ```shell
-docker create -p8080:8080 --name app-exchange-rates  marc0franc0/exchange-rates-api:1.3.0
+docker create -p8080:8080 --name app-exchange-rates -e SPRING_PROFILES_ACTIVE=dev marc0franc0/exchange-rates-api:1.2.1
 ```
 ```shell
 docker start app-exchange-rates
 ```
 
 Dirigirse a:
-- [Documentación en formato JSON](http://localhost:8080/api/v3/api-docs)
-- [Documentación Swagger con interfaz gráfica](http://localhost:8080/doc/swagger-ui/index.html)
+- Documentación JSON: /api/v3/api-docs
+- Documentación Swagger: /doc/swagger-ui/index.html
 
 ## Requerimientos para ejecutar con Maven
 
@@ -52,5 +52,5 @@ mvn spring-boot:run
 ```
 
 Dirigirse a:
-- [Documentación en formato JSON](http://localhost:8080/api/v3/api-docs)
-- [Documentación Swagger con interfaz gráfica](http://localhost:8080/doc/swagger-ui/index.html)
+- Documentación JSON: /api/v3/api-docs
+- Documentación Swagger /doc/swagger-ui/index.html
diff --git a/pom.xml b/pom.xml
@@ -11,6 +11,7 @@
 	<groupId>com.app</groupId>
 	<artifactId>ExchangeRatesApi</artifactId>
 	<name>ExchangeRatesApi</name>
+	<version>1.2.1</version>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>21</java.version>
@@ -52,6 +53,11 @@
 		<artifactId>junit-jupiter</artifactId>
 		<version>1.19.3</version>
 	</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 

diff --git a/src/main/java/com/app/ExchangeRates/config/api/ApiConfiguration.java b/src/main/java/com/app/ExchangeRates/config/api/ApiConfiguration.java
@@ -2,17 +2,30 @@
 
 import com.app.ExchangeRates.exception.ControllerAdvice;
 import com.app.ExchangeRates.service.util.ApiUtil;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
 
 @Configuration
 public class ApiConfiguration {
     @Bean
-    public ApiUtil apiUtil(){
-        return new ApiUtil();
+    RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
+        converter.setObjectMapper(objectMapper);
+        restTemplate.getMessageConverters().add(0, converter);
+        return restTemplate;
     }
     @Bean
-    public ControllerAdvice controllerAdvice(){
-        return new ControllerAdvice();
+    public ApiUtil apiUtil(){
+        return new ApiUtil(restTemplate());
     }
 }
diff --git a/src/main/java/com/app/ExchangeRates/config/context/AppContext.java b/src/main/java/com/app/ExchangeRates/config/context/AppContext.java
@@ -1,6 +1,10 @@
 package com.app.ExchangeRates.config.context;
 
+import com.app.ExchangeRates.exception.ControllerAdvice;
+import com.app.ExchangeRates.service.util.ApiUtil;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,12 +18,8 @@
 @EnableWebMvc
 public class AppContext {
     @Bean
-    RestTemplate restTemplate(){
-        RestTemplate restTemplate = new RestTemplate();
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        converter.setObjectMapper(new ObjectMapper());
-        restTemplate.getMessageConverters().add(converter);
-        return restTemplate;
+    public ControllerAdvice controllerAdvice(){
+        return new ControllerAdvice();
     }
     @Bean
     public WebMvcConfigurer corsConfigurer() {

diff --git a/src/main/java/com/app/ExchangeRates/config/documentation/OpenApiConfiguration.java b/src/main/java/com/app/ExchangeRates/config/documentation/OpenApiConfiguration.java
@@ -17,11 +17,11 @@ public class OpenApiConfiguration {
     @Bean
     public OpenAPI customOpenAPI (
             @Value("${openapi.service.title}") String serviceTitle,
-            @Value("${openapi.service.version}") String serviceVersion,
+            //@Value("${openapi.service.version}") String serviceVersion,
             @Value ("${openapi.service.url}") String url) {
         return  new  OpenAPI ()
                 .servers(List.of( new Server().url(url)))
-                .info( new Info().title(serviceTitle ).version(serviceVersion));
+                .info( new Info().title(serviceTitle ));
     }
 
 }
diff --git a/src/main/java/com/app/ExchangeRates/controller/ApiDolar/DolarController.java b/src/main/java/com/app/ExchangeRates/controller/ApiDolar/DolarController.java
@@ -1,7 +1,6 @@
 package com.app.ExchangeRates.controller.ApiDolar;
 
 import com.app.ExchangeRates.model.DolarApi.Money;
-import com.app.ExchangeRates.model.DolarApi.MoneyDTO;
 import com.app.ExchangeRates.service.DolarApi.DolarService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -16,13 +15,13 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/exchanges/usd/")
+@RequestMapping("/api/v1/exchanges/usd/")
 public class DolarController {
     @Autowired
     private DolarService dolarService;
     @Operation(summary = "Get Official Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/official")
@@ -31,7 +30,7 @@ public class DolarController {
     }
     @Operation(summary = "Get Blue Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/blue")
@@ -40,7 +39,7 @@ ResponseEntity<Money> getBlueDollar(){
     }
     @Operation(summary = "Get CCL Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/ccl")
@@ -49,7 +48,7 @@ ResponseEntity<Money> getCCLDollar(){
     }
     @Operation(summary = "Get Card Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/card")
@@ -58,7 +57,7 @@ ResponseEntity<Money> getDollarCard(){
     }
     @Operation(summary = "Get StockMarket Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/stock-market")
@@ -78,7 +77,7 @@ ResponseEntity<Money> getSolidarityDollar(){
     @Operation(summary = "Get Wholesale Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
                     content = @Content(mediaType = "application/json",
-                             schema = @Schema(implementation = MoneyDTO.class))),
+                             schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/wholesale")
@@ -88,7 +87,7 @@ ResponseEntity<Money> getWholesaleDollar(){
     @Operation(summary = "Get Wholesale Dollar", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
                     content = @Content(mediaType = "application/json",
-                            schema = @Schema(implementation = MoneyDTO.class))),
+                            schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/cripto")

diff --git a/src/main/java/com/app/ExchangeRates/controller/ApiDolar/OtherCurrenciesController.java b/src/main/java/com/app/ExchangeRates/controller/ApiDolar/OtherCurrenciesController.java
@@ -1,9 +1,6 @@
 package com.app.ExchangeRates.controller.ApiDolar;
 
 import com.app.ExchangeRates.model.DolarApi.Money;
-import com.app.ExchangeRates.model.DolarApi.MoneyDTO;
-import com.app.ExchangeRates.model.FinnHub.Quote;
-import com.app.ExchangeRates.service.DolarApi.DolarService;
 import com.app.ExchangeRates.service.DolarApi.OtherCurrenciesService;
 import com.app.ExchangeRates.service.FinnHubApi.QuoteService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,15 +15,15 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/exchanges/")
+@RequestMapping("/api/v1/exchanges/")
 public class OtherCurrenciesController {
     @Autowired
     private OtherCurrenciesService otherCurrenciesService;
     @Autowired
     private QuoteService quoteService;
     @Operation(summary = "Get Euro", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/euro")
@@ -35,7 +32,7 @@ ResponseEntity<Money> getEuro(){
     }
     @Operation(summary = "Get Brazilian Real", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/bzl")
@@ -44,7 +41,7 @@ ResponseEntity<Money> getBrazilianReal(){
     }
     @Operation(summary = "Get Chilean Peso", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/clp")
@@ -53,7 +50,7 @@ ResponseEntity<Money> getChileanPeso(){
     }
     @Operation(summary = "Get Uruguayan Peso", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoneyDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Money.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/uyu")

diff --git a/src/main/java/com/app/ExchangeRates/controller/FinnHubApi/QuoteController.java b/src/main/java/com/app/ExchangeRates/controller/FinnHubApi/QuoteController.java
@@ -1,7 +1,6 @@
 package com.app.ExchangeRates.controller.FinnHubApi;
 
 import com.app.ExchangeRates.model.FinnHub.Quote;
-import com.app.ExchangeRates.model.FinnHub.QuoteDTO;
 import com.app.ExchangeRates.service.FinnHubApi.QuoteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -16,17 +15,17 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/exchanges/stock-price")
+@RequestMapping("/api/v1/exchanges/stock-price")
 public class QuoteController {
     @Autowired
     private QuoteService quoteService;
     @Operation(summary = "Get prices from the foreign market at the dollar price", responses = {
             @ApiResponse(description = "Successful Operation", responseCode = "200",
-                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = QuoteDTO.class))),
+                    content = @Content(mediaType = "application/json", schema = @Schema(implementation = Quote.class))),
             @ApiResponse(responseCode = "404", description = "Not found",
                     content = @Content)})
     @GetMapping("/{symbol}")
     ResponseEntity<Quote> getQuote(@PathVariable String symbol){
         return ResponseEntity.status(HttpStatus.OK).body(quoteService.getQuote(symbol));
     }
-}
+    }
diff --git a/src/main/java/com/app/ExchangeRates/mapper/FinnHubApi/QuoteMapper.java b/src/main/java/com/app/ExchangeRates/mapper/FinnHubApi/QuoteMapper.java
diff --git a/src/main/java/com/app/ExchangeRates/model/DolarApi/MoneyDTO.java b/src/main/java/com/app/ExchangeRates/model/DolarApi/MoneyDTO.java
diff --git a/src/main/java/com/app/ExchangeRates/model/FinnHub/Quote.java b/src/main/java/com/app/ExchangeRates/model/FinnHub/Quote.java
@@ -5,16 +5,21 @@
 
 @Builder
 @AllArgsConstructor
+@NoArgsConstructor
 @ToString
 @Data
 public class Quote {
-    @JsonProperty("c")
+    @JsonProperty("currencyPrice")
+    @JsonAlias("c")
     private Double currencyPrice;
-    @JsonProperty("dp")
+
+    @JsonProperty("percentChange")
+    @JsonAlias("dp")
     private Double percentChange;
-    @JsonProperty("o")
-    private Double openPriceOfTheDay;
 
+    @JsonProperty("openPriceOfTheDay")
+    @JsonAlias("o")
+    private Double openPriceOfTheDay;
     /*  {
         "c": 191.24,
             "d": 1.29,

diff --git a/src/main/java/com/app/ExchangeRates/model/FinnHub/QuoteDTO.java b/src/main/java/com/app/ExchangeRates/model/FinnHub/QuoteDTO.java