From f9d5099bf4be816aa267e02b5713a672fd4da562 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 15 Jan 2016 14:49:51 +0300
Subject: spring-jdbc WIP

---
 deps/com.juick.server                       |  2 +-
 src/main/java/com/juick/api/Messages.java   | 12 ++++++------
 src/test/java/com/juick/tests/ApiTests.java |  9 +++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/deps/com.juick.server b/deps/com.juick.server
index 1ef890d2..2635d618 160000
--- a/deps/com.juick.server
+++ b/deps/com.juick.server
@@ -1 +1 @@
-Subproject commit 1ef890d21db2ed9aeefc37b71ff82d0f59df8516
+Subproject commit 2635d6187ecd48c732d21e4f510f1df8451ce646
diff --git a/src/main/java/com/juick/api/Messages.java b/src/main/java/com/juick/api/Messages.java
index e3dcabfd..fb9be051 100644
--- a/src/main/java/com/juick/api/Messages.java
+++ b/src/main/java/com/juick/api/Messages.java
@@ -82,7 +82,7 @@ public class Messages {
     }
 
     public void doGetRecommended(HttpServletRequest request, HttpServletResponse response, int vuid) throws ServletException, IOException {
-        /*int before_mid = Utils.parseInt(request.getParameter("before_mid"), 0);
+        int before_mid = Utils.parseInt(request.getParameter("before_mid"), 0);
 
         List<Integer> mids = MessagesQueries.getUserRecommendations(sql, vuid, before_mid);
         if (mids != null && !mids.isEmpty()) {
@@ -95,21 +95,21 @@ public class Messages {
             }
         } else {
             response.sendError(404);
-        }*/
+        }
     }
 
     public void doSetPrivacy(HttpServletRequest request, HttpServletResponse response, Stream xmpp, int vuid) throws ServletException, IOException {
-        /*int mid = Utils.parseInt(request.getParameter("mid"), 0);
+        int mid = Utils.parseInt(request.getParameter("mid"), 0);
         com.juick.User user = MessagesQueries.getMessageAuthor(sql, mid);
         if (user != null && user.UID == vuid && MessagesQueries.setMessagePrivacy(sql, mid)) {
             Main.replyJSON(request, response, "{\"status\":\"ok\"}");
         } else {
             response.sendError(400);
-        }*/
+        }
     }
 
     public void doSetPopular(HttpServletRequest request, HttpServletResponse response, Stream xmpp) throws ServletException, IOException {
-        /*int mid = Utils.parseInt(request.getParameter("mid"), 0);
+        int mid = Utils.parseInt(request.getParameter("mid"), 0);
         int popular = Utils.parseInt(request.getParameter("popular"), 0);
 
         if (mid > 0) {
@@ -141,6 +141,6 @@ public class Messages {
             }
 
             Main.replyJSON(request, response, "{\"status\":\"ok\"}");
-        }*/
+        }
     }
 }
diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java
index f111ffc7..e67c23f2 100644
--- a/src/test/java/com/juick/tests/ApiTests.java
+++ b/src/test/java/com/juick/tests/ApiTests.java
@@ -1,7 +1,9 @@
 package com.juick.tests;
 
+import com.juick.Message;
 import com.juick.User;
 import com.juick.server.UserQueries;
+import com.juick.server.MessagesQueries;
 import junit.framework.Assert;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.Before;
@@ -38,4 +40,11 @@ public class ApiTests {
         User user = UserQueries.getUserByUID(jdbc, 3694);
         Assert.assertEquals("it should be me", "vt", user.UName);
     }
+    
+    @Test void messageTests() {
+        Message msg = MessagesQueries.getMessage(jdbc, 2817722);
+        User ugnich = msg.User;
+        Assert.assertEquals("ugnich", ugnich.UName);
+        Assert.assertEquals("Microsoft", msg.Tags.get(0));
+    }
 }
-- 
cgit v1.2.3