Merge pull request #215 from surevine/issues/209

When deleting a parent item also delete its replies

Author: abmargb

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/ItemDelete.java

@@ -5,14 +5,18 @@
 import java.util.concurrent.BlockingQueue;
 
 import org.apache.log4j.Logger;
+import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.channel.ChannelManager;
+import org.buddycloud.channelserver.db.ClosableIteratorImpl;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.JabberPubsub;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubElementProcessorAbstract;
 import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
+import org.buddycloud.channelserver.pubsub.model.GlobalItemID;
 import org.buddycloud.channelserver.pubsub.model.NodeAffiliation;
 import org.buddycloud.channelserver.pubsub.model.NodeItem;
 import org.buddycloud.channelserver.pubsub.model.NodeSubscription;
+import org.buddycloud.channelserver.pubsub.model.impl.GlobalItemIDImpl;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.buddycloud.channelserver.utils.node.item.payload.Buddycloud;
 import org.dom4j.Element;
@@ -30,17 +34,14 @@ public class ItemDelete extends PubSubElementProcessorAbstract {
 
 	private static final Logger LOGGER = Logger.getLogger(ItemDelete.class);
 
-	private final BlockingQueue<Packet> outQueue;
-	private final ChannelManager channelManager;
-
-	private String itemId;
+	private GlobalItemID itemId;
 	private NodeItem nodeItem;
 	private Element parsedPayload;
 
 	public ItemDelete(BlockingQueue<Packet> outQueue,
 			ChannelManager channelManager) {
-		this.outQueue = outQueue;
-		this.channelManager = channelManager;
+		this.setOutQueue(outQueue);
+		this.setChannelManager(channelManager);
 	}
 
 	@Override
@@ -52,22 +53,24 @@ public void process(Element elm, JID actor, IQ reqIQ, Element rsm)
 		response = IQ.createResultIQ(request);
 		node = element.attributeValue("node");
 		this.actor = actor;
-		if (null == this.actor) this.actor = request.getFrom();
-		
+		if (null == this.actor) {
+			this.actor = request.getFrom();
+                }
 		if (!channelManager.isLocalNode(node)) {
 			makeRemoteRequest();
 			return;
 		}
 
 		try {
-			if (!validNodeProvided() || !nodeExists() || !itemIdProvided() 
+			if (!validNodeProvided() || !nodeExists() || !itemIdProvided()
 					|| !itemExists() || !validPayload() || !canDelete()) {
 				outQueue.put(response);
 				return;
 			}
 			deleteItem();
 			outQueue.put(response);
-			sendNotifications();
+			deleteReplies();
+			sendNotifications(node, itemId);
 			return;
 		} catch (NodeStoreException e) {
 			logger.error(e);
@@ -79,33 +82,56 @@ public void process(Element elm, JID actor, IQ reqIQ, Element rsm)
 					PacketError.Condition.bad_request);
 		} catch (IllegalArgumentException e) {
 			logger.error(e);
-			setErrorCondition(PacketError.Type.modify, PacketError.Condition.bad_request);
+			setErrorCondition(PacketError.Type.modify,
+					PacketError.Condition.bad_request);
 		}
 		outQueue.put(response);
 	}
 
-	private void sendNotifications() throws NodeStoreException {
+	private void deleteReplies() throws NodeStoreException {
+		if (null != nodeItem.getInReplyTo()) {
+			return;
+		}
+		ClosableIteratorImpl<NodeItem> replies = channelManager
+				.getNodeItemReplies(node, itemId.getItemID(), null, -1);
+		NodeItem reply = null;
+		while (replies.hasNext()) {
+			reply = replies.next();
+			channelManager.deleteNodeItemById(reply.getNodeId(), reply.getId());
+
+			sendNotifications(
+					node,
+					new GlobalItemIDImpl(new JID(this.getServerDomain()), reply
+							.getNodeId(), reply.getId()));
+		}
+	}
+
+	private void sendNotifications(String node, GlobalItemID itemId)
+			throws NodeStoreException {
 		try {
 			String notify = request.getElement().element("pubsub")
 					.element("retract").attributeValue("notify");
 
-			if ((notify != null) && (notify.equals("false") || notify.equals("0"))) {
+			if ((notify != null)
+					&& (notify.equals("false") || notify.equals("0"))) {
 				return;
 			}
 			ResultSet<NodeSubscription> subscriptions = channelManager
 					.getNodeSubscriptionListeners(node);
-			Message notification = getNotificationMessage();
+			Message notification = getNotificationMessage(node, itemId);
 
 			for (NodeSubscription subscription : subscriptions) {
-				logger.debug("Subscription [node: " + subscription.getNodeId() + ", listener: " 
-						+ subscription.getListener() + ", subscription: " + subscription.getSubscription() + "]");
+				logger.debug("Subscription [node: " + subscription.getNodeId()
+						+ ", listener: " + subscription.getListener()
+						+ ", subscription: " + subscription.getSubscription()
+						+ "]");
 				if (subscription.getSubscription().equals(
 						Subscriptions.subscribed)) {
 					notification.setTo(subscription.getListener());
 					outQueue.put(notification.createCopy());
 				}
 			}
-			
+
 			Collection<JID> admins = getAdminUsers();
 			for (JID admin : admins) {
 				notification.setTo(admin);
@@ -120,21 +146,22 @@ private void sendNotifications() throws NodeStoreException {
 		}
 	}
 
-	private Message getNotificationMessage() {
+	private Message getNotificationMessage(String node, GlobalItemID itemId) {
 		Message notification = new Message();
 		notification.setType(Message.Type.headline);
-		notification.getElement().addAttribute("remote-server-discover", "false");
+		notification.getElement().addAttribute("remote-server-discover",
+				"false");
 		Element event = notification.addChildElement("event",
 				JabberPubsub.NS_PUBSUB_EVENT);
 		Element items = event.addElement("items");
 		items.addAttribute("node", node);
 		Element retract = items.addElement("retract");
-		retract.addAttribute("id", itemId);
+		retract.addAttribute("id", itemId.getItemID());
 		return notification;
 	}
 
 	private void deleteItem() throws NodeStoreException {
-		channelManager.deleteNodeItemById(node, itemId);
+		channelManager.deleteNodeItemById(node, itemId.getItemID());
 	}
 
 	private boolean canDelete() throws NodeStoreException {
@@ -156,8 +183,8 @@ private boolean userOwnsItem() {
 	}
 
 	private boolean userManagesNode() throws NodeStoreException {
-		return channelManager.getNodeMembership(node,
-				actor).getAffiliation().canAuthorize();
+		return channelManager.getNodeMembership(node, actor).getAffiliation()
+				.canAuthorize();
 	}
 
 	private boolean validPayload() {
@@ -179,7 +206,7 @@ private boolean validPayload() {
 	}
 
 	private boolean itemExists() throws NodeStoreException {
-		nodeItem = channelManager.getNodeItem(node, itemId);
+		nodeItem = channelManager.getNodeItem(node, itemId.getItemID());
 		if (nodeItem != null) {
 			return true;
 		}
@@ -189,9 +216,16 @@ private boolean itemExists() throws NodeStoreException {
 	}
 
 	private boolean itemIdProvided() {
-		itemId = request.getElement().element("pubsub").element("retract")
+		String id = request.getElement().element("pubsub").element("retract")
 				.element("item").attributeValue("id");
-		if (itemId != null && !itemId.equals("")) {
+
+		if ((id != null) && !id.isEmpty()) {
+			if (true == GlobalItemIDImpl.isGlobalId(id)) {
+				itemId = GlobalItemIDImpl.fromBuddycloudString(id);
+			} else {
+				itemId = new GlobalItemIDImpl(new JID(this.getServerDomain()),
+						node, id);
+			}
 			return true;
 		}
 		response.setType(IQ.Type.error);
@@ -235,17 +269,15 @@ private boolean validNodeProvided() {
 		response.setChildElement(error);
 		return false;
 	}
-	
+
 	private void makeRemoteRequest() throws InterruptedException {
 		request.setTo(new JID(node.split("/")[2]).getDomain());
-		request.getElement()
-		    .element("pubsub")
-		    .addElement("actor", Buddycloud.NS)
-            .addText(actor.toBareJID());
-	    outQueue.put(request);
+		request.getElement().element("pubsub")
+				.addElement("actor", Buddycloud.NS).addText(actor.toBareJID());
+		outQueue.put(request);
 	}
 
 	public boolean accept(Element elm) {
 		return elm.getName().equals("retract");
 	}
-}
+}