From 49662b1b866e4d722cc3a046fc9834796cbd953b Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 10 May 2014 19:28:02 +0200
Subject: user: Add verified, description, fix coordinates type

---
 src/data/User.java                            | 2 ++
 src/database/NamedPreparedStatement.java      | 6 ++++++
 src/database/QueryUtils.java                  | 7 +++++--
 test/data/ValidatingJsonDeserializerTest.java | 4 ++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/data/User.java b/src/data/User.java
index 61de759..2584391 100644
--- a/src/data/User.java
+++ b/src/data/User.java
@@ -21,6 +21,8 @@ public class User {
     @ValidatingJsonDeserializer.Validator
     public Entities entities;
     public String lang;
+    public String description;
+    public boolean verified;
 
     public static class Entities {
 
diff --git a/src/database/NamedPreparedStatement.java b/src/database/NamedPreparedStatement.java
index 089e2c7..c899376 100644
--- a/src/database/NamedPreparedStatement.java
+++ b/src/database/NamedPreparedStatement.java
@@ -76,6 +76,12 @@ public class NamedPreparedStatement {
         }
     }
 
+    public void setBoolean(String name, boolean b) throws SQLException {
+        for (int paramIndex : getParamIndices(name)) {
+            stmt.setBoolean(paramIndex, b);
+        }
+    }
+
     public PreparedStatement getStmt() {
         return stmt;
     }
diff --git a/src/database/QueryUtils.java b/src/database/QueryUtils.java
index eaf6a2d..c307b40 100644
--- a/src/database/QueryUtils.java
+++ b/src/database/QueryUtils.java
@@ -15,12 +15,13 @@ public class QueryUtils {
             = buildQuery("twitteruser", new String[]{"userid"},
             "userid", "displayname", "timezone", "tweetcount", "followercount",
             "followedcount", "location", "tweetname", "createdat::timestamptz",
-            "language");
+            "language", "description", "verified");
 
     public final static String insertTweet
             = buildQuery("tweet", new String[]{"tweetid"},
             "tweetid", "createdat::timestamptz", "favcount", "retweetcount",
-            "text", "coordinates", "language", "retweetid", "replyid", "place",
+            "text", "coordinates::point",
+            "language", "retweetid", "replyid", "place",
             "userid");
 
     public final static String insertHash
@@ -131,6 +132,8 @@ public class QueryUtils {
         profileStatement.setString("tweetname", twuser.screen_name);
         profileStatement.setTimestamp("createdat", twuser.created_at);
         profileStatement.setString("language", twuser.lang);
+        profileStatement.setString("description", twuser.description);
+        profileStatement.setBoolean("verified", twuser.verified);
     }
 
     public static void setInsertBrandParams(NamedPreparedStatement brandStmt,
diff --git a/test/data/ValidatingJsonDeserializerTest.java b/test/data/ValidatingJsonDeserializerTest.java
index 459042f..214f33f 100644
--- a/test/data/ValidatingJsonDeserializerTest.java
+++ b/test/data/ValidatingJsonDeserializerTest.java
@@ -355,6 +355,8 @@ public class ValidatingJsonDeserializerTest {
         entities.add("url", urlEntity);
         user.add("entities", entities);
         user.addProperty("lang", "X");
+        user.addProperty("description", "X");
+        user.addProperty("verified", false);
         return user;
     }
 
@@ -516,6 +518,8 @@ public class ValidatingJsonDeserializerTest {
         checkImpairedUser("screen_name");
         checkImpairedUser("created_at");
         checkImpairedUser("lang");
+        checkImpairedUser("description");
+        checkImpairedUser("verified");
     }
 
     @Test
-- 
cgit v1.2.1