Code style

Author: tatevikg1

src/Domain/Subscription/Service/SubscriberCsvImporter.php

@@ -182,20 +182,14 @@ private function processRow(
             return null;
         }
 
-        $subscriberByEmail = $this->subscriberRepository->findOneByEmail($dto->email);
-        $subscriberByFk = null;
-        if ($dto->foreignKey !== null) {
-            $subscriberByFk = $this->subscriberRepository->findOneByForeignKey($dto->foreignKey);
-        }
+        [$subscriber, $conflictError] = $this->resolveSubscriber($dto);
 
-        if ($subscriberByEmail && $subscriberByFk && $subscriberByEmail->getId() !== $subscriberByFk->getId()) {
+        if ($conflictError !== null) {
             $stats['skipped']++;
-            $stats['errors'][] = $this->translator->trans('Conflict: email and foreign key refer to different subscribers.');
+            $stats['errors'][] = $conflictError;
             return null;
         }
 
-        $subscriber = $subscriberByFk ?? $subscriberByEmail;
-
         if ($this->handleSkipCase($subscriber, $options, $stats)) {
             return null;
         }
@@ -239,6 +233,22 @@ private function processRow(
         return $this->prepareConfirmationMessage($subscriber, $options, $dto, $addedNewSubscriberToList);
     }
 
+    private function resolveSubscriber(ImportSubscriberDto $dto): array
+    {
+        $byEmail = $this->subscriberRepository->findOneByEmail($dto->email);
+        $byFk = null;
+
+        if ($dto->foreignKey !== null) {
+            $byFk = $this->subscriberRepository->findOneByForeignKey($dto->foreignKey);
+        }
+
+        if ($byEmail && $byFk && $byEmail->getId() !== $byFk->getId()) {
+            return [null, $this->translator->trans('Conflict: email and foreign key refer to different subscribers.')];
+        }
+
+        return [$byFk ?? $byEmail, null];
+    }
+
     private function handleInvalidEmail(
         ImportSubscriberDto $dto,
         SubscriberImportOptions $options,