From d5c1c54aa5241bd082b44c50efdfc73652ef6fb6 Mon Sep 17 00:00:00 2001
From: Lubomir Torok <lubomir.torok@beset.sk>
Date: Sat, 3 Oct 2020 21:42:06 +0200
Subject: [PATCH 1/2] Added date to CryptoUnit

---
 .../response/CryptoResponse.java               |  5 ++++-
 .../cryptocurrency/response/CryptoUnit.java    | 18 ++++++++++++++++--
 src/test/java/crypto/CryptoUnitTest.java       |  2 ++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java b/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java
index 8af5515..4c2624e 100644
--- a/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java
+++ b/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java
@@ -78,8 +78,10 @@ public CryptoResponse parse(Map<String, String> metaDataMap, Map<String, Map<Str
 
             List<CryptoUnit> cryptoUnits =  new ArrayList<>();
 
-            for (Map<String,String> m: units.values()) {
+            for (String key : units.keySet()){
+                Map<String,String> m = units.get(key);
                 CryptoUnit.Builder cryptoUnit = new CryptoUnit.Builder();
+                cryptoUnit.date(key);
                 cryptoUnit.open(Double.parseDouble(m.get("1a. open (" + market + ")" )));
                 cryptoUnit.high(Double.parseDouble(m.get("2a. high (" + market + ")" )));
                 cryptoUnit.low(Double.parseDouble(m.get("3a. low (" + market + ")" )));
@@ -92,6 +94,7 @@ public CryptoResponse parse(Map<String, String> metaDataMap, Map<String, Map<Str
                 cryptoUnit.marketCap(Double.parseDouble(m.get("6. market cap (USD)")));
                 cryptoUnits.add(cryptoUnit.build());
             }
+
             return  new CryptoResponse(metaData, cryptoUnits);
         }
     }
diff --git a/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoUnit.java b/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoUnit.java
index e44ce92..88009e6 100644
--- a/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoUnit.java
+++ b/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoUnit.java
@@ -1,6 +1,5 @@
 package com.crazzyghost.alphavantage.cryptocurrency.response;
 
-// TODO add date
 public class CryptoUnit {
 
     private double open;
@@ -13,6 +12,7 @@ public class CryptoUnit {
     private double lowUSD;
     private double volume;
     private double marketCap;
+    private String date;
 
     public CryptoUnit(Builder builder) {
         this.open       = builder.open;
@@ -25,6 +25,7 @@ public CryptoUnit(Builder builder) {
         this.lowUSD     = builder.lowUSD;
         this.volume     = builder.volume;
         this.marketCap  = builder.marketCap;
+        this.date       = builder.date;
     }
 
 
@@ -40,6 +41,7 @@ public static class Builder{
         double lowUSD;
         double volume;
         double marketCap;
+        String date;
 
         public Builder open(double open){
             this.open = open;
@@ -89,10 +91,17 @@ public Builder volume(double volume){
             return this;
         }
 
+        public Builder date(String date){
+            this.date = date;
+            return this;
+        }
+
         public CryptoUnit build(){
             return new CryptoUnit(this);
         }
 
+       
+
     }
 
     public double getOpen() {
@@ -135,10 +144,15 @@ public double getMarketCap() {
         return marketCap;
     }
 
+    public String getDate(){
+        return date;
+    }
+
     @Override
     public String toString() {
         return "\n" + "CryptoUnit {" +
-            "close=" + close + 
+            "date=" + date +
+            ", close=" + close + 
             ", closeUSD=" + closeUSD + 
             ", high=" + high + 
             ", highUSD=" + highUSD + 
diff --git a/src/test/java/crypto/CryptoUnitTest.java b/src/test/java/crypto/CryptoUnitTest.java
index fb02752..c80527e 100644
--- a/src/test/java/crypto/CryptoUnitTest.java
+++ b/src/test/java/crypto/CryptoUnitTest.java
@@ -13,6 +13,7 @@ public class CryptoUnitTest {
     public void testCryptoUnit(){
 
         CryptoUnit unit = new CryptoUnit.Builder()
+            .date("2020-04-12")
             .close(40.0)
             .closeUSD(45.0)
             .high(56.76)
@@ -25,6 +26,7 @@ public void testCryptoUnit(){
             .volume(100.0)
             .build();
 
+        assertEquals("Crypto unit date not set correctly", "2020-04-12", unit.getDate());
         assertEquals(unit.getClose(), 40.0, 0);
         assertEquals(unit.getCloseUSD(), 45.0, 0);
         assertEquals(unit.getHigh(), 56.76, 0);

From 5ff3626b910f2ade1013aae5af97517679074803 Mon Sep 17 00:00:00 2001
From: Lubomir Torok <lubomir.torok@beset.sk>
Date: Wed, 7 Oct 2020 21:22:12 +0200
Subject: [PATCH 2/2] Changed iteration from Keys to Entries

---
 .../cryptocurrency/response/CryptoResponse.java            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java b/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java
index 4c2624e..4085c5f 100644
--- a/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java
+++ b/src/main/java/com/crazzyghost/alphavantage/cryptocurrency/response/CryptoResponse.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import com.crazzyghost.alphavantage.parser.DefaultParser;
 import com.crazzyghost.alphavantage.parser.Parser;
@@ -78,10 +79,10 @@ public CryptoResponse parse(Map<String, String> metaDataMap, Map<String, Map<Str
 
             List<CryptoUnit> cryptoUnits =  new ArrayList<>();
 
-            for (String key : units.keySet()){
-                Map<String,String> m = units.get(key);
+            for (Entry<String,Map<String,String>> entry : units.entrySet()){
+                Map<String,String> m = entry.getValue();
                 CryptoUnit.Builder cryptoUnit = new CryptoUnit.Builder();
-                cryptoUnit.date(key);
+                cryptoUnit.date(entry.getKey());
                 cryptoUnit.open(Double.parseDouble(m.get("1a. open (" + market + ")" )));
                 cryptoUnit.high(Double.parseDouble(m.get("2a. high (" + market + ")" )));
                 cryptoUnit.low(Double.parseDouble(m.get("3a. low (" + market + ")" )));