feat: fix auto_responder action

Author: René Hrdina

lib/Core/Factory/AutoResponderDataFactory.php

@@ -4,25 +4,36 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
-use Ibexa\Contracts\Core\Repository\Values\Content\Field;
-use Netgen\InformationCollection\API\ConfigurationConstants;
+use eZ\Publish\Core\Helper\FieldHelper;
+use eZ\Publish\Core\Helper\TranslationHelper;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Netgen\InformationCollection\Core\Action\AutoResponderAction;
+use Netgen\InformationCollection\Core\Action\EmailAction;
+use Twig\Environment;
+use function array_key_exists;
+use eZ\Publish\API\Repository\Values\Content\Field;
 use Netgen\InformationCollection\API\Constants;
+use Netgen\InformationCollection\API\ConfigurationConstants;
 use Netgen\InformationCollection\API\Exception\MissingValueException;
-use Netgen\InformationCollection\API\Factory\EmailContentFactoryInterface;
 use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
-use function array_filter;
-use function array_key_exists;
-use function explode;
-use function filter_var;
 use function trim;
-use const FILTER_VALIDATE_EMAIL;
 
-class AutoResponderDataFactory implements EmailContentFactoryInterface
+class AutoResponderDataFactory extends EmailDataFactory
 {
+    public function __construct(ConfigResolverInterface $configResolver, TranslationHelper $translationHelper, FieldHelper $fieldHelper, Environment $twig)
+    {
+        parent::__construct($configResolver, $translationHelper, $fieldHelper, $twig);
+        $this->config = $this->configResolver->getParameter('action_config', 'netgen_information_collection')[AutoResponderAction::$defaultName];
+    }
+
     /**
      * Factory method.
+     *
+     * @param InformationCollected $value
+     *
+     * @return EmailContent
      */
     public function build(InformationCollected $value): EmailContent
     {
@@ -46,8 +57,12 @@ public function build(InformationCollected $value): EmailContent
 
     /**
      * Returns resolved parameter.
+     *
+     * @param TemplateContent $data
+     *
+     * @return array
      */
-    protected function resolveRecipient(TemplateContent $data): array
+    protected function resolveRecipient(TemplateContent $data)
     {
         $fields = $data->getEvent()->getInformationCollectionStruct()->getCollectedFields();
         if ($data->getTemplateWrapper()->hasBlock(Constants::FIELD_RECIPIENT)) {
@@ -64,9 +79,12 @@ protected function resolveRecipient(TemplateContent $data): array
         }
 
         if (!empty($rendered)) {
+
             $emails = explode(',', $rendered);
 
-            $emails = array_filter($emails, static fn ($var) => filter_var($var, FILTER_VALIDATE_EMAIL));
+            $emails = array_filter($emails, function($var) {
+                return filter_var($var, FILTER_VALIDATE_EMAIL);
+            });
 
             if (!empty($emails)) {
                 return $emails;
@@ -79,16 +97,20 @@ protected function resolveRecipient(TemplateContent $data): array
         }
 
         if (array_key_exists($field, $fields)) {
-            return [$fields[$field]->email];
+            return [$fields[$field]->value->email];
         }
 
         throw new MissingValueException($field);
     }
 
     /**
      * Returns resolved parameter.
+     *
+     * @param TemplateContent $data
+     *
+     * @return string
      */
-    protected function resolveSubject(TemplateContent $data): string
+    protected function resolveSubject(TemplateContent $data)
     {
         $fields = $data->getEvent()->getInformationCollectionStruct()->getCollectedFields();
         if ($data->getTemplateWrapper()->hasBlock(Constants::FIELD_AUTO_RESPONDER_SUBJECT)) {
@@ -105,8 +127,8 @@ protected function resolveSubject(TemplateContent $data): string
         }
 
         $content = $data->getContent();
-        if (array_key_exists(Constants::FIELD_AUTO_RESPONDER_SUBJECT, $content->fields)
-            && !$this->fieldHelper->isFieldEmpty($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT)
+        if (array_key_exists(Constants::FIELD_AUTO_RESPONDER_SUBJECT, $content->fields) &&
+            !$this->fieldHelper->isFieldEmpty($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT)
         ) {
             $fieldValue = $this->translationHelper->getTranslatedField($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT);
 

lib/Resources/config/actions.yml

@@ -3,19 +3,17 @@ services:
         class: Netgen\InformationCollection\Core\Action\ActionRegistry
         arguments:
             - !tagged_iterator netgen_information_collection.action
-            - "@netgen_information_collection.action.config_utility"
+            - '@Netgen\InformationCollection\Core\Action\ConfigurationUtility'
             - "@logger"
             - "@event_dispatcher"
         calls:
             - [setDebug, ['%kernel.debug%']]
 
-    netgen_information_collection.action.config_utility:
-        class: Netgen\InformationCollection\Core\Action\ConfigurationUtility
+    Netgen\InformationCollection\Core\Action\ConfigurationUtility:
         arguments:
-            - "@ibexa.config.resolver"
+            - '@ibexa.config.resolver'
 
-    netgen_information_collection.action.db:
-        class: Netgen\InformationCollection\Core\Action\DatabaseAction
+    Netgen\InformationCollection\Core\Action\DatabaseAction:
         arguments:
             - '@netgen_information_collection.api.service'
         tags:
@@ -28,10 +26,9 @@ services:
         tags:
             - { name: netgen_information_collection.action }
 
-#    netgen_information_collection.action.auto_responder:
-#        class: Netgen\InformationCollection\Core\Action\AutoResponderAction
-#        arguments:
-#            - '@netgen_information_collection.factory.auto_responder_data'
-#            - '@netgen_information_collection.mailer'
-#        tags:
-#            - { name: netgen_information_collection.action, alias: auto_responder }
+    Netgen\InformationCollection\Core\Action\AutoResponderAction:
+        arguments:
+            - '@Netgen\InformationCollection\API\MailerInterface'
+            - '@Netgen\InformationCollection\Core\EmailDataProvider\AutoResponderProvider'
+        tags:
+            - { name: netgen_information_collection.action }