Import by foreign key

Author: tatevikg1

resources/translations/messages.en.xlf

@@ -730,6 +730,10 @@ Thank you.</target>
         <source>Campaign not found or not in submitted status</source>
         <target>__Campaign not found or not in submitted status</target>
       </trans-unit>
+      <trans-unit id="TBYUW2m" resname="Conflict: email and foreign key refer to different subscribers.">
+        <source>Conflict: email and foreign key refer to different subscribers.</source>
+        <target>__Conflict: email and foreign key refer to different subscribers.</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Domain/Subscription/Service/CsvRowToDtoMapper.php

@@ -16,10 +16,7 @@ class CsvRowToDtoMapper
     public function map(array $row): ImportSubscriberDto
     {
         // Normalize keys to lower-case for header matching safety (CSV library keeps original headers)
-        $normalizedRow = [];
-        foreach ($row as $key => $value) {
-            $normalizedRow[strtolower((string)$key)] = is_string($value) ? trim($value) : $value;
-        }
+        $normalizedRow = $this->normalizeData($row);
 
         $email = strtolower(trim((string)($normalizedRow['email'] ?? '')));
 
@@ -42,4 +39,14 @@ public function map(array $row): ImportSubscriberDto
             foreignKey: $foreignKey ?? null,
         );
     }
+
+    private function normalizeData(array $row): array
+    {
+        $normalizedRow = [];
+        foreach ($row as $key => $value) {
+            $normalizedRow[strtolower((string)$key)] = is_string($value) ? trim($value) : $value;
+        }
+
+        return $normalizedRow;
+    }
 }

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;
         }
@@ -210,20 +204,7 @@ private function processRow(
 
         $this->attributeManager->processAttributes($subscriber, $dto->extraAttributes);
 
-        $addedNewSubscriberToList = false;
-        $listLines = [];
-        if (!$subscriber->isBlacklisted() && count($options->listIds) > 0) {
-            foreach ($options->listIds as $listId) {
-                $created = $this->subscriptionManager->addSubscriberToAList($subscriber, $listId);
-                if ($created) {
-                    $addedNewSubscriberToList = true;
-                    $listLines[] = $this->translator->trans(
-                        'Subscribed to %list%',
-                        ['%list%' => $created->getSubscriberList()->getName()]
-                    );
-                }
-            }
-        }
+        [$listLines, $addedNewSubscriberToList] = $this->getHistoryListLines($subscriber, $options);
 
         if ($subscriber->isBlacklisted()) {
             $stats['blacklisted']++;
@@ -239,6 +220,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,
@@ -290,4 +287,27 @@ private function prepareConfirmationMessage(
 
         return null;
     }
+
+    private function getHistoryListLines(Subscriber $subscriber, SubscriberImportOptions $options): array
+    {
+        $addedNewSubscriberToList = false;
+        $listLines = [];
+        if (!$subscriber->isBlacklisted() && count($options->listIds) > 0) {
+            foreach ($options->listIds as $listId) {
+                $created = $this->subscriptionManager->addSubscriberToAList($subscriber, $listId);
+                if ($created) {
+                    $addedNewSubscriberToList = true;
+                    $listLines[] = $this->translator->trans(
+                        'Subscribed to %list%',
+                        ['%list%' => $created->getSubscriberList()->getName()]
+                    );
+                }
+            }
+        }
+
+        return [
+            $listLines,
+            $addedNewSubscriberToList,
+        ];
+    }
 }