fix: delete background jobs by id when cleaning up

Signed-off-by: Robin Appelman <[email protected]>

lib/private/BackgroundJob/JobList.php

@@ -135,7 +135,7 @@ public function remove($job, $argument = null): void {
 		}
 	}
 
-	protected function removeById(int $id): void {
+	public function removeById(int $id): void {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('jobs')
 			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));

lib/public/BackgroundJob/IJobList.php

@@ -79,6 +79,14 @@ public function scheduleAfter(string $job, int $runAfter, $argument = null): voi
 	 */
 	public function remove($job, $argument = null): void;
 
+	/**
+	 * Remove a job from the list by id
+	 *
+	 * @param int $id
+	 * @since 30.0.0
+	 */
+	public function removeById(int $id): void;
+
 	/**
 	 * check if a job is in the list
 	 *

lib/public/BackgroundJob/QueuedJob.php

@@ -53,7 +53,11 @@ final public function execute($jobList, ILogger $logger = null) {
 	 * @since 25.0.0
 	 */
 	final public function start(IJobList $jobList): void {
-		$jobList->remove($this, $this->argument);
+		if ($this->id) {
+			$jobList->removeById($this->id);
+		} else {
+			$jobList->remove($this, $this->argument);
+		}
 		parent::start($jobList);
 	}
 }