1 files changed, 39 insertions, 3 deletions

diff --git a/lib/private/TaskProcessing/Db/Task.php b/lib/private/TaskProcessing/Db/Task.php
index 1ac40327899..05c0ae9ac74 100644
--- a/lib/private/TaskProcessing/Db/Task.php
+++ b/lib/private/TaskProcessing/Db/Task.php
@@ -35,6 +35,18 @@ use OCP\TaskProcessing\Task as OCPTask;
  * @method null|string getErrorMessage()
  * @method setProgress(null|float $progress)
  * @method null|float getProgress()
+ * @method setWebhookUri(string $webhookUri)
+ * @method string getWebhookUri()
+ * @method setWebhookMethod(string $webhookMethod)
+ * @method string getWebhookMethod()
+ * @method setScheduledAt(int $scheduledAt)
+ * @method int getScheduledAt()
+ * @method setStartedAt(int $startedAt)
+ * @method int getStartedAt()
+ * @method setEndedAt(int $endedAt)
+ * @method int getEndedAt()
+ * @method setAllowCleanup(int $allowCleanup)
+ * @method int getAllowCleanup()
  */
 class Task extends Entity {
 	protected $lastUpdated;
@@ -48,16 +60,22 @@ class Task extends Entity {
 	protected $completionExpectedAt;
 	protected $errorMessage;
 	protected $progress;
+	protected $webhookUri;
+	protected $webhookMethod;
+	protected $scheduledAt;
+	protected $startedAt;
+	protected $endedAt;
+	protected $allowCleanup;
 
 	/**
 	 * @var string[]
 	 */
-	public static array $columns = ['id', 'last_updated', 'type', 'input', 'output', 'status', 'user_id', 'app_id', 'custom_id', 'completion_expected_at', 'error_message', 'progress'];
+	public static array $columns = ['id', 'last_updated', 'type', 'input', 'output', 'status', 'user_id', 'app_id', 'custom_id', 'completion_expected_at', 'error_message', 'progress', 'webhook_uri', 'webhook_method', 'scheduled_at', 'started_at', 'ended_at', 'allow_cleanup'];
 
 	/**
 	 * @var string[]
 	 */
-	public static array $fields = ['id', 'lastUpdated', 'type', 'input', 'output', 'status', 'userId', 'appId', 'customId', 'completionExpectedAt', 'errorMessage', 'progress'];
+	public static array $fields = ['id', 'lastUpdated', 'type', 'input', 'output', 'status', 'userId', 'appId', 'customId', 'completionExpectedAt', 'errorMessage', 'progress', 'webhookUri', 'webhookMethod', 'scheduledAt', 'startedAt', 'endedAt', 'allowCleanup'];
 
 
 	public function __construct() {
@@ -74,11 +92,17 @@ class Task extends Entity {
 		$this->addType('completionExpectedAt', 'datetime');
 		$this->addType('errorMessage', 'string');
 		$this->addType('progress', 'float');
+		$this->addType('webhookUri', 'string');
+		$this->addType('webhookMethod', 'string');
+		$this->addType('scheduledAt', 'integer');
+		$this->addType('startedAt', 'integer');
+		$this->addType('endedAt', 'integer');
+		$this->addType('allowCleanup', 'integer');
 	}
 
 	public function toRow(): array {
 		return array_combine(self::$columns, array_map(function ($field) {
-			return $this->{'get'.ucfirst($field)}();
+			return $this->{'get' . ucfirst($field)}();
 		}, self::$fields));
 	}
 
@@ -97,6 +121,12 @@ class Task extends Entity {
 			'customId' => $task->getCustomId(),
 			'completionExpectedAt' => $task->getCompletionExpectedAt(),
 			'progress' => $task->getProgress(),
+			'webhookUri' => $task->getWebhookUri(),
+			'webhookMethod' => $task->getWebhookMethod(),
+			'scheduledAt' => $task->getScheduledAt(),
+			'startedAt' => $task->getStartedAt(),
+			'endedAt' => $task->getEndedAt(),
+			'allowCleanup' => $task->getAllowCleanup() ? 1 : 0,
 		]);
 		return $taskEntity;
 	}
@@ -114,6 +144,12 @@ class Task extends Entity {
 		$task->setCompletionExpectedAt($this->getCompletionExpectedAt());
 		$task->setErrorMessage($this->getErrorMessage());
 		$task->setProgress($this->getProgress());
+		$task->setWebhookUri($this->getWebhookUri());
+		$task->setWebhookMethod($this->getWebhookMethod());
+		$task->setScheduledAt($this->getScheduledAt());
+		$task->setStartedAt($this->getStartedAt());
+		$task->setEndedAt($this->getEndedAt());
+		$task->setAllowCleanup($this->getAllowCleanup() !== 0);
 		return $task;
 	}
 }