chore(services): update service dependencies and imports

- Add IUserManager import to FileDataAssembler
- Update FileElementService with proper formatting logic
- Update RequestSignatureService structure
- Align services with refactored architecture

These are minor adjustments to keep services consistent
with the refactored file handling architecture.

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

Author: vitormattos

lib/Service/File/FileDataAssembler.php

@@ -84,7 +84,15 @@ public function assemble(File $file, \stdClass $fileData, FileResponseOptions $o
 		$fileData->file = $this->urlGenerator->linkToRoute('libresign.page.getPdf', ['uuid' => $file->getUuid()]);
 
 		if ($options->isShowVisibleElements()) {
-			$signers = $this->signRequestMapper->getByMultipleFileId([$file->getId()]);
+			// For envelopes, the visibleElements are in the child files (buildEnvelopeChildData)
+			if ($fileData->nodeType === 'envelope') {
+				// The visibleElements of each child file are already loaded in the EnvelopeAssembler
+				// No need to duplicate the logic here
+				return;
+			}
+
+			// For individual files, fetch their visibleElements
+			$signers = $this->signRequestMapper->getByFileId($file->getId());
 			$fileData->visibleElements = [];
 			foreach ($this->signRequestMapper->getVisibleElementsFromSigners($signers) as $row) {
 				if (empty($row)) {

lib/Service/FileElementService.php

@@ -151,10 +151,12 @@ public function getVisibleElementsForSignRequest(File $file, int $signRequestId)
 	 * @param array $fileMetadata Metadata of the file (expects page dimensions under key 'd')
 	 * @psalm-return list<LibresignVisibleElement>
 	 */
-	public function formatVisibleElements(array $visibleElements, array $fileMetadata): array {
+	public function formatVisibleElements(array $visibleElements, array $fileMetadata = []): array {
 		$result = [];
 		foreach ($visibleElements as $fileElement) {
-			$dimension = $fileMetadata['d'][$fileElement->getPage() - 1] ?? ['h' => 0];
+			$elementMetadata = $fileElement->getMetadata();
+			$metadata = $fileMetadata ?: (is_array($elementMetadata) ? $elementMetadata : []);
+			$dimension = $metadata['d'][$fileElement->getPage() - 1] ?? ['h' => 0];
 			$height = (int)abs($fileElement->getUry() - $fileElement->getLly());
 			$width = (int)abs($fileElement->getUrx() - $fileElement->getLlx());
 			$top = (int)abs($dimension['h'] - $fileElement->getUry());

lib/Service/RequestSignatureService.php

@@ -379,12 +379,12 @@ private function getFileMetadata(\OCP\Files\Node $node): array {
 				'extension' => $extension,
 			];
 			if ($metadata['extension'] === 'pdf') {
+				$pdfParser = $this->pdfParserService->setFile($node);
 				$metadata = array_merge(
 					$metadata,
-					$this->pdfParserService
-						->setFile($node)
-						->getPageDimensions()
+					$pdfParser->getPageDimensions()
 				);
+				$metadata['pdfVersion'] = $pdfParser->getPdfVersion();
 			}
 		}
 		return $metadata;
@@ -503,62 +503,26 @@ private function saveVisibleElements(array $data, FileEntity $file): array {
 		}
 		$persisted = [];
 		foreach ($data['visibleElements'] as $element) {
-			$toPersist = $this->buildPropagatedElements($file, $element);
-			foreach ($toPersist as $item) {
-				$persisted[] = $this->fileElementService->saveVisibleElement($item);
-			}
-		}
-		return $persisted;
-	}
-
-	private function buildPropagatedElements(FileEntity $file, array $element): array {
-		$targetFileId = null;
-		if (!empty($element['fileId'])) {
-			$targetFileId = (int)$element['fileId'];
-		} elseif (!empty($element['uuid'])) {
-			try {
-				$targetFile = $this->fileMapper->getByUuid($element['uuid']);
-				$targetFileId = $targetFile->getId();
-				$element['fileId'] = $targetFileId;
-				unset($element['uuid']);
-			} catch (\Throwable) {
-				$targetFileId = null;
-			}
-		}
-
-		if ($file->isEnvelope() && !empty($element['signRequestId'])) {
-			$childrenSignRequests = $this->signRequestMapper->getByEnvelopeChildrenAndIdentifyMethod($file->getId(), (int)$element['signRequestId']);
-			if (empty($childrenSignRequests)) {
-				$identifyMethods = $this->identifyMethod->getIdentifyMethodsFromSignRequestId((int)$element['signRequestId']);
-				$firstIdentifyMethodGroup = current(reset($identifyMethods));
-				$childFiles = $this->fileMapper->getChildrenFiles($file->getId());
-				foreach ($childFiles as $childFile) {
-					$childSr = $this->signRequestService->getSignRequestByIdentifyMethod($firstIdentifyMethodGroup, $childFile->getId());
-					if ($childSr && $childSr->getId()) {
-						$childrenSignRequests[] = $childSr;
+			if ($file->isEnvelope() && !empty($element['signRequestId'])) {
+				$envelopeSignRequest = $this->signRequestMapper->getById((int)$element['signRequestId']);
+				// Only translate if the provided SR belongs to the envelope itself
+				if ($envelopeSignRequest && $envelopeSignRequest->getFileId() === $file->getId()) {
+					$childrenSrs = $this->signRequestMapper->getByEnvelopeChildrenAndIdentifyMethod($file->getId(), (int)$element['signRequestId']);
+					foreach ($childrenSrs as $childSr) {
+						if ($childSr->getFileId() === (int)$element['fileId']) {
+							$element['signRequestId'] = $childSr->getId();
+							break;
+						}
 					}
 				}
 			}
 
-			$persistList = [];
-			$envelopeElement = $element;
-			$envelopeElement['fileId'] = $file->getId();
-			unset($envelopeElement['uuid']);
-			$persistList[] = $envelopeElement;
-
-			foreach ($childrenSignRequests as $childSignRequest) {
-				$clone = $element;
-				$clone['signRequestId'] = $childSignRequest->getId();
-				$clone['fileId'] = $childSignRequest->getFileId();
-				unset($clone['uuid']);
-				$persistList[] = $clone;
-			}
-			return $persistList;
+			$persisted[] = $this->fileElementService->saveVisibleElement($element);
 		}
-
-		return [$element];
+		return $persisted;
 	}
 
+
 	public function validateNewRequestToFile(array $data): void {
 		$this->validateNewFile($data);
 		$this->validateUsers($data);