fix: Log and handle errors

Signed-off-by: Elizabeth Danzberger <lizzy7128@tutanota.de>
nextcloud · Jul 25, 2024 · 6f85ff4 · 6f85ff4
1 parent f63d502
commit 6f85ff4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/lib/Controller/TemplateFieldController.php b/lib/Controller/TemplateFieldController.php
@@ -13,7 +13,6 @@
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
-use OCP\Files\NotFoundException;
 use OCP\IRequest;
 
 class TemplateFieldController extends OCSController {
@@ -50,8 +49,8 @@ public function extractFields(int $fileId): DataResponse {
 			$fields = $this->templateFieldService->extractFields($fileId);
 
 			return new DataResponse($fields, Http::STATUS_OK);
-		} catch (NotFoundException $e) {
-			return new DataResponse([$e->getMessage()], Http::STATUS_NOT_FOUND);
+		} catch (\Exception $e) {
+			return new DataResponse([$e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -62,8 +61,12 @@ public function extractFields(int $fileId): DataResponse {
 	 */
 	#[NoAdminRequired]
 	public function fillFields(int $fileId, array $fields): DataResponse {
-		$this->templateFieldService->fillFields($fileId, $fields);
+		try {
+			$this->templateFieldService->fillFields($fileId, $fields);
 
-		return new DataResponse([], Http::STATUS_OK);
+			return new DataResponse([], Http::STATUS_OK);
+		} catch (\Exception $e) {
+			return new DataResponse([$e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+		}
 	}
 }
diff --git a/lib/Service/TemplateFieldService.php b/lib/Service/TemplateFieldService.php
@@ -13,12 +13,14 @@
 use OCP\Files\Template\Field;
 use OCP\Files\Template\FieldType;
 use OCP\Http\Client\IClientService;
+use Psr\Log\LoggerInterface;
 
 class TemplateFieldService {
 	public function __construct(
 		private IClientService $clientService,
 		private AppConfig $appConfig,
-		private IRootFolder $rootFolder
+		private IRootFolder $rootFolder,
+		private LoggerInterface $logger
 	) {
 	}
 
@@ -71,8 +73,8 @@ public function extractFields(Node|int $file) {
 
 			return array_merge([], ...$fields);
 		} catch (\Exception $e) {
-			// handle exception
-			return $e->getMessage();
+			$this->logger->error($e->getMessage());
+			return [];
 		}
 	}
 
@@ -116,7 +118,8 @@ public function fillFields(Node|int $file, array $fields = []) {
 
 			return $response->getBody();
 		} catch (\Exception $e) {
-			return $e->getMessage();
+			$this->logger->error($e->getMessage());
+			throw $e;
 		}
 	}
 }