From 2b64e8969a79457be63fc15b0409d74651be758e Mon Sep 17 00:00:00 2001
From: Jonathan Treffler <jonathan.treffler@verdigado.com>
Date: Wed, 20 Sep 2023 22:53:02 +0200
Subject: [PATCH] started improving exception handling

---
 lib/Exceptions/NotFoundException.php | 14 ++++++++++++++
 lib/Service/DiffTaskService.php      |  7 ++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 lib/Exceptions/NotFoundException.php

diff --git a/lib/Exceptions/NotFoundException.php b/lib/Exceptions/NotFoundException.php
new file mode 100644
index 0000000..f08c0ad
--- /dev/null
+++ b/lib/Exceptions/NotFoundException.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace OCA\GroupfolderFilesystemSnapshots\Exceptions;
+
+class NotFoundException extends \RuntimeException {
+	public function __construct($entity, array|string $criteria) {
+		$message = sprintf(
+			"Could not find %s with criteria %s",
+			class_exists($entity) ? array_pop(explode('\\', $entity)) : $entity,
+			is_string($criteria) ? $criteria : json_encode($criteria),
+		);
+		parent::__construct($message);
+	}
+}
diff --git a/lib/Service/DiffTaskService.php b/lib/Service/DiffTaskService.php
index 1ff8fad..ec1a925 100644
--- a/lib/Service/DiffTaskService.php
+++ b/lib/Service/DiffTaskService.php
@@ -6,6 +6,7 @@ use Exception;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 
+use OCA\GroupfolderFilesystemSnapshots\Exceptions\NotFoundException;
 use OCA\GroupfolderFilesystemSnapshots\Db\DiffTask;
 use OCA\GroupfolderFilesystemSnapshots\Db\DiffTaskMapper;
 use OCA\GroupfolderFilesystemSnapshots\Db\DiffTaskResult;
@@ -36,10 +37,10 @@ class DiffTaskService {
     /**
      * @return never
      */
-    private function handleException ($e) {
+    private function handleException ($e, $criteria) {
         if ($e instanceof DoesNotExistException ||
             $e instanceof MultipleObjectsReturnedException) {
-            throw new NotFoundException($e->getMessage());
+            throw new NotFoundException($e->getMessage(), $criteria);
         } else {
             throw $e;
         }
@@ -49,7 +50,7 @@ class DiffTaskService {
         try {
             return $this->mapper->find($id, $userId);
         } catch(Exception $e) {
-            $this->handleException($e);
+            $this->handleException($e, ["userId" => $userId, "id" => $id]);
         }
     }