Handle errors when value object cannot be loaded

cjw-network · Aug 3, 2023 · e53998e · e53998e
1 parent 1356989
commit e53998e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/bundle/Resources/config/services/parameters.yaml b/bundle/Resources/config/services/parameters.yaml
@@ -11,6 +11,7 @@ services:
         class: Netgen\Layouts\Ez\Parameters\ValueObjectProvider\LocationProvider
         arguments:
             - "@ezpublish.api.repository"
+            - "@netgen_layouts.error.handler"
 
     netgen_layouts.ezplatform.parameters.parameter_type.content:
         class: Netgen\Layouts\Ez\Parameters\ParameterType\ContentType
@@ -24,6 +25,7 @@ services:
         class: Netgen\Layouts\Ez\Parameters\ValueObjectProvider\ContentProvider
         arguments:
             - "@ezpublish.api.repository"
+            - "@netgen_layouts.error.handler"
 
     netgen_layouts.ezplatform.parameters.parameter_type.content_type:
         class: Netgen\Layouts\Ez\Parameters\ParameterType\ContentTypeType

diff --git a/lib/Parameters/ValueObjectProvider/ContentProvider.php b/lib/Parameters/ValueObjectProvider/ContentProvider.php
@@ -7,15 +7,19 @@
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\API\Repository\Values\Content\Content;
+use Netgen\Layouts\Error\ErrorHandlerInterface;
 use Netgen\Layouts\Parameters\ValueObjectProviderInterface;
 
 final class ContentProvider implements ValueObjectProviderInterface
 {
     private Repository $repository;
 
-    public function __construct(Repository $repository)
+    private ErrorHandlerInterface $errorHandler;
+
+    public function __construct(Repository $repository, ErrorHandlerInterface $errorHandler)
     {
         $this->repository = $repository;
+        $this->errorHandler = $errorHandler;
     }
 
     public function getValueObject($value): ?Content
@@ -28,6 +32,8 @@ public function getValueObject($value): ?Content
 
             return $content->contentInfo->mainLocationId !== null ? $content : null;
         } catch (NotFoundException $e) {
+            $this->errorHandler->handleError($e);
+
             return null;
         }
     }

diff --git a/lib/Parameters/ValueObjectProvider/LocationProvider.php b/lib/Parameters/ValueObjectProvider/LocationProvider.php
@@ -7,15 +7,19 @@
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\API\Repository\Values\Content\Location;
+use Netgen\Layouts\Error\ErrorHandlerInterface;
 use Netgen\Layouts\Parameters\ValueObjectProviderInterface;
 
 final class LocationProvider implements ValueObjectProviderInterface
 {
     private Repository $repository;
 
-    public function __construct(Repository $repository)
+    private ErrorHandlerInterface $errorHandler;
+
+    public function __construct(Repository $repository, ErrorHandlerInterface $errorHandler)
     {
         $this->repository = $repository;
+        $this->errorHandler = $errorHandler;
     }
 
     public function getValueObject($value): ?Location
@@ -25,6 +29,8 @@ public function getValueObject($value): ?Location
                 static fn (Repository $repository): Location => $repository->getLocationService()->loadLocation((int) $value),
             );
         } catch (NotFoundException $e) {
+            $this->errorHandler->handleError($e);
+
             return null;
         }
     }

diff --git a/tests/lib/Parameters/ValueObjectProvider/ContentProviderTest.php b/tests/lib/Parameters/ValueObjectProvider/ContentProviderTest.php
@@ -10,6 +10,7 @@
 use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use eZ\Publish\Core\Repository\Values\Content\Content;
 use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
+use Netgen\Layouts\Error\ErrorHandlerInterface;
 use Netgen\Layouts\Ez\Parameters\ValueObjectProvider\ContentProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -40,6 +41,7 @@ protected function setUp(): void
 
         $this->valueObjectProvider = new ContentProvider(
             $this->repositoryMock,
+            $this->createMock(ErrorHandlerInterface::class),
         );
     }
 

diff --git a/tests/lib/Parameters/ValueObjectProvider/LocationProviderTest.php b/tests/lib/Parameters/ValueObjectProvider/LocationProviderTest.php
@@ -8,6 +8,7 @@
 use eZ\Publish\API\Repository\Repository;
 use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use eZ\Publish\Core\Repository\Values\Content\Location;
+use Netgen\Layouts\Error\ErrorHandlerInterface;
 use Netgen\Layouts\Ez\Parameters\ValueObjectProvider\LocationProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -38,6 +39,7 @@ protected function setUp(): void
 
         $this->valueObjectProvider = new LocationProvider(
             $this->repositoryMock,
+            $this->createMock(ErrorHandlerInterface::class),
         );
     }