refactor(controllers): integrate FileListService changes

- Update FileController to use refactored FileListService
- Update RequestSignatureController with new service methods
- Update SignRequestMapper to support new query patterns
- Align controllers with centralized file formatting

Controllers now leverage the improved FileListService
for consistent file response formatting across endpoints.

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

lib/Controller/FileController.php

@@ -74,6 +74,7 @@ public function __construct(
 		private FileService $fileService,
 		private fileListService $fileListService,
 		private ValidateHelper $validateHelper,
+		private \OCA\Libresign\Service\File\SettingsLoader $settingsLoader,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 	}
@@ -287,26 +288,8 @@ public function list(
 		$user = $this->userSession->getUser();
 		$return = $this->fileListService->listAssociatedFilesOfSignFlow($user, $page, $length, $filter, $sort);
 
-		if ($user && !empty($return['data'])) {
-			$firstFile = null;
-			foreach ($return['data'] as $file) {
-				if (($file['nodeType'] ?? 'file') !== 'envelope') {
-					$firstFile = $file;
-					break;
-				}
-			}
-
-			if ($firstFile) {
-				$fileSettings = $this->fileService
-					->setFileByType('FileId', $firstFile['nodeId'])
-					->showSettings()
-					->toArray();
-
-				$return['settings'] = [
-					'needIdentificationDocuments' => $fileSettings['settings']['needIdentificationDocuments'] ?? false,
-					'identificationDocumentsWaitingApproval' => $fileSettings['settings']['identificationDocumentsWaitingApproval'] ?? false,
-				];
-			}
+		if ($user) {
+			$return['settings'] = $this->settingsLoader->getUserIdentificationSettings($user->getUID());
 		}
 
 		return new DataResponse($return, Http::STATUS_OK);

lib/Controller/RequestSignatureController.php

@@ -13,6 +13,7 @@
 use OCA\Libresign\Helper\ValidateHelper;
 use OCA\Libresign\Middleware\Attribute\RequireManager;
 use OCA\Libresign\ResponseDefinitions;
+use OCA\Libresign\Service\File\FileListService;
 use OCA\Libresign\Service\FileService;
 use OCA\Libresign\Service\RequestSignatureService;
 use OCP\AppFramework\Http;
@@ -38,6 +39,7 @@ public function __construct(
 		protected IL10N $l10n,
 		protected IUserSession $userSession,
 		protected FileService $fileService,
+		protected FileListService $fileListService,
 		protected ValidateHelper $validateHelper,
 		protected RequestSignatureService $requestSignatureService,
 	) {
@@ -90,15 +92,7 @@ public function request(
 		try {
 			$this->requestSignatureService->validateNewRequestToFile($data);
 			$file = $this->requestSignatureService->save($data);
-			$return = $this->fileService
-				->setFile($file)
-				->setHost($this->request->getServerHost())
-				->setMe($data['userManager'])
-				->showVisibleElements()
-				->showSigners()
-				->showSettings()
-				->showMessages()
-				->toArray();
+			$return = $this->fileListService->formatSingleFile($user, $file);
 			return new DataResponse(
 				[
 					'message' => $this->l10n->t('Success'),
@@ -175,15 +169,7 @@ public function updateSign(
 				$this->validateHelper->validateVisibleElements($data['visibleElements'], $this->validateHelper::TYPE_VISIBLE_ELEMENT_PDF);
 			}
 			$file = $this->requestSignatureService->save($data);
-			$return = $this->fileService
-				->setFile($file)
-				->setHost($this->request->getServerHost())
-				->setMe($data['userManager'])
-				->showVisibleElements()
-				->showSigners()
-				->showSettings()
-				->showMessages()
-				->toArray();
+			$return = $this->fileListService->formatSingleFile($user, $file);
 			return new DataResponse(
 				[
 					'message' => $this->l10n->t('Success'),

lib/Db/SignRequestMapper.php

@@ -8,8 +8,6 @@
 
 namespace OCA\Libresign\Db;
 
-use DateTimeInterface;
-use OCA\Libresign\Enum\SignatureFlow;
 use OCA\Libresign\Enum\SignRequestStatus;
 use OCA\Libresign\Helper\Pagination;
 use OCA\Libresign\Service\IdentifyMethod\IIdentifyMethod;
@@ -290,16 +288,21 @@ public function findRemindersCandidates(): \Generator {
 
 	/**
 	 * Get all signers by multiple fileId
+	 * Includes signers from both the files themselves and their children files (for envelopes)
 	 *
 	 * @return SignRequest[]
 	 */
 	public function getByMultipleFileId(array $fileId) {
 		$qb = $this->db->getQueryBuilder();
 
-		$qb->select('*')
+		$qb->select('sr.*')
 			->from($this->getTableName(), 'sr')
+			->join('sr', 'libresign_file', 'f', $qb->expr()->eq('sr.file_id', 'f.id'))
 			->where(
-				$qb->expr()->in('sr.file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT_ARRAY))
+				$qb->expr()->orX(
+					$qb->expr()->in('f.id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT_ARRAY)),
+					$qb->expr()->in('f.parent_file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT_ARRAY))
+				)
 			)
 			->orderBy('sr.id', 'ASC');
 
@@ -425,7 +428,7 @@ public function getByFileIdAndSignRequestId(int $fileId, int $signRequestId): Si
 		return end($this->signers);
 	}
 
-	public function getFilesAssociatedFilesWithMeFormatted(
+	public function getFilesAssociatedFilesWithMe(
 		IUser $user,
 		array $filter,
 		?int $page = null,
@@ -442,7 +445,8 @@ public function getFilesAssociatedFilesWithMeFormatted(
 
 		$data = [];
 		foreach ($currentPageResults as $row) {
-			$data[] = $this->formatListRow($row);
+			$file = new File();
+			$data[] = $file->fromRow($row);
 		}
 		$return['data'] = $data;
 		$return['pagination'] = $pagination;
@@ -518,14 +522,6 @@ public function getMyLibresignFile(string $userId, ?array $filter = []): File {
 			throw new DoesNotExistException('LibreSign file not found');
 		}
 
-		unset(
-			$row['parent_id'],
-			$row['parent_uuid'],
-			$row['parent_name'],
-			$row['parent_status'],
-			$row['parent_created_at'],
-		);
-
 		$file = new File();
 		return $file->fromRow($row);
 	}
@@ -535,8 +531,7 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 		$qb->from('libresign_file', 'f')
 			->leftJoin('f', 'libresign_sign_request', 'sr', 'sr.file_id = f.id')
 			->leftJoin('f', 'libresign_identify_method', 'im', $qb->expr()->eq('sr.id', 'im.sign_request_id'))
-			->leftJoin('f', 'libresign_id_docs', 'id', 'id.file_id = f.id')
-			->leftJoin('f', 'libresign_file', 'parent', $qb->expr()->eq('f.parent_file_id', 'parent.id'));
+			->leftJoin('f', 'libresign_id_docs', 'id', 'id.file_id = f.id');
 		if ($count) {
 			$qb->select($qb->func()->count())
 				->setFirstResult(0)
@@ -555,12 +550,7 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 				'f.signature_flow',
 				'f.docmdp_level',
 				'f.node_type',
-				'f.parent_file_id',
-				'parent.id as parent_id',
-				'parent.uuid as parent_uuid',
-				'parent.name as parent_name',
-				'parent.status as parent_status',
-				'parent.created_at as parent_created_at'
+				'f.parent_file_id'
 			)
 				->groupBy(
 					'f.id',
@@ -574,12 +564,7 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 					'f.signature_flow',
 					'f.docmdp_level',
 					'f.node_type',
-					'f.parent_file_id',
-					'parent.id',
-					'parent.uuid',
-					'parent.name',
-					'parent.status',
-					'parent.created_at'
+					'f.parent_file_id'
 				);
 			// metadata is a json column, the right way is to use f.metadata::text
 			// when the database is PostgreSQL. The problem is that the command
@@ -614,6 +599,7 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 				);
 			}
 			if (!empty($filter['signer_uuid']) && !empty($filter['parentNodeId'])) {
+				$qb->leftJoin('f', 'libresign_file', 'parent', $qb->expr()->eq('f.parent_file_id', 'parent.id'));
 				$qb->innerJoin('parent', 'libresign_sign_request', 'psr', $qb->expr()->eq('psr.file_id', 'parent.id'))
 					->andWhere($qb->expr()->eq('psr.uuid', $qb->createNamedParameter($filter['signer_uuid'])));
 			} elseif (!empty($filter['signer_uuid'])) {
@@ -644,6 +630,7 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 				);
 			}
 			if (!empty($filter['parentNodeId'])) {
+				$qb->leftJoin('f', 'libresign_file', 'parent', $qb->expr()->eq('f.parent_file_id', 'parent.id'));
 				$qb->andWhere(
 					$qb->expr()->eq('parent.node_id', $qb->createNamedParameter($filter['parentNodeId'], IQueryBuilder::PARAM_INT))
 				);
@@ -689,75 +676,6 @@ private function getFilesAssociatedFilesWithMeStmt(
 		return $pagination;
 	}
 
-	private function formatListRow(array $row): array {
-		$internalId = (int)$row['id'];
-		$row['fileId'] = $internalId;
-		$row['id'] = (int)$row['node_id'];
-		$row['status'] = (int)$row['status'];
-		$row['statusText'] = $this->fileMapper->getTextOfStatus($row['status']);
-		$row['nodeId'] = (int)$row['node_id'];
-		$row['signedNodeId'] = (int)$row['signed_node_id'];
-		$row['requested_by'] = [
-			'userId' => $row['user_id'],
-			'displayName' => $this->userManager->get($row['user_id'])?->getDisplayName(),
-		];
-		$row['created_at'] = (new \DateTime($row['created_at']))->setTimezone(new \DateTimeZone('UTC'))->format(DateTimeInterface::ATOM);
-		$row['file'] = $this->urlGenerator->linkToRoute('libresign.page.getPdf', ['uuid' => $row['uuid']]);
-		$row['nodeId'] = (int)$row['node_id'];
-
-		$row['name'] = $this->removeExtensionFromName($row['name'], $row['metadata']);
-		$row['signatureFlow'] = SignatureFlow::fromNumeric((int)($row['signature_flow']))->value;
-		$row['docmdpLevel'] = (int)($row['docmdp_level'] ?? 0);
-		$row['nodeType'] = $row['node_type'] ?? 'file';
-		$row['metadata'] = json_decode($row['metadata'] ?? '{}', true);
-
-		if ($row['node_type'] === 'envelope') {
-			$row['filesCount'] = $row['metadata']['filesCount'] ?? 0;
-			$row['files'] = [];
-		} else {
-			$row['filesCount'] = 1;
-			$row['files'] = [[
-				'fileId' => (int)$row['id'],
-				'nodeId' => (int)$row['node_id'],
-				'uuid' => $row['uuid'],
-				'name' => $row['name'],
-				'status' => (int)$row['status'],
-				'statusText' => $row['statusText'],
-			]];
-		}
-
-		unset(
-			$row['user_id'],
-			$row['node_id'],
-			$row['signed_node_id'],
-			$row['signature_flow'],
-			$row['docmdp_level'],
-			$row['node_type'],
-			$row['parent_file_id'],
-			$row['parent_id'],
-			$row['parent_uuid'],
-			$row['parent_name'],
-			$row['parent_status'],
-			$row['parent_created_at'],
-		);
-		return $row;
-	}
-
-	private function removeExtensionFromName(string $name, ?string $metadataJson): string {
-		if (empty($name) || empty($metadataJson)) {
-			return $name;
-		}
-
-		$metadata = json_decode($metadataJson, true);
-		if (!isset($metadata['extension'])) {
-			return $name;
-		}
-
-		$extensionPattern = '/\.' . preg_quote($metadata['extension'], '/') . '$/i';
-		$result = preg_replace($extensionPattern, '', $name);
-		return $result ?? $name;
-	}
-
 	public function getTextOfSignerStatus(int $status): string {
 		return SignRequestStatus::from($status)->getLabel($this->l10n);
 	}