Fix import (#349)

* Add sendConfirmation

* Temp disable graylog

---------

Co-authored-by: Tatevik <[email protected]>

Author: TatevikGr

config/config_prod.yml

@@ -4,12 +4,12 @@ imports:
 monolog:
     handlers:
         # Primary handler for production is Graylog
-        graylog:
-            type: gelf
-            publisher:
-                hostname: '%graylog_host%'
-                port: '%graylog_port%'
-            level: error
+#        graylog:
+#            type: gelf
+#            publisher:
+#                hostname: '%graylog_host%'
+#                port: '%graylog_port%'
+#            level: error
         # Local file logging as backup
         main:
             type: fingers_crossed

src/Domain/Subscription/Model/Dto/ImportSubscriberDto.php

@@ -28,6 +28,8 @@ class ImportSubscriberDto
     /** @var array<string, string|int|bool|null> */
     public array $extraAttributes = [];
 
+    public bool $sendConfirmation;
+
     public function __construct(
         string $email,
         bool $confirmed,
@@ -39,6 +41,7 @@ public function __construct(
     ) {
         $this->email = $email;
         $this->confirmed = $confirmed;
+        $this->sendConfirmation = !$confirmed;
         $this->blacklisted = $blacklisted;
         $this->htmlEmail = $htmlEmail;
         $this->disabled = $disabled;

src/Domain/Subscription/Service/Manager/SubscriberManager.php

@@ -118,11 +118,11 @@ public function createFromImport(ImportSubscriberDto $subscriberDto): Subscriber
         $subscriber->setBlacklisted($subscriberDto->blacklisted);
         $subscriber->setHtmlEmail($subscriberDto->htmlEmail);
         $subscriber->setDisabled($subscriberDto->disabled);
-        $subscriber->setExtraData($subscriberDto->extraData);
+        $subscriber->setExtraData($subscriberDto->extraData ?? '');
 
         $this->entityManager->persist($subscriber);
 
-        if (!$subscriberDto->confirmed) {
+        if ($subscriberDto->sendConfirmation) {
             $this->sendConfirmationEmail($subscriber);
         }
 

src/Domain/Subscription/Service/SubscriberCsvImporter.php

@@ -143,6 +143,7 @@ private function processRow(
                 return;
             } else {
                 $dto->email = 'invalid_' . $dto->email;
+                $dto->sendConfirmation = false;
             }
         }
         $subscriber = $this->subscriberRepository->findOneByEmail($dto->email);