From 3729e541723bbec3ca64997ab984ebb369f00295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= <tomasz.polgrabia@gmail.com>
Date: Wed, 28 Sep 2016 22:04:03 +0200
Subject: [PATCH] Added dtos to handle business data.

---
 app/src/main/res/layout/fragment_places.xml   |   2 +-
 .../googleutils/dto/GooglePlaceGeometry.java  |   9 ++
 .../googleutils/dto/GooglePlaceLocation.java  |  33 +++++
 .../googleutils/dto/GooglePlacePhoto.java     |  55 ++++++++
 .../googleutils/dto/GooglePlaceResult.java    | 125 ++++++++++++++++++
 .../googleutils/dto/GooglePlaceViewport.java  |  33 +++++
 .../googleutils/utils/PlacesUtils.java        |  32 ++++-
 7 files changed, 285 insertions(+), 4 deletions(-)
 create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceGeometry.java
 create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java
 create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java
 create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java
 create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java

diff --git a/app/src/main/res/layout/fragment_places.xml b/app/src/main/res/layout/fragment_places.xml
index fcee28f..6bac01d 100644
--- a/app/src/main/res/layout/fragment_places.xml
+++ b/app/src/main/res/layout/fragment_places.xml
@@ -8,7 +8,7 @@
     <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="@string/hello_blank_fragment"/>
+            android:text="@string/location_info"/>
 
     <ListView android:id="@+id/google_places"
               android:layout_width="match_parent"
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceGeometry.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceGeometry.java
new file mode 100644
index 0000000..02f47f7
--- /dev/null
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceGeometry.java
@@ -0,0 +1,9 @@
+package pl.tpolgrabia.googleutils.dto;
+
+/**
+ * Created by tpolgrabia on 28.09.16.
+ */
+public class GooglePlaceGeometry {
+    private GooglePlaceLocation location;
+    private GooglePlaceViewport viewport;
+}
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java
new file mode 100644
index 0000000..8dd2548
--- /dev/null
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java
@@ -0,0 +1,33 @@
+package pl.tpolgrabia.googleutils.dto;
+
+/**
+ * Created by tpolgrabia on 28.09.16.
+ */
+public class GooglePlaceLocation {
+    private Double latitude;
+    private Double longitude;
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    @Override
+    public String toString() {
+        return "GooglePlaceLocation{" +
+            "latitude=" + latitude +
+            ", longitude=" + longitude +
+            '}';
+    }
+}
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java
new file mode 100644
index 0000000..92dc310
--- /dev/null
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java
@@ -0,0 +1,55 @@
+package pl.tpolgrabia.googleutils.dto;
+
+import java.util.List;
+
+/**
+ * Created by tpolgrabia on 28.09.16.
+ */
+public class GooglePlacePhoto {
+    private Long height;
+    private List<String> htmlAttributions;
+    private String photoReference;
+    private Long width;
+
+    public Long getHeight() {
+        return height;
+    }
+
+    public void setHeight(Long height) {
+        this.height = height;
+    }
+
+    public List<String> getHtmlAttributions() {
+        return htmlAttributions;
+    }
+
+    public void setHtmlAttributions(List<String> htmlAttributions) {
+        this.htmlAttributions = htmlAttributions;
+    }
+
+    public String getPhotoReference() {
+        return photoReference;
+    }
+
+    public void setPhotoReference(String photoReference) {
+        this.photoReference = photoReference;
+    }
+
+    public Long getWidth() {
+        return width;
+    }
+
+    public void setWidth(Long width) {
+        this.width = width;
+    }
+
+    @Override
+    public String toString() {
+        return "GooglePlacePhoto{" +
+            "height=" + height +
+            ", htmlAttributions=" + htmlAttributions +
+            ", photoReference='" + photoReference + '\'' +
+            ", width=" + width +
+            '}';
+    }
+}
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java
new file mode 100644
index 0000000..d1c959d
--- /dev/null
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java
@@ -0,0 +1,125 @@
+package pl.tpolgrabia.googleutils.dto;
+
+import java.util.List;
+
+/**
+ * Created by tpolgrabia on 28.09.16.
+ */
+public class GooglePlaceResult {
+    private GooglePlaceGeometry geometry;
+    private String icon;
+    private String id;
+    private String name;
+    private List<GooglePlacePhoto> photos;
+    private String placeId;
+    private Double rating;
+    private String reference;
+    private String scope;
+    private List<String> types;
+    private String vicinity;
+
+    public GooglePlaceGeometry getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(GooglePlaceGeometry geometry) {
+        this.geometry = geometry;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<GooglePlacePhoto> getPhotos() {
+        return photos;
+    }
+
+    public void setPhotos(List<GooglePlacePhoto> photos) {
+        this.photos = photos;
+    }
+
+    public String getPlaceId() {
+        return placeId;
+    }
+
+    public void setPlaceId(String placeId) {
+        this.placeId = placeId;
+    }
+
+    public Double getRating() {
+        return rating;
+    }
+
+    public void setRating(Double rating) {
+        this.rating = rating;
+    }
+
+    public String getReference() {
+        return reference;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public List<String> getTypes() {
+        return types;
+    }
+
+    public void setTypes(List<String> types) {
+        this.types = types;
+    }
+
+    public String getVicinity() {
+        return vicinity;
+    }
+
+    public void setVicinity(String vicinity) {
+        this.vicinity = vicinity;
+    }
+
+    @Override
+    public String toString() {
+        return "GooglePlaceResult{" +
+            "geometry=" + geometry +
+            ", icon='" + icon + '\'' +
+            ", id='" + id + '\'' +
+            ", name='" + name + '\'' +
+            ", photos=" + photos +
+            ", placeId='" + placeId + '\'' +
+            ", rating=" + rating +
+            ", reference='" + reference + '\'' +
+            ", scope='" + scope + '\'' +
+            ", types=" + types +
+            ", vicinity='" + vicinity + '\'' +
+            '}';
+    }
+}
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java
new file mode 100644
index 0000000..1a8e84a
--- /dev/null
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java
@@ -0,0 +1,33 @@
+package pl.tpolgrabia.googleutils.dto;
+
+/**
+ * Created by tpolgrabia on 28.09.16.
+ */
+public class GooglePlaceViewport {
+    private GooglePlaceLocation northEast;
+    private GooglePlaceLocation southWest;
+
+    public GooglePlaceLocation getNorthEast() {
+        return northEast;
+    }
+
+    public void setNorthEast(GooglePlaceLocation northEast) {
+        this.northEast = northEast;
+    }
+
+    public GooglePlaceLocation getSouthWest() {
+        return southWest;
+    }
+
+    public void setSouthWest(GooglePlaceLocation southWest) {
+        this.southWest = southWest;
+    }
+
+    @Override
+    public String toString() {
+        return "GooglePlaceViewport{" +
+            "northEast=" + northEast +
+            ", southWest=" + southWest +
+            '}';
+    }
+}
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java
index 40d4fdb..f24921a 100644
--- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java
@@ -5,12 +5,17 @@ import com.androidquery.AQuery;
 import com.androidquery.callback.AjaxCallback;
 import com.androidquery.callback.AjaxStatus;
 import com.google.gson.JsonObject;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created by tpolgrabia on 27.09.16.
  */
 public class PlacesUtils {
 
+    private static final Logger lg = LoggerFactory.getLogger(PlacesUtils.class);
+
     private final Context ctx;
     private final String apiKey;
     private final AQuery aq;
@@ -46,10 +51,31 @@ public class PlacesUtils {
         }
 
         aq.ajax(queryUrl,
-            JsonObject.class, new AjaxCallback<JsonObject>() {
+            JSONObject.class, new AjaxCallback<JSONObject>() {
                 @Override
-                public void callback(String url, JsonObject object, AjaxStatus status) {
-                    super.callback(url, object, status);
+                public void callback(String url, JSONObject object, AjaxStatus status) {
+                    lg.trace("Url: {}, object: {}, status: {}", url, object, status);
+
+                    int statusCode = status.getCode();
+                    String statusMessage = status.getMessage();
+                    String statusError = status.getError();
+
+                    if (statusCode != 200) {
+                        lg.error("Invalid status code: {}, message: {}, error: {}",
+                            statusCode,
+                            statusMessage,
+                            statusError);
+                        return;
+                    }
+
+                    String googleStatus = object.optString("status");
+                    if (!"OK".equals(googleStatus)) {
+                        lg.error("Invalid google status: {}", googleStatus);
+                        return;
+                    }
+
+
+
                 }
             });
     }