Add code and tests for retrieving node owners

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/db/NodeStore.java

@@ -235,8 +235,9 @@ ResultSet<NodeAffiliation> getNodeAffiliations(String node
 	 * Get a list of node owners
 	 * 
 	 * @param node
+	 * @throws NodeStoreException 
 	 */
-	ArrayList<JID> getNodeOwners(String node);
+	ArrayList<JID> getNodeOwners(String node) throws NodeStoreException;
 
 	/**
 	 * Count the number of affiliations for a node

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

@@ -584,6 +584,30 @@ public ResultSet<NodeAffiliation> getNodeAffiliations(String nodeId,
 		}
 	}
 
+	@Override
+	public ArrayList<JID> getNodeOwners(String node) throws NodeStoreException {
+		PreparedStatement stmt = null;
+
+		try {
+			stmt = conn.prepareStatement(dialect
+					.selectNodeOwners());
+			stmt.setString(1, node);
+
+			java.sql.ResultSet rs = stmt.executeQuery();
+			ArrayList<JID> result = new ArrayList<JID>();
+
+			while (rs.next()) {
+				result.add(new JID(rs.getString(1)));
+			}
+
+			return result;
+		} catch (SQLException e) {
+			throw new NodeStoreException(e);
+		} finally {
+			close(stmt); // Will implicitly close the resultset if required
+		}
+	}
+	
 	@Override
 	public int countUserAffiliations(JID actorJid) throws NodeStoreException {
 		PreparedStatement selectStatement = null;
@@ -1840,6 +1864,8 @@ public void close() throws NodeStoreException {
 	public interface NodeStoreSQLDialect {
 		String insertNode();
 
+		String selectNodeOwners();
+
 		String getUserItems();
 
 		String selectItemsForLocalNodesBeforeDate();

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

@@ -25,6 +25,8 @@ public class Sql92NodeStoreDialect implements NodeStoreSQLDialect {
 	private static final String SELECT_AFFILIATIONS_FOR_USER = "SELECT \"node\", \"user\", \"affiliation\", \"updated\""
 			+ " FROM \"affiliations\" WHERE \"user\" = ? ORDER BY \"updated\" ASC";
 
+	private static final String SELECT_NODE_OWNERS = "SELECT \"user\" FROM \"affiliations\" WHERE \"node\" = ? AND \"affiliation\" = 'owner';";
+	
 	private static final String SELECT_AFFILIATION_CHANGES = ""
 			+ "SELECT \"node\", \"user\", \"affiliation\", \"updated\" FROM \"affiliations\" "
 			+ "WHERE \"updated\" >= ? AND \"updated\" <= ? AND \"node\" IN "
@@ -278,6 +280,11 @@ public String selectAffiliation() {
 	public String selectAffiliationsForUser() {
 		return SELECT_AFFILIATIONS_FOR_USER;
 	}
+	
+	@Override
+	public String selectNodeOwners() {
+		return SELECT_NODE_OWNERS;
+	}
 
 	@Override
 	public String selectAffiliationChanges() {

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

@@ -77,6 +77,8 @@ public class JDBCNodeStoreTest {
 	private static final String TEST_SERVER1_HOSTNAME = "server1";
 	private static final String TEST_SERVER2_HOSTNAME = "server2";
 
+	private static final String UNKNOWN_NODE = "/user/unknown@example.com/posts";
+
 	private static final HashMap<String, String> TEST_SERVER1_NODE1_CONF = new HashMap<String, String>() {
 		{
 			put("config1", "Value of config1");
@@ -1322,16 +1324,18 @@ public void testGetNodeItemsWithPaging() throws Exception {
 		dbTester.loadData("node_1");
 
 		long start = System.currentTimeMillis();
-		
+
 		NodeItem[] items = new NodeItem[20];
-		
+
 		for (int i = 0; i < 20; i++) {
-			items[i] = new NodeItemImpl(TEST_SERVER1_NODE1_ID, String
-					.valueOf(i), new Date(start + i * 10), "payload" + String.valueOf(i));
+			items[i] = new NodeItemImpl(TEST_SERVER1_NODE1_ID,
+					String.valueOf(i), new Date(start + i * 10), "payload"
+							+ String.valueOf(i));
 			store.addNodeItem(items[i]);
 		}
 
-		CloseableIterator<NodeItem> result = store.getNodeItems(TEST_SERVER1_NODE1_ID, "15", 3);
+		CloseableIterator<NodeItem> result = store.getNodeItems(
+				TEST_SERVER1_NODE1_ID, "15", 3);
 
 		assertEquals("Incorrect node item returned", items[14], result.next());
 		assertEquals("Incorrect node item returned", items[13], result.next());
@@ -1565,7 +1569,7 @@ public void testGetRecentItemsCanBePaged() throws Exception {
 		store.addUserSubscription(new NodeSubscriptionImpl(
 				TEST_SERVER1_NODE2_ID, TEST_SERVER1_USER1_JID,
 				Subscriptions.subscribed));
-		
+
 		long now = System.currentTimeMillis();
 
 		NodeItem nodeItem1 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "123",
@@ -1585,7 +1589,9 @@ public void testGetRecentItemsCanBePaged() throws Exception {
 		store.addNodeItem(nodeItem4);
 
 		CloseableIterator<NodeItem> items = store.getRecentItems(
-				TEST_SERVER1_USER1_JID, since, -1, 2, new GlobalItemIDImpl(TEST_SERVER1_CHANNELS_JID, TEST_SERVER1_NODE1_ID, "124"), null);
+				TEST_SERVER1_USER1_JID, since, -1, 2,
+				new GlobalItemIDImpl(TEST_SERVER1_CHANNELS_JID,
+						TEST_SERVER1_NODE1_ID, "124"), null);
 
 		assertSameNodeItem(items.next(), nodeItem3);
 		assertSameNodeItem(items.next(), nodeItem1);
@@ -1646,7 +1652,7 @@ public void testCanPageGetRecentItemsUsingResultSetManagement()
 		dbTester.loadData("node_1");
 
 		Date since = new Date();
-		
+
 		Thread.sleep(10);
 
 		store.addRemoteNode(TEST_SERVER1_NODE2_ID);
@@ -1659,8 +1665,9 @@ public void testCanPageGetRecentItemsUsingResultSetManagement()
 			store.addNodeItem(new NodeItemImpl(TEST_SERVER1_NODE1_ID, String
 					.valueOf(i), new Date(), "payload" + String.valueOf(i)));
 		}
-		
-		GlobalItemID itemID = new GlobalItemIDImpl(TEST_SERVER1_CHANNELS_JID, TEST_SERVER1_NODE1_ID, "15");
+
+		GlobalItemID itemID = new GlobalItemIDImpl(TEST_SERVER1_CHANNELS_JID,
+				TEST_SERVER1_NODE1_ID, "15");
 
 		CloseableIterator<NodeItem> items = store.getRecentItems(
 				TEST_SERVER1_USER1_JID, since, -1, 10, itemID, null);
@@ -1785,8 +1792,8 @@ public void testCanGetItemThread() throws Exception {
 	@Test
 	public void testCanGetItemThreadWithResultSetManagement() throws Exception {
 		dbTester.loadData("node_1");
-		NodeItem testItemParent = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a100",
-				new Date(100), "<entry>payload parent</entry>");
+		NodeItem testItemParent = new NodeItemImpl(TEST_SERVER1_NODE1_ID,
+				"a100", new Date(100), "<entry>payload parent</entry>");
 		NodeItem testItem1 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a6",
 				new Date(20), "<entry>payload</entry>", "a100");
 		NodeItem testItem2 = new NodeItemImpl(TEST_SERVER1_NODE1_ID, "a7",
@@ -2319,16 +2326,35 @@ private void assertSameNodeItem(NodeItem actual, NodeItem expected) {
 		assertEquals(expected.getPayload(), actual.getPayload());
 		assertEquals(expected.getInReplyTo(), actual.getInReplyTo());
 	}
-	
+
 	@Test
 	public void testSelectNodeThreads() throws Exception {
 		dbTester.loadData("node_1");
-		assertEquals(5, store.getNodeThreads(TEST_SERVER1_NODE1_ID, null, 10).size());
+		assertEquals(5, store.getNodeThreads(TEST_SERVER1_NODE1_ID, null, 10)
+				.size());
 	}
-	
+
 	@Test
 	public void testCountNodeThreads() throws Exception {
 		dbTester.loadData("node_1");
 		assertEquals(5, store.countNodeThreads(TEST_SERVER1_NODE1_ID));
 	}
+
+	@Test
+	public void testNoNodeOwnersReturnsEmptyList() throws Exception {
+		dbTester.loadData("node_1");
+		assertEquals(0, store.getNodeOwners(UNKNOWN_NODE).size());
+	}
+
+	@Test
+	public void testNodeOwnersReturnsExpectedList() throws Exception {
+		dbTester.loadData("node_1");
+		
+		store.addUserSubscription(new NodeSubscriptionImpl(TEST_SERVER1_NODE1_ID, TEST_SERVER1_USER2_JID, Subscriptions.subscribed));
+		store.setUserAffiliation(TEST_SERVER1_NODE1_ID, TEST_SERVER1_USER2_JID, Affiliations.owner);
+		
+		assertEquals(2, store.getNodeOwners(TEST_SERVER1_NODE1_ID).size());
+		assertEquals(TEST_SERVER1_USER1_JID, store.getNodeOwners(TEST_SERVER1_NODE1_ID).get(0));
+		assertEquals(TEST_SERVER1_USER2_JID, store.getNodeOwners(TEST_SERVER1_NODE1_ID).get(1));
+	}
 }