IBX-201: Refactored ExportParametersFactory

src/bundle/Resources/config/services/factory.yaml

@@ -4,12 +4,22 @@ services:
         autoconfigure: true
         public: false
 
-    EzSystems\EzRecommendationClient\Factory\:
-        resource: '../../../../src/lib/Factory/*'
+    EzSystems\EzRecommendationClient\Factory\EzRecommendationClientAPIFactory: ~
 
-    EzSystems\EzRecommendationClient\Factory\ExportParametersFactory: ~
+    EzSystems\EzRecommendationClient\Factory\FakeRequestFactory: ~
 
-    EzSystems\EzRecommendationClient\Factory\ConfigurableExportParametersFactory:
+    EzSystems\EzRecommendationClient\Factory\RequestFactoryInterface:
+        '@EzSystems\EzRecommendationClient\Factory\FakeRequestFactory'
+
+    EzSystems\EzRecommendationClient\Factory\TokenFactory: ~
+
+    EzSystems\EzRecommendationClient\Factory\TokenFactoryInterface:
+        '@EzSystems\EzRecommendationClient\Factory\TokenFactory'
+
+    Ibexa\Personalization\Factory\Export\ParametersFactory:
         arguments:
-            $innerService: '@EzSystems\EzRecommendationClient\Factory\ExportParametersFactory'
-            $credentialsResolver: '@EzSystems\EzRecommendationClient\Config\ExportCredentialsResolver'
+            $siteAccessService: '@ezpublish.siteaccess_service'
+            $credentialsResolver: '@EzSystems\EzRecommendationClient\Config\EzRecommendationClientCredentialsResolver'
+
+    Ibexa\Personalization\Factory\Export\ParametersFactoryInterface:
+        '@Ibexa\Personalization\Factory\Export\ParametersFactory'

src/bundle/Resources/config/services/values.yaml

@@ -4,9 +4,6 @@ services:
         autoconfigure: true
         public: false
 
-    EzSystems\EzRecommendationClient\Value\:
-        resource: '../../../../src/lib/Value/*'
-
     EzSystems\EzRecommendationClient\Value\ContentDataVisitor:
         tags:
             - { name: ezpublish_rest.output.value_object_visitor, type: EzSystems\EzRecommendationClient\Value\ContentData }

src/lib/Exception/CredentialsNotFoundException.php

@@ -8,10 +8,22 @@
 
 namespace EzSystems\EzRecommendationClient\Exception;
 
-class CredentialsNotFoundException extends NotFoundException
+use Throwable;
+
+final class CredentialsNotFoundException extends NotFoundException
 {
-    public function __construct(int $code = 0, ?Throwable $previous = null)
+    public function __construct(?string $siteAccess = null, int $code = 0, Throwable $previous = null)
     {
-        parent::__construct('Credentials for recommendation client are not set', $code, $previous);
+        $message = 'Credentials for recommendation client are not set';
+
+        if (null !== $siteAccess) {
+            $message .= ' for siteAccess: ' .  $siteAccess;
+        }
+
+        parent::__construct(
+            $message,
+            $code,
+            $previous
+        );
     }
 }

src/lib/Exception/MissingExportParameterException.php

@@ -8,6 +8,33 @@
 
 namespace EzSystems\EzRecommendationClient\Exception;
 
-class MissingExportParameterException extends ExportException
+use Ibexa\Personalization\Factory\Export\ParametersFactoryInterface;
+use Throwable;
+
+final class MissingExportParameterException extends ExportException
 {
+    /**
+     * @param array<int, string> $missingParameters
+     */
+    public function __construct(array $missingParameters, string $type, int $code = 0, Throwable $previous = null)
+    {
+        $parameters = [];
+
+        if ($type === ParametersFactoryInterface::COMMAND_TYPE) {
+            foreach ($missingParameters as $parameter) {
+                $parameters[] = str_replace('_', '-', $parameter);
+            }
+        } else {
+            $parameters = $missingParameters;
+        }
+
+        parent::__construct(
+            sprintf(
+                'Required parameters: %s are missing',
+                implode(', ', $parameters)
+            ),
+            $code,
+            $previous
+        );
+    }
 }