Merge pull request #284 from buddycloud/issue-281

Fixes #281

Author: lloydwatkin

src/main/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStore.java

@@ -401,7 +401,29 @@ public ResultSet<NodeAffiliation> getAffiliationChanges(JID user, Date startDate
 
     @Override
     public ResultSet<NodeMembership> getUserMemberships(JID jid) throws NodeStoreException {
-      return getUserMemberships(jid, false);
+      PreparedStatement stmt = null;
+      try {
+          stmt = conn.prepareStatement(dialect.selectUserMemberships());
+          stmt.setString(1, jid.toBareJID());
+          java.sql.ResultSet rs = stmt.executeQuery();
+
+          ArrayList<NodeMembership> result = new ArrayList<NodeMembership>();
+          while (rs.next()) {
+              JID inviter = null;
+              if (null != rs.getString(6)) {
+                  inviter = new JID(rs.getString(6));
+              }
+              NodeMembershipImpl membership =
+                      new NodeMembershipImpl(rs.getString(1), new JID(rs.getString(2)), new JID(rs.getString(3)),
+                              Subscriptions.valueOf(rs.getString(4)), Affiliations.valueOf(rs.getString(5)), inviter, rs.getTimestamp(7));
+              result.add(membership);
+          }
+          return new ResultSetImpl<NodeMembership>(result);
+      } catch (SQLException e) {
+          throw new NodeStoreException(e);
+      } finally {
+          close(stmt); // Will implicitly close the resultset if required
+      }
     }
 
     @Override
@@ -473,7 +495,7 @@ private static String getCollectionStatement(int collectionLength) {
     public ResultSet<NodeMembership> getUserMemberships(JID jid, boolean ephemeral) throws NodeStoreException {
         PreparedStatement stmt = null;
         try {
-            String sql = dialect.selectUserMemberships();
+            String sql = dialect.selectUserMembershipsFilteredByEphemeral();
             String replace = "IS NULL OR \"node_config\".\"value\" != 'true'";
             if (ephemeral) {
               replace = "= 'true'";
@@ -1058,6 +1080,11 @@ public CloseableIterator<NodeItem> getRecentItems(JID user, Date since, int maxP
 
             ResultSet<NodeMembership> subscriptions = this.getUserMemberships(user);
 
+            if (subscriptions == null || subscriptions.isEmpty()) {
+                return new ClosableIteratorImpl<NodeItem>(
+                    new ArrayList<NodeItem>().iterator());
+            }
+            
             ArrayList<String> queryParts = new ArrayList<String>();
             ArrayList<Object> parameters = new ArrayList<Object>();
 
@@ -1881,6 +1908,8 @@ public interface NodeStoreSQLDialect {
 
         String selectUserMemberships();
 
+        String selectUserMembershipsFilteredByEphemeral();
+        
         String selectUserMembershipsWithConfiguration();
 
         String selectMembership();

src/main/java/org/buddycloud/channelserver/db/jdbc/dialect/Sql92NodeStoreDialect.java

@@ -263,7 +263,7 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
             + "ON \"subscriptions\".\"node\" = \"affiliations\".\"node\" AND \"affiliations\".\"user\" = \"subscriptions\".\"user\" " + "WHERE "
             + "(\"subscriptions\".\"user\" = ? AND \"subscriptions\".\"node\" =  ?) " + "ORDER BY \"updated\" DESC; ";
 
-    private static final String SELECT_USER_MEMBERSHIPS = "" + "SELECT " + "CASE WHEN \"subscriptions\".\"node\" != '' "
+    private static final String SELECT_USER_MEMBERSHIPS_FILTERED_BY_EPHEMERAL = "" + "SELECT " + "CASE WHEN \"subscriptions\".\"node\" != '' "
             + "THEN \"subscriptions\".\"node\" " + "ELSE \"affiliations\".\"node\" " + "END AS \"node\"," + "CASE WHEN \"subscriptions\".\"user\" != '' "
             + "THEN \"subscriptions\".\"user\" " + "ELSE \"affiliations\".\"user\" " + "END AS \"user\", " + "CASE "
             + "WHEN \"subscriptions\".\"listener\" != '' THEN \"subscriptions\".\"listener\" "
@@ -281,6 +281,22 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
             + "AND (\"node_config\".\"value\" %equals%)"
             + "ORDER BY \"updated\" DESC; ";
 
+    private static final String SELECT_USER_MEMBERSHIPS = "" + "SELECT " + "CASE WHEN \"subscriptions\".\"node\" != '' "
+            + "THEN \"subscriptions\".\"node\" " + "ELSE \"affiliations\".\"node\" " + "END AS \"node\"," + "CASE WHEN \"subscriptions\".\"user\" != '' "
+            + "THEN \"subscriptions\".\"user\" " + "ELSE \"affiliations\".\"user\" " + "END AS \"user\", " + "CASE "
+            + "WHEN \"subscriptions\".\"listener\" != '' THEN \"subscriptions\".\"listener\" "
+            + "WHEN \"subscriptions\".\"user\" != '' THEN \"subscriptions\".\"user\" " + "ELSE \"affiliations\".\"user\" " + "END AS \"listener\", "
+            + "CASE WHEN \"subscriptions\".\"subscription\" != '' " + "THEN \"subscriptions\".\"subscription\" " + "ELSE 'none' "
+            + "END AS \"subscription\", " + "CASE WHEN \"affiliations\".\"affiliation\" != '' " + "THEN \"affiliations\".\"affiliation\" "
+            + "ELSE 'none' " + "END AS \"affiliation\", " + "\"subscriptions\".\"invited_by\" AS \"invited_by\","
+            + "CASE WHEN \"affiliations\".\"updated\" > \"subscriptions\".\"updated\" " + "THEN \"affiliations\".\"updated\" "
+            + "ELSE \"subscriptions\".\"updated\" " + "END AS \"updated\" " + "FROM \"subscriptions\" " 
+            
+            + "LEFT JOIN \"affiliations\" "
+            + "ON \"subscriptions\".\"node\" = \"affiliations\".\"node\" AND \"affiliations\".\"user\" = \"subscriptions\".\"user\" " + "WHERE "
+            + "(\"subscriptions\".\"user\" = ?) " 
+            + "ORDER BY \"updated\" DESC; ";
+    
     private static final String SELECT_USER_MEMBERSHIPS_WITH_CONFIGURATION = "SELECT " +
             "CASE WHEN \"subscriptions\".\"node\" != '' THEN " +
                 "\"subscriptions\".\"node\" " + 
@@ -692,6 +708,11 @@ public String selectMembership() {
         return SELECT_NODE_MEMBERSHIP;
     }
 
+    @Override
+    public String selectUserMembershipsFilteredByEphemeral() {
+        return SELECT_USER_MEMBERSHIPS_FILTERED_BY_EPHEMERAL;
+    }
+    
     @Override
     public String selectUserMemberships() {
         return SELECT_USER_MEMBERSHIPS;

src/test/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStoreRecentItemsTest.java

@@ -47,6 +47,32 @@ public void testGetRecentItems() throws Exception {
         assertSameNodeItem(items.next(), nodeItem1);
         assertEquals(false, items.hasNext());
     }
+    
+    @Test
+    public void testGetRecentItemsNoSubscriptions() throws Exception {
+        CloseableIterator<NodeItem> items = store.getRecentItems(
+            TEST_SERVER1_USER1_JID, new Date(), -1, -1, null, null, false);
+        assertEquals(false, items.hasNext());
+    }
+    
+    @Test
+    public void testGetRecentItemsFromEphemeralNode() throws Exception {
+
+        Date since = new Date();
+        dbTester.loadData("node_1");
+        store.setNodeConfValue(TEST_SERVER1_NODE1_ID, "buddycloud#ephemeral", "true");
+
+        NodeItem nodeItem1 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "123", new Date(), "payload");
+        store.addNodeItem(nodeItem1);
+
+        Thread.sleep(20);
+
+        CloseableIterator<NodeItem> items = store.getRecentItems(TEST_SERVER1_USER1_JID, since, -1, -1, null, null, false);
+
+        // 2 -> 1 on purpose results are most recent first!
+        assertSameNodeItem(items.next(), nodeItem1);
+        assertEquals(false, items.hasNext());
+    }
 
     @Test
     public void testGetRecentItemsCanBePaged() throws Exception {