Skip to content

Commit 0a38f5b

Browse files
committed
fix: use nodeId for user element
Signed-off-by: Vitor Mattos <[email protected]>
1 parent 279e3c7 commit 0a38f5b

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

lib/Service/AccountService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public function getPdfByUuid(string $uuid): File {
336336

337337
public function getFileByNodeId(int $nodeId): File {
338338
try {
339-
return $this->folderService->getFileById($nodeId);
339+
return $this->folderService->getFileByNodeId($nodeId);
340340
} catch (NotFoundException) {
341341
throw new DoesNotExistException('Not found');
342342
}
@@ -394,7 +394,7 @@ private function updateFileOfVisibleElement(array $data): void {
394394
return;
395395
}
396396
$userElement = $this->userElementMapper->findOne(['id' => $data['elementId']]);
397-
$file = $this->folderService->getFileById($userElement->getFileId());
397+
$file = $this->folderService->getFileByNodeId($userElement->getFileId());
398398
$file->putContent($this->getFileRaw($data));
399399
}
400400

@@ -494,7 +494,7 @@ public function deleteSignatureElement(?IUser $user, string $sessionId, int $nod
494494
]);
495495
$this->userElementMapper->delete($element);
496496
try {
497-
$file = $this->folderService->getFileById($element->getFileId());
497+
$file = $this->folderService->getFileByNodeId($element->getFileId());
498498
$file->delete();
499499
} catch (NotFoundException) {
500500
}

lib/Service/FileService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function getNodeFromData(array $data): Node {
109109
return $data['file']['fileNode'];
110110
}
111111
if (isset($data['file']['fileId'])) {
112-
return $this->folderService->getFileById($data['file']['fileId']);
112+
return $this->folderService->getFileByNodeId($data['file']['fileId']);
113113
}
114114
if (isset($data['file']['path'])) {
115115
return $this->folderService->getFileByPath($data['file']['path']);
@@ -587,11 +587,11 @@ public function delete(int $fileId): void {
587587
$this->idDocsMapper->deleteByFileId($file->getId());
588588
$this->fileMapper->delete($file);
589589
if ($file->getSignedNodeId()) {
590-
$signedNextcloudFile = $this->folderService->getFileById($file->getSignedNodeId());
590+
$signedNextcloudFile = $this->folderService->getFileByNodeId($file->getSignedNodeId());
591591
$signedNextcloudFile->delete();
592592
}
593593
try {
594-
$nextcloudFile = $this->folderService->getFileById($fileId);
594+
$nextcloudFile = $this->folderService->getFileByNodeId($file->getNodeId());
595595
$nextcloudFile->delete();
596596
} catch (NotFoundException) {
597597
}

lib/Service/FolderService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getFolder(): Folder {
6969
/**
7070
* @throws NotFoundException
7171
*/
72-
public function getFileById(?int $nodeId = null): File {
72+
public function getFileByNodeId(?int $nodeId = null): File {
7373
if ($this->getUserId()) {
7474

7575
$file = $this->root->getUserFolder($this->getUserId())->getFirstNodeById($nodeId);

lib/Service/SignFileService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ private function bindFileElementWithTempFile(FileElement $fileElement, int $node
292292

293293
private function getNode(int $nodeId): ?File {
294294
if ($this->user instanceof IUser) {
295-
return $this->folderService->getFileById($nodeId);
295+
return $this->folderService->getFileByNodeId($nodeId);
296296
}
297297

298298
$filesOfElementes = $this->signerElementsService->getElementsFromSession();

lib/Service/SignerElementsService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function getUserElements(string $userId): array {
8989

9090
private function signatureFileExists(UserElement $userElement): bool {
9191
try {
92-
$this->folderService->getFileById($userElement->getFileId());
92+
$this->folderService->getFileByNodeId($userElement->getFileId());
9393
} catch (\Exception) {
9494
$this->userElementMapper->delete($userElement);
9595
return false;

0 commit comments

Comments
 (0)