fix(templates): throw NotFoundException if no file returned by id

Signed-off-by: Elizabeth Danzberger <[email protected]>

lib/Service/TemplateFieldService.php

@@ -10,6 +10,7 @@
 use OCA\Richdocuments\AppConfig;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
+use OCP\Files\NotFoundException;
 use OCP\Files\Template\Field;
 use OCP\Files\Template\FieldType;
 use OCP\Http\Client\IClientService;
@@ -38,18 +39,22 @@ public function extractFields(Node|int $file) {
 			$file = $this->rootFolder->getFirstNodeById($file);
 		}
 
-		$collaboraUrl = $this->appConfig->getCollaboraUrlInternal();
-		$httpClient = $this->clientService->newClient();
+		try {
+			if (!$file) {
+				throw new NotFoundException();
+			}
 
-		$form = RemoteOptionsService::getDefaultOptions();
-		$form['query'] = ['limit' => 'content-control'];
-		$form['multipart'] = [[
-			'name' => 'data',
-			'contents' => $file->getStorage()->fopen($file->getInternalPath(), 'r'),
-			'headers' => ['Content-Type' => 'multipart/form-data'],
-		]];
+			$collaboraUrl = $this->appConfig->getCollaboraUrlInternal();
+			$httpClient = $this->clientService->newClient();
+
+			$form = RemoteOptionsService::getDefaultOptions();
+			$form['query'] = ['limit' => 'content-control'];
+			$form['multipart'] = [[
+				'name' => 'data',
+				'contents' => $file->getStorage()->fopen($file->getInternalPath(), 'r'),
+				'headers' => ['Content-Type' => 'multipart/form-data'],
+			]];
 
-		try {
 			$response = $httpClient->post(
 				$collaboraUrl . "/cool/extract-document-structure",
 				$form
@@ -95,6 +100,13 @@ public function fillFields(Node|int $file, array $fields = []) {
 
 		if (is_int($file)) {
 			$file = $this->rootFolder->getFirstNodeById($file);
+
+			if (!$file) {
+				$e = new NotFoundException();
+				$this->logger->error($e->getMessage());
+
+				throw $e;
+			}
 		}
 
 		$collaboraUrl = $this->appConfig->getCollaboraUrlInternal();