pre camel

Author: Shelson Ferrari

src/main/java/com/shelson/application/controller/CurrencyConversionController.java

@@ -1,32 +1,59 @@
+/*
+ * Copyright (c) 2024, Shelson Ferrari
+ *
+ * Licensed under the MIT License and the Apache License, Version 2.0 (the "Licenses"); you may not use this file except in
+ * compliance with the Licenses. You may obtain a copy of the Licenses at
+ *
+ * MIT License:
+ * https://opensource.org/licenses/MIT
+ *
+ * Apache License, Version 2.0:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licenses is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the Licenses for the specific language governing permissions and limitations under the Licenses.
+ */
 package com.shelson.application.controller;
 
-import org.apache.camel.ProducerTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.shelson.application.dto.CurrencyConversionDTO;
+import com.shelson.application.service.CurrencyConversionService;
 import com.shelson.domain.model.Currency;
+import com.shelson.infrastructure.exception.BusinessException;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
-import java.util.HashMap;
-import java.util.Map;
-
+/**
+ * Controller responsible for currency conversion operations.
+ * Provides endpoints for converting values between different currencies.
+ */
 @RestController
 @RequestMapping("/api/v1/conversions")
 @Api(value = "Currency Conversion Controller", description = "Currency conversion operations")
 public class CurrencyConversionController {
 
     @Autowired
-    private ProducerTemplate producerTemplate;
+    private CurrencyConversionService currencyConversionService;
 
+    /**
+     * Converts the source currency to the target currency.
+     * 
+     * @param source The source currency. Example: USD.
+     * @param target The target currency. Example: BRL.
+     * @param amount The amount to be converted. Example: 100.0.
+     * @return A {@link CurrencyConversionDTO} containing the conversion details.
+     * @throws BusinessException 
+     */
     @GetMapping("/convert")
     @ApiOperation(value = "Converts the source currency to the target currency", notes = "Returns the currency conversion details")
     @ApiResponses(value = {
@@ -36,12 +63,7 @@ public class CurrencyConversionController {
     public CurrencyConversionDTO convertCurrency(
             @RequestParam @ApiParam(value = "Source currency", example = "USD") Currency source, 
             @RequestParam @ApiParam(value = "Target currency", example = "BRL") Currency target,
-            @RequestParam @ApiParam(value = "Amount to be converted", example = "100.0") double amount) {
-
-        Map<String, Object> headers = new HashMap<>();
-        headers.put("sourceCurrency", source);
-        headers.put("targetCurrency", target);
-
-        return producerTemplate.requestBodyAndHeaders("direct:convertCurrency", amount, headers, CurrencyConversionDTO.class);
+            @RequestParam @ApiParam(value = "Amount to be converted", example = "100.0") double amount) throws BusinessException {
+        return currencyConversionService.convertCurrency(source, target, amount);
     }
 }

src/main/java/com/shelson/application/dto/CurrencyConversionDTO.java

@@ -1,13 +1,12 @@
 package com.shelson.application.dto;
 
 import java.time.LocalDateTime;
-
-import com.shelson.domain.model.Currency;
-
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.PastOrPresent;
 import jakarta.validation.constraints.Positive;
 
+import com.shelson.domain.model.Currency;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/shelson/application/service/CurrencyConversionService.java

@@ -1,28 +1,63 @@
+/*
+ * Copyright (c) 2024, Shelson Ferrari
+ *
+ * Licensed under the MIT License and the Apache License, Version 2.0 (the "Licenses"); you may not use this file except in
+ * compliance with the Licenses. You may obtain a copy of the Licenses at
+ *
+ * MIT License:
+ * https://opensource.org/licenses/MIT
+ *
+ * Apache License, Version 2.0:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licenses is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the Licenses for the specific language governing permissions and limitations under the Licenses.
+ */
 package com.shelson.application.service;
 
-import org.apache.camel.ProducerTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.time.LocalDateTime;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.RestTemplate;
+
 import com.shelson.application.dto.CurrencyConversionDTO;
 import com.shelson.domain.model.Currency;
 import com.shelson.domain.model.CurrencyConversion;
 import com.shelson.domain.repository.CurrencyConversionRepository;
 import com.shelson.infrastructure.exception.BusinessException;
 import com.shelson.infrastructure.exception.ResourceNotFoundException;
 
+/**
+ * Service responsible for currency conversion operations.
+ */
 @Service
 public class CurrencyConversionService {
 
     @Autowired
-    private ProducerTemplate producerTemplate;
+    private RestTemplate restTemplate;
 
     @Autowired
     private CurrencyConversionRepository repository;
+    
+    private static final Logger logger = LoggerFactory.getLogger(CurrencyConversionService.class);
 
+    /**
+     * Converts an amount from a source currency to a target currency.
+     *
+     * @param sourceCurrency The source currency.
+     * @param targetCurrency The target currency.
+     * @param amount The amount to be converted.
+     * @return A {@link CurrencyConversionDTO} containing the conversion details.
+     * @throws BusinessException if the source or target currency is null, or if the amount is less than or equal to zero.
+     * @throws ResourceNotFoundException if an error occurs when fetching exchange rates from the API, or if the target currency is invalid.
+     */
     public CurrencyConversionDTO convertCurrency(Currency sourceCurrency, Currency targetCurrency, double amount) throws BusinessException {
         if (sourceCurrency == null || targetCurrency == null) {
             throw new BusinessException("Source and target currencies must not be null");
@@ -32,23 +67,21 @@ public CurrencyConversionDTO convertCurrency(Currency sourceCurrency, Currency t
             throw new BusinessException("Amount must be greater than zero");
         }
 
-        Map<String, Object> headers = Map.of(
-                "sourceCurrency", sourceCurrency.getCode(),
-                "targetCurrency", targetCurrency.getCode()
-        );
+        logger.info("Starting currency conversion from {} to {}", sourceCurrency, targetCurrency);
 
-        Map<String, Double> rates;
+        String apiUrl = "https://api.exchangerate-api.com/v4/latest/" + sourceCurrency.getCode();
+        ApiResponse response;
         try {
-            rates = producerTemplate.requestBodyAndHeaders("direct:fetchRate", null, headers, Map.class);
-        } catch (Exception e) {
-            throw new ResourceNotFoundException("Unable to fetch exchange rates from API");
+            response = restTemplate.getForObject(apiUrl, ApiResponse.class);
+        } catch (HttpClientErrorException | HttpServerErrorException ex) {
+            throw new ResourceNotFoundException("Error fetching exchange rates from API: " + ex.getMessage());
         }
 
-        if (rates == null || rates.isEmpty()) {
+        if (response == null || response.getRates() == null) {
             throw new ResourceNotFoundException("Unable to fetch exchange rates from API");
         }
 
-        Double rate = rates.get(targetCurrency.getCode());
+        Double rate = response.getRates().get(targetCurrency.getCode());
 
         if (rate == null) {
             throw new ResourceNotFoundException("Invalid target currency");
@@ -58,6 +91,33 @@ public CurrencyConversionDTO convertCurrency(Currency sourceCurrency, Currency t
         CurrencyConversion conversion = new CurrencyConversion(sourceCurrency, targetCurrency, rate, LocalDateTime.now());
         repository.save(conversion);
 
+        logger.info("Conversion completed successfully");
+
         return new CurrencyConversionDTO(sourceCurrency, targetCurrency, rate, LocalDateTime.now(), amount, convertedAmount);
     }
+
+    /**
+     * Inner class representing the exchange rates API response.
+     */
+    public static class ApiResponse {
+        private Map<String, Double> rates;
+
+        /**
+         * Gets the exchange rates.
+         * 
+         * @return A map where the keys are currency codes and the values are exchange rates.
+         */
+        public Map<String, Double> getRates() {
+            return rates;
+        }
+
+        /**
+         * Sets the exchange rates.
+         * 
+         * @param rates A map where the keys are currency codes and the values are exchange rates.
+         */
+        public void setRates(Map<String, Double> rates) {
+            this.rates = rates;
+        }
+    }
 }

src/main/java/com/shelson/domain/model/CurrencyConversion.java

@@ -30,9 +30,11 @@ public class CurrencyConversion {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Enumerated(EnumType.STRING)
     @Column(name = "source_currency")
     private Currency sourceCurrency;
 
+    @Enumerated(EnumType.STRING)
     @Column(name = "target_currency")
     private Currency targetCurrency;
 
@@ -63,50 +65,118 @@ public CurrencyConversion(Currency sourceCurrency, Currency targetCurrency, doub
         this.queryDate = queryDate;
     }
 
-    // Getters and setters
-
+    /**
+     * Gets the conversion ID.
+     *
+     * @return The conversion ID.
+     */
     public Long getId() {
         return id;
     }
 
+    /**
+     * Sets the conversion ID.
+     *
+     * @param id The conversion ID.
+     */
     public void setId(Long id) {
         this.id = id;
     }
 
+    /**
+     * Gets the source currency.
+     *
+     * @return The source currency.
+     */
     public Currency getSourceCurrency() {
         return sourceCurrency;
     }
 
+    /**
+     * Sets the source currency.
+     *
+     * @param sourceCurrency The source currency.
+     */
     public void setSourceCurrency(Currency sourceCurrency) {
         this.sourceCurrency = sourceCurrency;
     }
 
+    /**
+     * Gets the target currency.
+     *
+     * @return The target currency.
+     */
     public Currency getTargetCurrency() {
         return targetCurrency;
     }
 
+    /**
+     * Sets the target currency.
+     *
+     * @param targetCurrency The target currency.
+     */
     public void setTargetCurrency(Currency targetCurrency) {
         this.targetCurrency = targetCurrency;
     }
 
+    /**
+     * Gets the conversion rate.
+     *
+     * @return The conversion rate.
+     */
     public double getConversionRate() {
         return conversionRate;
     }
 
+    /**
+     * Sets the conversion rate.
+     *
+     * @param conversionRate The conversion rate.
+     */
     public void setConversionRate(double conversionRate) {
         this.conversionRate = conversionRate;
     }
 
+    /**
+     * Gets the query date and time.
+     *
+     * @return The query date and time.
+     */
     public LocalDateTime getQueryDate() {
         return queryDate;
     }
 
+    /**
+     * Sets the query date and time.
+     *
+     * @param queryDate The query date and time.
+     */
     public void setQueryDate(LocalDateTime queryDate) {
         this.queryDate = queryDate;
     }
 
-    // Override equals and hashCode methods
+    /**
+     * Returns a string representation of the currency conversion.
+     *
+     * @return A string representing the currency conversion.
+     */
+    @Override
+    public String toString() {
+        return "CurrencyConversion{" +
+                "id=" + id +
+                ", sourceCurrency=" + sourceCurrency +
+                ", targetCurrency=" + targetCurrency +
+                ", conversionRate=" + conversionRate +
+                ", queryDate=" + queryDate +
+                '}';
+    }
 
+    /**
+     * Checks if two instances of CurrencyConversion are equal.
+     *
+     * @param o The object to be compared.
+     * @return {@code true} if the objects are equal; {@code false} otherwise.
+     */
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -121,6 +191,11 @@ public boolean equals(Object o) {
         return queryDate.equals(that.queryDate);
     }
 
+    /**
+     * Computes the hash code of the instance.
+     *
+     * @return The hash code of the instance.
+     */
     @Override
     public int hashCode() {
         int result;
@@ -133,17 +208,4 @@ public int hashCode() {
         result = 31 * result + queryDate.hashCode();
         return result;
     }
-
-    // Override toString method
-
-    @Override
-    public String toString() {
-        return "CurrencyConversion{" +
-                "id=" + id +
-                ", sourceCurrency=" + sourceCurrency +
-                ", targetCurrency=" + targetCurrency +
-                ", conversionRate=" + conversionRate +
-                ", queryDate=" + queryDate +
-                '}';
-    }
 }