#360 Ensuring disabled tasks are created as disabled

Author: rjrudin

src/main/java/com/marklogic/mgmt/api/API.java

@@ -364,8 +364,14 @@ public Role getRole() {
     }
 
     public Task task(String taskId) {
+    	return task(taskId, Group.DEFAULT_GROUP_NAME);
+    }
+
+    public Task task(String taskId, String groupId) {
         Task t = new Task(this, taskId);
-        return taskId != null && t.exists() ? getResource(taskId, new TaskManager(getManageClient()), Task.class) : t;
+        return taskId != null && t.exists() ?
+	        getResource(taskId, new TaskManager(getManageClient()), Task.class, "group-id", groupId) :
+	        t;
     }
 
     public Task getTask() {

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

@@ -135,7 +135,23 @@ public boolean exists(String resourceNameOrId, String... resourceUrlParams) {
 	@Override
 	protected SaveReceipt createNewResource(String payload, String resourceId) {
 		final String taskPath = payloadParser.getPayloadFieldValue(payload, "task-path", false);
-		return super.createNewResource(payload, taskPath);
+
+		SaveReceipt receipt = super.createNewResource(payload, taskPath);
+		updateNewTaskIfItShouldBeDisabled(payload, taskPath);
+		return receipt;
+	}
+
+	/**
+	 * This accounts for a bug in the Manage API where when a new task is created and it has task-enabled=false, the
+	 * task isn't actually disabled. So an update call is made to the task right after it's created.
+	 *
+	 * @param payload
+	 * @param taskPath
+	 * @return
+	 */
+	protected SaveReceipt updateNewTaskIfItShouldBeDisabled(String payload, String taskPath) {
+		String enabled = payloadParser.getPayloadFieldValue(payload, "task-enabled", false);
+		return "false".equals(enabled) ? super.updateResource(payload, taskPath) : null;
 	}
 
 	public List<String> getTaskPaths() {

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

@@ -0,0 +1,37 @@
+package com.marklogic.appdeployer.command.tasks;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.mgmt.api.API;
+import com.marklogic.mgmt.api.task.Task;
+import com.marklogic.mgmt.resource.tasks.TaskManager;
+import org.junit.After;
+import org.junit.Test;
+
+import java.io.File;
+
+public class DeployDisabledTaskTest extends AbstractAppDeployerTest {
+
+	private final static String TASK_PATH = "/this/should/be/disabled.xqy";
+	
+	@After
+	public void teardown() {
+		undeploySampleApp();
+		assertFalse(new TaskManager(manageClient).exists(TASK_PATH));
+	}
+
+	@Test
+	public void test() {
+		appConfig.getFirstConfigDir().setBaseDir(new File("src/test/resources/sample-app/tasks-disabled"));
+		initializeAppDeployer(new DeployScheduledTasksCommand());
+
+		TaskManager mgr = new TaskManager(manageClient);
+		assertFalse(mgr.exists(TASK_PATH));
+
+		deploySampleApp();
+
+		Task task = new API(manageClient).task(mgr.getTaskIdForTaskPath(TASK_PATH));
+		assertFalse("Due to a bug in the Manage API, when a task is first created, task-enabled is ignored " +
+			"and the task is always enabled. To work around this, if the payload has task-enabled set to false, " +
+			"then a second call should be made to ensure it gets set to false", task.getTaskEnabled());
+	}
+}

src/test/resources/sample-app/tasks-disabled/tasks/disabled-task.json

@@ -0,0 +1,14 @@
+{
+	"task-enabled": false,
+	"task-path": "/this/should/be/disabled.xqy",
+	"task-root": "/",
+	"task-type": "weekly",
+	"task-period": 2,
+	"task-day": [
+		"tuesday"
+	],
+	"task-start-time": "12:00:00",
+	"task-database": "Documents",
+	"task-modules": "",
+	"task-user": "nobody"
+}