#406 Task IDs are now determined based on task-root as well

Since /manage/v2/tasks returns task-type as well, could add that to the approach for matching too. But task-root is required by this ticket, which requires checking individual properties of each task with a matching task-database and task-path.

Author: rjrudin

src/main/java/com/marklogic/mgmt/resource/tasks/TaskManager.java

@@ -53,7 +53,28 @@ protected String getResourceId(String payload) {
 			format("/t:tasks-default-list/t:list-items/t:list-item[t:task-path = '%s' and t:task-database = '%s']/t:idref", taskPath, taskDatabase) :
 			format("/t:tasks-default-list/t:list-items/t:list-item[t:task-path = '%s']/t:idref", taskPath);
 
-		return getAsXml().getElementValue(xpath);
+		final List<String> resourceIds = getAsXml().getElementValues(xpath);
+		if (resourceIds == null || resourceIds.isEmpty()) {
+			return null;
+		}
+
+		// Check each matching resource ID until we fine one with the same taskRoot
+		final String taskRoot = payloadParser.getPayloadFieldValue(payload, "task-root", false);
+		if (taskRoot == null) {
+			throw new RuntimeException("Unable to determine ID for task, as multiple existing tasks have the same " +
+				"task-path and task-database, but payload is missing a task-root to determine which existing task is " +
+				"the same root; payload: " + payload);
+		}
+		for (String resourceId : resourceIds) {
+			String json = getManageClient().getJson(appendGroupId(super.getResourcesPath() + "/" + resourceId + "/properties"));
+			String thisTaskRoot = payloadParser.getPayloadFieldValue(json, "task-root", false);
+			if (taskRoot.equals(thisTaskRoot)) {
+				return resourceId;
+			}
+		}
+
+		// If no matching task has the same taskRoot, then this is a new task
+		return null;
 	}
 
 	@Override
@@ -101,11 +122,14 @@ public String getTaskIdForTaskPath(String taskPathOrTaskId) {
 		Fragment f = getAsXml();
 		String xpath = "/t:tasks-default-list/t:list-items/t:list-item[t:task-path = '%s' or t:idref = '%s']/t:idref";
 		xpath = String.format(xpath, taskPathOrTaskId, taskPathOrTaskId);
-		String id = f.getElementValue(xpath);
-		if (id == null) {
+		List<String> resourceIds = f.getElementValues(xpath);
+		if (resourceIds == null || resourceIds.isEmpty()) {
 			throw new RuntimeException("Could not find a scheduled task with a task-path or task-id of: " + taskPathOrTaskId);
 		}
-		return id;
+		if (resourceIds.size() == 1) {
+			return resourceIds.get(0);
+		}
+		throw new RuntimeException(format("Found multiple task IDs with the same task-path of %s; IDs: %s", taskPathOrTaskId, resourceIds));
 	}
 
 	/**

src/test/java/com/marklogic/appdeployer/command/tasks/DeployTasksWithSamePathTest.java

@@ -2,12 +2,18 @@
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
 import com.marklogic.mgmt.resource.tasks.TaskManager;
+import org.junit.After;
 import org.junit.Test;
 
 import java.io.File;
 
 public class DeployTasksWithSamePathTest extends AbstractAppDeployerTest {
 
+	@After
+	public void after() {
+		new TaskManager(manageClient).deleteAllScheduledTasks();
+	}
+
 	@Test
 	public void test() {
 		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/tasks-with-same-path"));
@@ -20,14 +26,23 @@ public void test() {
 
 		try {
 			deploySampleApp();
-			assertEquals("There should be 2 new tasks", initialTaskCount + 2, taskManager.getAsXml().getResourceCount());
+			assertEquals("There should be 3 new tasks; task-4.json should overwrite task 3 because it has the same " +
+				"database, module path, and task root as task-3.json", initialTaskCount + 3, taskManager.getAsXml().getResourceCount());
+
+			// Verify we get an expected error when trying to get a single task by a task-path
+			try {
+				taskManager.getTaskIdForTaskPath("/path/to/query.xqy");
+				fail("Expected an error because getTaskIdForTaskPath can't return a single ID when multiple tasks exist with the same path");
+			} catch (Exception ex) {
+				logger.info("Caught expected error because multiple tasks exist with the same path: " + ex.getMessage());
+			}
 
 			deploySampleApp();
-			assertEquals("There should still be just 2 new tasks", initialTaskCount + 2, taskManager.getAsXml().getResourceCount());
+			assertEquals("There should still be just 3 new tasks", initialTaskCount + 3, taskManager.getAsXml().getResourceCount());
 		} finally {
 			undeploySampleApp();
 
-			assertEquals("The 2 new tasks should have been deleted", initialTaskCount, taskManager.getAsXml().getResourceCount());
+			assertEquals("The 3 new tasks should have been deleted", initialTaskCount, taskManager.getAsXml().getResourceCount());
 		}
 	}
 }

src/test/resources/sample-app/tasks-with-same-path/tasks/task-3.json

@@ -0,0 +1,12 @@
+{
+   "task-enabled":true,
+   "task-path":"/path/to/query.xqy",
+   "task-root":"/differentPath",
+   "task-type":"weekly",
+   "task-period":2,
+   "task-day":["tuesday"],
+   "task-start-time":"12:00:00",
+   "task-database":"Modules",
+   "task-modules":"",
+   "task-user":"nobody"
+}

src/test/resources/sample-app/tasks-with-same-path/tasks/task-4.json

@@ -0,0 +1,12 @@
+{
+	"task-enabled":true,
+	"task-path":"/path/to/query.xqy",
+	"task-root":"/differentPath",
+	"task-type":"weekly",
+	"task-period":3,
+	"task-day":["tuesday"],
+	"task-start-time":"12:00:00",
+	"task-database":"Modules",
+	"task-modules":"",
+	"task-user":"nobody"
+}