service: merge Day and CountryDay

Author: imkiva

src/main/java/com/nonstop/covid19/api/CountryDay.java

@@ -4,6 +4,7 @@
 import java.util.Locale;
 
 public class Day {
+    private String country;
     private Date date;
     private int confirmed;
     private int deaths;
@@ -12,10 +13,15 @@ public class Day {
     @Override
     public String toString() {
         return String.format(Locale.getDefault(),
-                "%s { confirmed: %d, deaths: %d, recovered: %d }",
+                "%s %s { confirmed: %d, deaths: %d, recovered: %d }",
+                isGlobal() ? "Global" : getCountry(),
                 date.toString(), confirmed, deaths, recovered);
     }
 
+    public String getCountry() {
+        return country;
+    }
+
     public Date getDate() {
         return date;
     }
@@ -31,4 +37,8 @@ public int getDeaths() {
     public int getRecovered() {
         return recovered;
     }
+
+    public boolean isGlobal() {
+        return getCountry() == null;
+    }
 }

src/main/java/com/nonstop/covid19/api/Day.java

@@ -17,10 +17,10 @@ public interface VirusService {
     Call<List<Day>> allDays();
 
     @GET("countries")
-    Call<List<CountryDay>> allCountries();
+    Call<List<Day>> allCountries();
 
     @GET("countries")
-    Call<List<CountryDay>> country(@Query("filter[country]") String countryName);
+    Call<List<Day>> country(@Query("filter[country]") String countryName);
 
     String BASE_URL = "http://covid-19api.com/api/";