#34 fixed exchange rates client in order to support API changes in ex…

…changeratesapi.io
erdemdmr · Aug 26, 2018 · 5c2880d · 5c2880d
1 parent 62174f2
commit 5c2880d
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 52 deletions.
diff --git a/account-service/src/test/java/com/piggymetrics/account/AccountServiceApplicationTests.java b/account-service/src/test/java/com/piggymetrics/account/AccountServiceApplicationTests.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class AccountServiceApplicationTests {
 

diff --git a/account-service/src/test/java/com/piggymetrics/account/controller/AccountControllerTest.java b/account-service/src/test/java/com/piggymetrics/account/controller/AccountControllerTest.java
@@ -12,7 +12,7 @@
 import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
@@ -25,7 +25,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class AccountControllerTest {
 

diff --git a/account-service/src/test/java/com/piggymetrics/account/repository/AccountRepositoryTest.java b/account-service/src/test/java/com/piggymetrics/account/repository/AccountRepositoryTest.java
@@ -9,15 +9,15 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 
 import static org.junit.Assert.assertEquals;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @DataMongoTest
 public class AccountRepositoryTest {
 

diff --git a/auth-service/src/test/java/com/piggymetrics/auth/AuthServiceApplicationTests.java b/auth-service/src/test/java/com/piggymetrics/auth/AuthServiceApplicationTests.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class AuthServiceApplicationTests {
 

diff --git a/auth-service/src/test/java/com/piggymetrics/auth/controller/UserControllerTest.java b/auth-service/src/test/java/com/piggymetrics/auth/controller/UserControllerTest.java
@@ -11,7 +11,7 @@
 import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
@@ -21,7 +21,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class UserControllerTest {
 

diff --git a/auth-service/src/test/java/com/piggymetrics/auth/repository/UserRepositoryTest.java b/auth-service/src/test/java/com/piggymetrics/auth/repository/UserRepositoryTest.java
@@ -8,14 +8,14 @@
 import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @DataMongoTest
 public class UserRepositoryTest {
 

diff --git a/config/src/main/resources/shared/statistics-service.yml b/config/src/main/resources/shared/statistics-service.yml
@@ -22,4 +22,4 @@ server:
   port: 7000
 
 rates:
-  url: https://exchangeratesapi.io/api
+  url: https://api.exchangeratesapi.io
diff --git a/gateway/src/main/resources/static/js/launch.js b/gateway/src/main/resources/static/js/launch.js
@@ -80,7 +80,7 @@ $(window).load(function(){
         global.mobileClient = true;
 	}
 
-    $.getJSON("https://exchangeratesapi.io/api/latest?base=RUB", function( data ) {
+    $.getJSON("https://api.exchangeratesapi.io/latest?base=RUB&symbols=EUR,USD", function( data ) {
         global.eur = 1 / data.rates.EUR;
         global.usd = 1 / data.rates.USD;
     });

diff --git a/gateway/src/test/java/com/piggymetrics/gateway/GatewayApplicationTests.java b/gateway/src/test/java/com/piggymetrics/gateway/GatewayApplicationTests.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class GatewayApplicationTests {
 

diff --git a/monitoring/src/test/java/com/piggymetrics/monitoring/MonitoringApplicationTests.java b/monitoring/src/test/java/com/piggymetrics/monitoring/MonitoringApplicationTests.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class MonitoringApplicationTests {
 

diff --git a/...vice/src/test/java/com/piggymetrics/notification/NotificationServiceApplicationTests.java b/...vice/src/test/java/com/piggymetrics/notification/NotificationServiceApplicationTests.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class NotificationServiceApplicationTests {
 

diff --git a/...rvice/src/test/java/com/piggymetrics/notification/controller/RecipientControllerTest.java b/...rvice/src/test/java/com/piggymetrics/notification/controller/RecipientControllerTest.java
@@ -15,7 +15,7 @@
 import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
@@ -26,7 +26,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class RecipientControllerTest {
 

diff --git a/...rvice/src/test/java/com/piggymetrics/notification/repository/RecipientRepositoryTest.java b/...rvice/src/test/java/com/piggymetrics/notification/repository/RecipientRepositoryTest.java
@@ -10,7 +10,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Date;
 import java.util.List;
@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @DataMongoTest
 public class RecipientRepositoryTest {
 

diff --git a/statistics-service/src/main/java/com/piggymetrics/statistics/client/ExchangeRatesClient.java b/statistics-service/src/main/java/com/piggymetrics/statistics/client/ExchangeRatesClient.java
@@ -7,19 +7,10 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 @FeignClient(url = "${rates.url}", name = "rates-client", fallback = ExchangeRatesClientFallback.class)
 public interface ExchangeRatesClient {
 
-	default ExchangeRatesContainer getRates(Currency base) {
-		return getRates(base, Arrays.asList(Currency.values()));
-	}
-
-	@RequestMapping(method = RequestMethod.GET, value = "/latest")
-	ExchangeRatesContainer getRates(
-			@RequestParam("base") Currency base,
-			@RequestParam("symbols") Collection<Currency> currencies);
+    @RequestMapping(method = RequestMethod.GET, value = "/latest")
+    ExchangeRatesContainer getRates(@RequestParam("base") Currency base);
 
 }
diff --git a/...service/src/main/java/com/piggymetrics/statistics/client/ExchangeRatesClientFallback.java b/...service/src/main/java/com/piggymetrics/statistics/client/ExchangeRatesClientFallback.java
@@ -4,14 +4,13 @@
 import com.piggymetrics.statistics.domain.ExchangeRatesContainer;
 import org.springframework.stereotype.Component;
 
-import java.util.Collection;
 import java.util.Collections;
 
 @Component
 public class ExchangeRatesClientFallback implements ExchangeRatesClient {
 
     @Override
-    public ExchangeRatesContainer getRates(Currency base, Collection<Currency> currencies) {
+    public ExchangeRatesContainer getRates(Currency base) {
         ExchangeRatesContainer container = new ExchangeRatesContainer();
         container.setBase(Currency.getBase());
         container.setRates(Collections.emptyMap());

diff --git a/...-service/src/test/java/com/piggymetrics/statistics/StatisticsServiceApplicationTests.java b/...-service/src/test/java/com/piggymetrics/statistics/StatisticsServiceApplicationTests.java
@@ -3,9 +3,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class StatisticsServiceApplicationTests {
 

diff --git a/...ics-service/src/test/java/com/piggymetrics/statistics/client/ExchangeRatesClientTest.java b/...ics-service/src/test/java/com/piggymetrics/statistics/client/ExchangeRatesClientTest.java
@@ -6,15 +6,15 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.time.LocalDate;
-import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class ExchangeRatesClientTest {
 
@@ -30,8 +30,7 @@ public void shouldRetrieveExchangeRates() {
 		assertEquals(container.getBase(), Currency.getBase());
 
 		assertNotNull(container.getRates());
-		assertEquals(Currency.values().length, container.getRates().size());
-		assertNotNull(container.getRates().get(Currency.USD.name()));
+		assertNull(container.getRates().get(Currency.USD.name()));
 		assertNotNull(container.getRates().get(Currency.EUR.name()));
 		assertNotNull(container.getRates().get(Currency.RUB.name()));
 	}
@@ -40,14 +39,12 @@ public void shouldRetrieveExchangeRates() {
 	public void shouldRetrieveExchangeRatesForSpecifiedCurrency() {
 
 		Currency requestedCurrency = Currency.EUR;
-		ExchangeRatesContainer container = client.getRates(Currency.getBase(), Collections.singleton(requestedCurrency));
+		ExchangeRatesContainer container = client.getRates(Currency.getBase());
 
 		assertEquals(container.getDate(), LocalDate.now());
 		assertEquals(container.getBase(), Currency.getBase());
 
 		assertNotNull(container.getRates());
-		assertEquals(1, container.getRates().size());
 		assertNotNull(container.getRates().get(requestedCurrency.name()));
 	}
-
 }
diff --git a/...ervice/src/test/java/com/piggymetrics/statistics/controller/StatisticsControllerTest.java b/...ervice/src/test/java/com/piggymetrics/statistics/controller/StatisticsControllerTest.java
@@ -18,7 +18,7 @@
 import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
@@ -36,7 +36,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @SpringBootTest
 public class StatisticsControllerTest {
 

diff --git a/...service/src/test/java/com/piggymetrics/statistics/repository/DataPointRepositoryTest.java b/...service/src/test/java/com/piggymetrics/statistics/repository/DataPointRepositoryTest.java
@@ -10,15 +10,15 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @DataMongoTest
 public class DataPointRepositoryTest {
 

diff --git a/statistics-service/src/test/resources/application.yml b/statistics-service/src/test/resources/application.yml
@@ -13,4 +13,4 @@ spring:
       port: 0
 
 rates:
-  url: https://exchangeratesapi.io/api
+  url: https://api.exchangeratesapi.io
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ spring: @@
           port: 0
     rates:
-      url: https://exchangeratesapi.io/api
+      url: https://api.exchangeratesapi.io