From 8086b86eb27a66a95d8f46dba9404d347dcd69d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20L=C3=BCcke?= Date: Wed, 7 Apr 2021 12:11:01 +0200 Subject: [PATCH] Bessere Name. --- api/src/Controller/WorkingHoursController.php | 4 ++-- api/src/Repositories/RepositoryModelAlreadyExists.php | 10 ---------- .../RepositoryRecordAlreadyExistException.php | 10 ++++++++++ api/src/Repositories/RepositoryWriterInterface.php | 2 +- api/src/Repositories/WorkingHoursRepository.php | 4 ++-- .../unit/Repositories/WorkingHoursRepositoryTest.php | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 api/src/Repositories/RepositoryModelAlreadyExists.php create mode 100644 api/src/Repositories/RepositoryRecordAlreadyExistException.php diff --git a/api/src/Controller/WorkingHoursController.php b/api/src/Controller/WorkingHoursController.php index 80944aa..ce567ab 100644 --- a/api/src/Controller/WorkingHoursController.php +++ b/api/src/Controller/WorkingHoursController.php @@ -15,7 +15,7 @@ use Slim\Exception\HttpNotFoundException; use Slim\Psr7\Request; use Slim\Psr7\Response; use TorstenHettstedt\TimekeepingApi\Models\WorkingHours; -use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryModelAlreadyExists; +use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordAlreadyExistException; use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordNotFoundException; use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursRepository; @@ -123,7 +123,7 @@ class WorkingHoursController $model = $this->buildModel($request, $body['workingDay'], $body['workingTime']); try { $repository->insert($model); - } catch (RepositoryModelAlreadyExists $exception) { + } catch (RepositoryRecordAlreadyExistException $exception) { throw new HttpConflictRequestException($request, 'Der Eintrag ist schon vorhanden.', $exception); } catch (Exception $exception) { throw new HttpInternalServerErrorException($request, 'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception); diff --git a/api/src/Repositories/RepositoryModelAlreadyExists.php b/api/src/Repositories/RepositoryModelAlreadyExists.php deleted file mode 100644 index 5bfe111..0000000 --- a/api/src/Repositories/RepositoryModelAlreadyExists.php +++ /dev/null @@ -1,10 +0,0 @@ -findByKey($workingDay); - throw new RepositoryModelAlreadyExists(); + throw new RepositoryRecordAlreadyExistException(); } /** @noinspection PhpUnusedLocalVariableInspection */ catch (RepositoryRecordNotFoundException $exception) { $stmt = $this->database->prepare('insert into public."Arbeitszeiten" ("Datum", "Arbeitszeit") values (?, ?) on conflict do nothing'); diff --git a/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php b/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php index 0fc1a48..8c905c9 100644 --- a/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php +++ b/api/tests/unit/Repositories/WorkingHoursRepositoryTest.php @@ -11,7 +11,7 @@ use PDO; use PDOStatement; use TorstenHettstedt\TimekeepingApi\Models\ModelInterface; use TorstenHettstedt\TimekeepingApi\Models\WorkingHours; -use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryModelAlreadyExists; +use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordAlreadyExistException; use TorstenHettstedt\TimekeepingApi\Repositories\RepositoryRecordNotFoundException; use TorstenHettstedt\TimekeepingApi\Repositories\WorkingHoursRepository; @@ -104,7 +104,7 @@ class WorkingHoursRepositoryTest extends Unit 'workingDay' => new DateTime(self::EXISTING_DATE), 'workingTime' => new DateInterval(self::NEW_INTERVAL), ]); - $this->expectException(RepositoryModelAlreadyExists::class); + $this->expectException(RepositoryRecordAlreadyExistException::class); $repository->insert($model); }