Bessere Name.

.gitignore

@@ -105,3 +105,4 @@ Temporary Items
 /api/vendor/
 /api/tests/_*
 /api/tests/*.suite.yml
+/api/.env

api/.env

@@ -1,5 +0,0 @@
-## Datenbank-Einstellungen
-DATABASES_HOST=psql.torsten-hettstedt.net
-DATABASES_NAME=torsten
-DATABASES_USER=web_user
-DATABASES_PASS=V6ZGhtdXEbxH8oWD

api/.env.example

@@ -0,0 +1,5 @@
+## Datenbank-Einstellungen
+DATABASES_HOST=psql.domain.tld
+DATABASES_NAME=db
+DATABASES_USER=user
+DATABASES_PASS=1234

api/Dockerfile

@@ -1,6 +1,5 @@
 FROM php:8.0-apache
 
-#RUN apt update && apt install -y postgresql postgresql-client
 RUN apt update && apt install -y libpq-dev
 RUN docker-php-ext-install -j$(nproc) pdo pdo_pgsql
 

api/src/Controller/HttpConflictRequestException.php

@@ -6,16 +6,15 @@ use Slim\Exception\HttpSpecializedException;
 
 class HttpConflictRequestException extends HttpSpecializedException
 {
-    /**
-     * @var int
-     */
+    /** @var int */
     protected $code = 409;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $message = 'Conflict.';
 
+    /** @var string  */
     protected $title = '409 Conflict';
+
+    /** @var string  */
     protected $description = 'The 409 (Conflict) status code indicates that the request could not be completed due to a conflict with the current state of the target resource.';
 }

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;
 
@@ -23,7 +23,6 @@ class WorkingHoursController
 {
 
     protected PDO                $databases;
-    protected ContainerInterface $container;
 
     /**
      * WorkingHoursController constructor.
@@ -34,11 +33,10 @@ class WorkingHoursController
      */
     public function __construct(ContainerInterface $container)
     {
-        $this->container = $container;
-        if ($this->container->has('databases') === false) {
+        if ($container->has('databases') === false) {
             throw new NotDatabasesException('Datenbank ist nicht Vorhanden');
         }
-        $this->databases = $this->container->get('databases');
+        $this->databases = $container->get('databases');
     }
 
     /**
@@ -71,13 +69,17 @@ class WorkingHoursController
      *
      * @return Response
      *
-     * @throws Exception
+     * @throws HttpInternalServerErrorException
      * @noinspection PhpUnusedParameterInspection
      */
     public function browse(Request $request, Response $response, array $args): Response
     {
         $repository = new WorkingHoursRepository($this->databases);
-        return $this->printResponse($response, $repository->findAll(), StatusCodeInterface::STATUS_OK);
+        try {
+            return $this->printResponse($response, $repository->findAll(), StatusCodeInterface::STATUS_OK);
+        } catch (Exception $exception) {
+            throw new HttpInternalServerErrorException($request, 'Der Wert für das Datum oder die Zeit ist falsch in der Datenbank', $exception);
+        }
     }
 
     /**
@@ -121,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);

api/src/Repositories/RepositoryModelAlreadyExists.php

@@ -1,10 +0,0 @@
-<?php
-
-
-namespace TorstenHettstedt\TimekeepingApi\Repositories;
-
-
-class RepositoryModelAlreadyExists extends RepositoryException
-{
-
-}

api/src/Repositories/RepositoryRecordAlreadyExistException.php

@@ -0,0 +1,10 @@
+<?php
+
+
+namespace TorstenHettstedt\TimekeepingApi\Repositories;
+
+
+class RepositoryRecordAlreadyExistException extends RepositoryException
+{
+
+}

api/src/Repositories/RepositoryWriterInterface.php

@@ -11,7 +11,7 @@ interface RepositoryWriterInterface
     /**
      * @param T $model
      *
-     * @throws RepositoryModelAlreadyExists
+     * @throws RepositoryRecordAlreadyExistException
      */
     public function insert(mixed $model): void;
 

api/src/Repositories/WorkingHoursRepository.php

@@ -85,7 +85,7 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
     /**
      * @param WorkingHours|ModelInterface $model
      *
-     * @throws RepositoryModelAlreadyExists
+     * @throws RepositoryRecordAlreadyExistException
      * @throws Exception
      */
     public function insert(mixed $model): void
@@ -99,7 +99,7 @@ class WorkingHoursRepository implements RepositoryReaderInterface, RepositoryWri
 
         try {
             $this->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');

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);
     }