Feat(file): add support of the chunked file upload (improvements)

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/BackgroundJob/CleanupUploadedFilesJob.php

@@ -15,8 +15,10 @@
 use OCP\BackgroundJob\TimedJob;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use OCP\User\Exceptions\UserNotFoundException;
 use Psr\Log\LoggerInterface;
 
 class CleanupUploadedFilesJob extends TimedJob {
@@ -66,7 +68,15 @@ public function run($argument): void {
 			}
 
 			$usersToCleanup[$form->getOwnerId()] = true;
-			$userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
+			try {
+				$userFolder = $this->rootFolder->getUserFolder($form->getOwnerId());
+			} catch (UserNotFoundException $e) {
+				$this->logger->warning('Could not find user {ownerId} for uploaded file deletion.', [
+					'ownerId' => $form->getOwnerId(),
+				]);
+				$this->uploadedFileMapper->delete($uploadedFile);
+				continue;
+			}
 
 			$nodes = $userFolder->getById($uploadedFile->getFileId());
 
@@ -86,17 +96,28 @@ public function run($argument): void {
 
 		$this->logger->info('Deleted {deleted} uploaded files.', ['deleted' => $deleted]);
 
+		// Files uploaded to an upload share that were never registered leave no
+		// database record behind, so every form owner needs to be checked.
+		foreach ($this->formMapper->findAllOwnerIds() as $ownerId) {
+			$usersToCleanup[$ownerId] = true;
+		}
+
 		// now delete empty folders in user folders
 		$deleted = 0;
 		foreach (array_keys($usersToCleanup) as $userId) {
-			$this->logger->info('Cleaning up empty folders for user {userId}.', ['userId' => $userId]);
-			$userFolder = $this->rootFolder->getUserFolder($userId);
+			try {
+				$userFolder = $this->rootFolder->getUserFolder($userId);
+				$unsubmittedFilesFolder = $userFolder->get(Constants::UNSUBMITTED_FILES_FOLDER);
+			} catch (UserNotFoundException|NotFoundException $e) {
+				continue;
+			}
 
-			$unsubmittedFilesFolder = $userFolder->get(Constants::UNSUBMITTED_FILES_FOLDER);
 			if (!$unsubmittedFilesFolder instanceof Folder) {
 				continue;
 			}
 
+			$this->logger->info('Cleaning up empty folders for user {userId}.', ['userId' => $userId]);
+
 			foreach ($unsubmittedFilesFolder->getDirectoryListing() as $node) {
 				if ($node->getName() < $dateTime->getTimestamp()) {
 					if ($node instanceof Folder) {

lib/Controller/ApiController.php

@@ -1794,6 +1794,10 @@ public function createUploadShare(int $formId, int $questionId, string $shareHas
 		$share->setSharedBy($form->getOwnerId());
 		$share->setShareOwner($form->getOwnerId());
 		$share->setLabel($this->l10n->t('Forms file upload'));
+		// Temporary shares are cleaned up together with the upload folder after
+		// an hour; the expiration is only a safety net if cleanup never runs.
+		// Share expiration is day-granular, so one day is the shortest value.
+		$share->setExpirationDate(new \DateTime('+1 day'));
 
 		try {
 			$share = $this->shareManager->createShare($share);

lib/Db/FormMapper.php

@@ -105,6 +105,25 @@ public function findByHash(string $hash): Form {
 		return $this->findEntity($qb);
 	}
 
+	/**
+	 * @return list<string> IDs of all users that own at least one form
+	 */
+	public function findAllOwnerIds(): array {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->selectDistinct('owner_id')
+			->from($this->getTableName());
+
+		$result = $qb->executeQuery();
+		$ownerIds = array_map(
+			static fn (array $row): string => (string)$row['owner_id'],
+			$result->fetchAll(),
+		);
+		$result->closeCursor();
+
+		return $ownerIds;
+	}
+
 	/**
 	 * Get forms shared with the user
 	 * @param string $userId The user ID