fix: handle envelope child signers

Derive envelope ids from parent files when propagating identified dates and signing child documents, skip updating the active sign request, and avoid returning partially cached children lists.

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

Author: vitormattos

lib/Db/FileMapper.php

@@ -281,7 +281,7 @@ public function neutralizeDeletedUser(string $userId, string $displayName): void
 	 */
 	public function getChildrenFiles(int $parentId): array {
 		$cached = array_filter($this->file, fn ($f) => $f->getParentFileId() === $parentId);
-		if (!empty($cached)) {
+		if (!empty($cached) && count($cached) > 1) {
 			return array_values($cached);
 		}
 

lib/Service/IdentifyMethod/IdentifyService.php

@@ -67,16 +67,25 @@ private function propagateIdentifiedDateToEnvelopeChildren(IdentifyMethod $ident
 		$signRequest = $this->signRequestMapper->getById($identifyMethod->getSignRequestId());
 		$fileEntity = $this->fileMapper->getById($signRequest->getFileId());
 
-		if (method_exists($fileEntity, 'getNodeType') && $fileEntity->getNodeType() !== 'envelope') {
+		if ($fileEntity->getNodeType() === 'envelope') {
+			$envelopeId = $fileEntity->getId();
+		} elseif ($fileEntity->hasParent()) {
+			$envelopeId = $fileEntity->getParentFileId();
+		} else {
 			return;
 		}
 
 		$children = $this->signRequestMapper->getByEnvelopeChildrenAndIdentifyMethod(
-			$fileEntity->getId(),
+			$envelopeId,
 			$signRequest->getId(),
 		);
 
 		foreach ($children as $childSignRequest) {
+			// Skip the current sign request to avoid updating it twice
+			if ($childSignRequest->getId() === $signRequest->getId()) {
+				continue;
+			}
+
 			$childMethods = $this->identifyMethodMapper->getIdentifyMethodsFromSignRequestId($childSignRequest->getId());
 
 			foreach ($childMethods as $childEntity) {

lib/Service/SignFileService.php

@@ -388,21 +388,26 @@ public function sign(): void {
 	 * @return array Array of ['file' => FileEntity, 'signRequest' => SignRequestEntity]
 	 */
 	private function getSignRequestsToSign(): array {
-		if (!$this->libreSignFile->isEnvelope()) {
+		if (!$this->libreSignFile->isEnvelope()
+			&& !$this->libreSignFile->hasParent()
+		) {
 			return [[
 				'file' => $this->libreSignFile,
 				'signRequest' => $this->signRequest,
 			]];
 		}
 
-		$childFiles = $this->fileMapper->getChildrenFiles($this->libreSignFile->getId());
+		$envelopeId = $this->libreSignFile->isEnvelope()
+			? $this->libreSignFile->getId()
+			: $this->libreSignFile->getParentFileId();
 
+		$childFiles = $this->fileMapper->getChildrenFiles($envelopeId);
 		if (empty($childFiles)) {
 			throw new LibresignException('No files found in envelope');
 		}
 
 		$childSignRequests = $this->signRequestMapper->getByEnvelopeChildrenAndIdentifyMethod(
-			$this->libreSignFile->getId(),
+			$envelopeId,
 			$this->signRequest->getId()
 		);