Add tests + code for retrieving node item count for parent only

Author: lloydwatkin

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

@@ -1316,7 +1316,15 @@ public int countNodeItems(String nodeId, boolean parentOnly) throws NodeStoreExc
         PreparedStatement selectStatement = null;
 
         try {
-            selectStatement = conn.prepareStatement(dialect.countItemsForNode());
+            String query = dialect.countItemsForNode();
+            String parentOnlySubstitution = "";
+            if (parentOnly) {
+              parentOnlySubstitution = "AND \"in_reply_to\" IS NULL";
+            }
+            System.out.println("\n\n\n\n\n" + query.replace("%parentOnly%", parentOnlySubstitution) + " " + parentOnly);
+            selectStatement = conn.prepareStatement(
+              query.replace("%parentOnly%", parentOnlySubstitution)
+            );
             selectStatement.setString(1, nodeId);
 
             java.sql.ResultSet rs = selectStatement.executeQuery();

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

@@ -130,7 +130,7 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
     private static final String SELECT_COUNT_RECENT_ITEM_PARTS = "" + "(SELECT COUNT(\"id\") " + "FROM \"items\" " + "WHERE \"node\" = ? "
             + "AND \"updated\" > ? " + "%parentOnly% " + "LIMIT ?)";
 
-    private static final String COUNT_ITEMS_FOR_NODE = "SELECT COUNT(*)" + " FROM \"items\" WHERE \"node\" = ?";
+    private static final String COUNT_ITEMS_FOR_NODE = "SELECT COUNT(*)" + " FROM \"items\" WHERE \"node\" = ? %parentOnly%;";
 
     private static final String SELECT_ITEM_REPLIES = "" + "SELECT \"id\", \"node\", \"xml\", \"updated\", \"in_reply_to\", \"created\" "
             + "FROM \"items\" WHERE \"node\" = ? AND \"in_reply_to\" LIKE ? " + "AND \"updated\" > ? ORDER BY \"updated\" DESC";

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

@@ -259,6 +259,16 @@ public void testCountNodeItems() throws Exception {
 
         assertEquals("Incorrect item count", 5, result);
     }
+    
+    @Test
+    public void countNodeItemsWithNoReplies() throws Exception {
+      dbTester.loadData("node_1");
+      dbTester.loadData("node_4");
+
+      int result = store.countNodeItems(TEST_SERVER1_NODE1_ID, true);
+
+      assertEquals("Incorrect item count", 6, result);
+    }
 
     @Test
     public void testGetNewNodeItemsForUserBetweenDates() throws Exception {

src/test/resources/org/buddycloud/channelserver/testing/jdbc/scripts/node_1.sql

@@ -111,4 +111,4 @@ INSERT INTO "items" ("node", "id", "updated", "xml") VALUES ('users/node1@server
                   <activity:object-type>note</activity:object-type>
                 </activity:object>
              </entry>');
-             
+             

src/test/resources/org/buddycloud/channelserver/testing/jdbc/scripts/node_4.sql

@@ -0,0 +1,56 @@
+INSERT INTO "items" ("node", "id", "updated", "xml", "in_reply_to") VALUES ('users/node1@server1/posts', 'a6', TIMESTAMP '2010-01-08 11:45:12', '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/"> 
+                <published>2010-01-08T11:45:12Z</published> 
+                <author> 
+                   <name>user2@server1</name> 
+                   <jid xmlns="http://buddycloud.com/atom-elements-0">user2@server1</jid> 
+                </author> 
+                <content type="text">Test 5</content> 
+                <geoloc xmlns="http://jabber.org/protocol/geoloc"> 
+                   <text>London, England</text> 
+                   <locality>London</locality> 
+                   <country>England</country> 
+                </geoloc> 
+ 
+                <activity:verb>post</activity:verb>
+                <activity:object>
+                  <activity:object-type>note</activity:object-type>
+                </activity:object>
+             </entry>', 'a1');
+
+INSERT INTO "items" ("node", "id", "updated", "xml", "in_reply_to") VALUES ('users/node1@server1/posts', 'a7', TIMESTAMP '2010-01-06 22:32:12', '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/"> 
+                <published>2010-01-06T22:32:12Z</published> 
+                <author> 
+                   <name>user1@server1</name> 
+                   <jid xmlns="http://buddycloud.com/atom-elements-0">user1@server1</jid> 
+                </author> 
+                <content type="text">Test 2</content> 
+                <geoloc xmlns="http://jabber.org/protocol/geoloc"> 
+                   <text>Paris, France</text> 
+                   <locality>Paris</locality> 
+                   <country>France</country> 
+                </geoloc> 
+ 
+                <activity:verb>post</activity:verb>
+                <activity:object>
+                  <activity:object-type>note</activity:object-type>
+                </activity:object>
+             </entry>', 'a1');
+
+INSERT INTO "items" ("node", "id", "updated", "xml", "in_reply_to") VALUES ('users/node1@server1/posts', 'a8', TIMESTAMP '2010-01-06 22:32:12', '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:activity="http://activitystrea.ms/spec/1.0/"> 
+                <published>2010-01-06T22:32:12Z</published> 
+                <author> 
+                   <name>user1@server1</name> 
+                   <jid xmlns="http://buddycloud.com/atom-elements-0">user1@server1</jid> 
+                </author> 
+                <content type="text">Test 2</content> 
+                <geoloc xmlns="http://jabber.org/protocol/geoloc"> 
+                   <text>Paris, France</text> 
+                   <locality>Paris</locality> 
+                   <country>France</country> 
+                </geoloc> 
+ 
+                <activity:verb>post</activity:verb>
+                <activity:object>
+                  <activity:object-type>note</activity:object-type>
+                </activity:object>
+             </entry>', NULL);