fix: Delete files on submission/question/form deletion

lib/BackgroundJob/DeleteQuestionFoldersJob.php

@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Forms\BackgroundJob;
+
+use OCA\Forms\Helper\FilePathHelper;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\QueuedJob;
+use OCP\Files\Folder;
+use OCP\Files\NotFoundException;
+use Psr\Log\LoggerInterface;
+
+class DeleteQuestionFoldersJob extends QueuedJob {
+	public function __construct(
+		ITimeFactory $time,
+		private FilePathHelper $filePathHelper,
+		private LoggerInterface $logger,
+	) {
+		parent::__construct($time);
+	}
+
+	/**
+	 * @param array{formId: int, questionId: int, ownerId: string} $argument
+	 */
+	public function run($argument): void {
+		$formId = $argument['formId'];
+		$questionId = $argument['questionId'];
+		$ownerId = $argument['ownerId'];
+
+		try {
+			$this->logger->debug('Deleting question folders for question {questionId} in form {formId}', [
+				'questionId' => $questionId,
+				'formId' => $formId,
+			]);
+
+			$formFolders = $this->filePathHelper->getAllFormFoldersById($formId, $ownerId);
+			if (empty($formFolders)) {
+				$this->logger->notice('Form folder not found, nothing to delete', [
+					'formId' => $formId,
+				]);
+				return;
+			}
+
+			$questionFolderPrefix = $questionId . ' - ';
+			$deletedCount = 0;
+
+			// Iterate through all form folders (handles form renames)
+			foreach ($formFolders as $formFolder) {
+				// Iterate through submission folders and delete matching question folders
+				foreach ($formFolder->getDirectoryListing() as $submissionFolder) {
+					if (!$submissionFolder instanceof Folder) {
+						continue;
+					}
+					foreach ($submissionFolder->getDirectoryListing() as $questionFolder) {
+						if (str_starts_with($questionFolder->getName(), $questionFolderPrefix)) {
+							$questionFolder->delete();
+							$deletedCount++;
+						}
+					}
+				}
+			}
+
+			$this->logger->info('Deleted {count} question folders for question {questionId}', [
+				'count' => $deletedCount,
+				'questionId' => $questionId,
+				'formId' => $formId,
+			]);
+		} catch (NotFoundException) {
+			// Folder doesn't exist, do nothing
+			$this->logger->notice('Question folder not found, nothing to delete', [
+				'questionId' => $questionId,
+				'formId' => $formId,
+			]);
+		} catch (\Throwable $e) {
+			$this->logger->warning('Failed to delete question folders: {error}', [
+				'error' => $e->getMessage(),
+				'questionId' => $questionId,
+				'formId' => $formId,
+			]);
+		}
+	}
+}

lib/Controller/ApiController.php

@@ -7,6 +7,7 @@
 
 namespace OCA\Forms\Controller;
 
+use OCA\Forms\BackgroundJob\DeleteQuestionFoldersJob;
 use OCA\Forms\BackgroundJob\SyncSubmissionsWithLinkedFileJob;
 use OCA\Forms\Constants;
 use OCA\Forms\Db\Answer;
@@ -45,6 +46,7 @@
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
 use OCP\BackgroundJob\IJobList;
+use OCP\Files\Folder;
 use OCP\Files\IMimeTypeDetector;
 use OCP\Files\IRootFolder;
 use OCP\IL10N;
@@ -743,6 +745,14 @@ public function deleteQuestion(int $formId, int $questionId): DataResponse {
 		$question->setOrder(0);
 		$this->questionMapper->update($question);
 
+		if ($question->getType() === Constants::ANSWER_TYPE_FILE) {
+			$this->jobList->add(DeleteQuestionFoldersJob::class, [
+				'formId' => $form->getId(),
+				'questionId' => $question->getId(),
+				'ownerId' => $form->getOwnerId(),
+			]);
+		}
+
 		// Update all question-order > deleted order.
 		$formQuestions = $this->questionMapper->findByForm($formId);
 		foreach ($formQuestions as $question) {
@@ -1589,7 +1599,7 @@ public function deleteSubmission(int $formId, int $submissionId): DataResponse {
 		}
 
 		// Delete submission (incl. Answers)
-		$this->submissionMapper->deleteById($submissionId);
+		$this->submissionMapper->deleteById($form, $submissionId);
 		$this->formMapper->update($form);
 
 		return new DataResponse($submissionId);
@@ -1743,8 +1753,7 @@ public function uploadFiles(int $formId, int $questionId, string $shareHash = ''
 			} else {
 				$folder = $userFolder->newFolder($path);
 			}
-			/** @var \OCP\Files\Folder $folder */
-
+			/** @var Folder $folder */
 			$fileName = $folder->getNonExistingName($uploadedFile['name']);
 			$file = $folder->newFile($fileName, file_get_contents($uploadedFile['tmp_name']));
 
@@ -1819,8 +1828,7 @@ private function storeAnswersForQuestion(Form $form, $submissionId, array $quest
 				} else {
 					$folder = $userFolder->newFolder($path);
 				}
-				/** @var \OCP\Files\Folder $folder */
-
+				/** @var Folder $folder */
 				$file = $userFolder->getById($uploadedFile->getFileId())[0];
 				$name = $folder->getNonExistingName($file->getName());
 				$file->move($folder->getPath() . '/' . $name);

lib/Controller/ShareApiController.php

@@ -14,6 +14,7 @@
 use OCA\Forms\Db\FormMapper;
 use OCA\Forms\Db\Share;
 use OCA\Forms\Db\ShareMapper;
+use OCA\Forms\Helper\FilePathHelper;
 use OCA\Forms\ResponseDefinitions;
 use OCA\Forms\Service\CirclesService;
 use OCA\Forms\Service\ConfigService;
@@ -62,6 +63,7 @@ public function __construct(
 		private ISecureRandom $secureRandom,
 		private CirclesService $circlesService,
 		private IRootFolder $rootFolder,
+		private FilePathHelper $filePathHelper,
 		private IManager $shareManager,
 	) {
 		parent::__construct($appName, $request);
@@ -273,7 +275,7 @@ public function updateShare(int $formId, int $shareId, array $keyValuePairs): Da
 		if (in_array($formShare->getShareType(), [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_USERGROUP, IShare::TYPE_CIRCLE], true)) {
 			if (in_array(Constants::PERMISSION_RESULTS, $keyValuePairs['permissions'], true)) {
 				$userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
-				$uploadedFilesFolderPath = $this->formsService->getFormUploadedFilesFolderPath($form);
+				$uploadedFilesFolderPath = $this->filePathHelper->getFormUploadedFilesFolderPath($form);
 				try {
 					/** @var \OCP\Files\Folder $folder */
 					$folder = $userFolder->get($uploadedFilesFolderPath);
@@ -358,7 +360,7 @@ private function removeUploadedFilesShare(Form $form, Share $formShare): void {
 		}
 
 		$userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
-		$uploadedFilesFolderPath = $this->formsService->getFormUploadedFilesFolderPath($form);
+		$uploadedFilesFolderPath = $this->filePathHelper->getFormUploadedFilesFolderPath($form);
 		try {
 			$folder = $userFolder->get($uploadedFilesFolderPath);
 		} catch (NotFoundException $e) {

lib/Db/FormMapper.php

@@ -8,13 +8,16 @@
 namespace OCA\Forms\Db;
 
 use OCA\Forms\Constants;
+use OCA\Forms\Helper\FilePathHelper;
 use OCA\Forms\Service\ConfigService;
 use OCP\AppFramework\Db\Entity;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\Comments\ICommentsManager;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\Files\Folder;
 use OCP\IDBConnection;
 use OCP\Share\IShare;
+use Psr\Log\LoggerInterface;
 
 /**
  * @extends QBMapper<Form>
@@ -32,6 +35,8 @@ public function __construct(
 		private SubmissionMapper $submissionMapper,
 		private ConfigService $configService,
 		private ICommentsManager $commentsManager,
+		private FilePathHelper $filePathHelper,
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($db, 'forms_v2_forms', Form::class);
 	}
@@ -224,6 +229,33 @@ public function deleteForm(Form $form): void {
 		$this->shareMapper->deleteByForm($formId);
 		$this->questionMapper->deleteByForm($formId);
 		$this->commentsManager->deleteCommentsAtObject('forms', (string)$formId);
+		$this->deleteFormFolder($form);
 		$this->delete($form);
 	}
+
+	/**
+	 * Delete the form folder from the file system
+	 * @param Form $form The form instance
+	 */
+	private function deleteFormFolder(Form $form): void {
+		try {
+			$formsFolder = $this->filePathHelper->getFormsFolder($form->getOwnerId());
+			if ($formsFolder === null) {
+				return;
+			}
+			$formFolderPrefix = $form->getId() . ' - ';
+
+			// Iterate through form folders and delete matching folders
+			foreach ($formsFolder->getDirectoryListing() as $node) {
+				if (str_starts_with($node->getName(), $formFolderPrefix)) {
+					$node->delete();
+				}
+			}
+		} catch (\Throwable $e) {
+			$this->logger->warning('Failed to delete form folder: {error}', [
+				'error' => $e->getMessage(),
+				'formId' => $form->getId(),
+			]);
+		}
+	}
 }

lib/Db/SubmissionMapper.php

@@ -7,10 +7,13 @@
 
 namespace OCA\Forms\Db;
 
+use OCA\Forms\Helper\FilePathHelper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\Files\Folder;
 use OCP\IDBConnection;
+use Psr\Log\LoggerInterface;
 
 /**
  * @extends QBMapper<Submission>
@@ -20,10 +23,14 @@ class SubmissionMapper extends QBMapper {
 	 * SubmissionMapper constructor.
 	 * @param IDBConnection $db
 	 * @param AnswerMapper $answerMapper
+	 * @param FilePathHelper $filePathHelper
+	 * @param LoggerInterface $logger
 	 */
 	public function __construct(
 		IDBConnection $db,
 		private AnswerMapper $answerMapper,
+		private FilePathHelper $filePathHelper,
+		private LoggerInterface $logger,
 	) {
 		parent::__construct($db, 'forms_v2_submissions', Submission::class);
 	}
@@ -179,22 +186,17 @@ protected function countSubmissionsWithFilters(int $formId, ?string $userId = nu
 
 	/**
 	 * Delete the Submission, including answers.
+	 * @param Form $form Form the submission belongs to.
 	 * @param int $id of the submission to delete
 	 */
-	public function deleteById(int $id): void {
-		$qb = $this->db->getQueryBuilder();
-
-		// First delete corresponding answers.
+	public function deleteById(Form $form, int $id): void {
 		$submissionEntity = $this->findById($id);
-		$this->answerMapper->deleteBySubmission($submissionEntity->getId());
 
-		//Delete Submission
-		$qb->delete($this->getTableName())
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT))
-			);
+		$this->deleteSubmissionFolder($form, $submissionEntity->getId());
 
-		$qb->executeStatement();
+		$this->answerMapper->deleteBySubmission($submissionEntity->getId());
+
+		$this->delete($submissionEntity);
 	}
 
 	/**
@@ -218,4 +220,24 @@ public function deleteByForm(int $formId): void {
 
 		$qb->executeStatement();
 	}
+
+	/**
+	 * Delete the submission folder from the file system
+	 * @param Form $form The form instance
+	 * @param int $submissionId The submission ID
+	 */
+	private function deleteSubmissionFolder(Form $form, int $submissionId): void {
+		try {
+			$submissionFolder = $this->filePathHelper->getSubmissionFolder($form, $submissionId);
+			if ($submissionFolder !== null) {
+				$submissionFolder->delete();
+			}
+		} catch (\Throwable $e) {
+			$this->logger->warning('Failed to delete submission folder: {error}', [
+				'error' => $e->getMessage(),
+				'submissionId' => $submissionId,
+				'formId' => $form->getId(),
+			]);
+		}
+	}
 }