finalizando consumo dos indicators

rodrigos0ares · Aug 7, 2021 · 89eb731 · 89eb731
1 parent 3346bea
commit 89eb731
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 61 deletions.
diff --git a/bff/src/main/java/org/worldbank/indicator/Indicator.java b/bff/src/main/java/org/worldbank/indicator/Indicator.java
@@ -6,9 +6,10 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Indicator {
 
-    @JsonProperty("iso2Code")
+    @JsonProperty("countryiso3code")
     private String code;
-    private String name;
+    private Integer date;
+    private Double value;
 
     public String getCode() {
         return code;
@@ -18,11 +19,19 @@ public void setCode(String code) {
         this.code = code;
     }
 
-    public String getName() {
-        return name;
+    public Integer getDate() {
+        return date;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setDate(Integer date) {
+        this.date = date;
+    }
+
+    public Double getValue() {
+        return value;
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
     }
 }
diff --git a/bff/src/main/java/org/worldbank/indicator/IndicatorBean.java b/bff/src/main/java/org/worldbank/indicator/IndicatorBean.java
@@ -25,13 +25,13 @@ public List<Indicator> list(String code){
         String result = response.readEntity(String.class);
         JSONArray objects = new JSONArray(result);
 
-        String o = objects.getJSONObject(0).toString();
-        String o2 = objects.getJSONArray(1).toString();
+        //@TODO o item 0 pussui o valores para paginacao
+        String jsonArray = objects.getJSONArray(1).toString();
         List<Indicator> indicators = Collections.emptyList();
 
         try {
             ObjectMapper mapper = new ObjectMapper();
-            indicators = mapper.readValue(o2, new TypeReference<>() {});
+            indicators = mapper.readValue(jsonArray, new TypeReference<>() {});
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }

diff --git a/bff/src/main/java/org/worldbank/indicator/Indicators.java b/bff/src/main/java/org/worldbank/indicator/Indicators.java
diff --git a/bff/src/test/java/org/worldbank/indicator/IndicatorResourceTest.java b/bff/src/test/java/org/worldbank/indicator/IndicatorResourceTest.java
@@ -16,7 +16,7 @@ public void list() throws InterruptedException {
         given()
                 .when().get("/indicators/CN")
                 .then()
-                .statusCode(204)
+                .statusCode(200)
                 .body("size()", is(greaterThanOrEqualTo(1)));
     }