From f27d764d1319b3bc3ab5a7e45d8601a09ef689c2 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Tue, 17 Sep 2019 16:05:20 +0200
Subject: [PATCH] Refactor adding link_tokens in import to separate methods

[MAILPOET-2364]
---
 lib/Subscribers/ImportExport/Import/Import.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/Subscribers/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php
index 0c1d01a728..7286d9d27a 100644
--- a/lib/Subscribers/ImportExport/Import/Import.php
+++ b/lib/Subscribers/ImportExport/Import/Import.php
@@ -111,7 +111,8 @@ class Import {
         // add, if required, missing required fields to new subscribers
         $new_subscribers = $this->addMissingRequiredFields($new_subscribers);
         $new_subscribers = $this->setSubscriptionStatusToSubscribed($new_subscribers);
-        $new_subscribers = $this->setSourceAndLinkToken($new_subscribers);
+        $new_subscribers = $this->setSource($new_subscribers);
+        $new_subscribers = $this->setLinkToken($new_subscribers);
         $created_subscribers =
           $this->createOrUpdateSubscribers(
             'create',
@@ -298,15 +299,20 @@ class Import {
     return $subscribers_data;
   }
 
-  private function setSourceAndLinkToken($subscribers_data) {
+  private function setSource($subscribers_data) {
     $subscribers_count = count($subscribers_data['data'][key($subscribers_data['data'])]);
     $subscribers_data['fields'][] = 'source';
-    $subscribers_data['fields'][] = 'link_token';
     $subscribers_data['data']['source'] = array_fill(
       0,
       $subscribers_count,
       Source::IMPORTED
     );
+    return $subscribers_data;
+  }
+
+  private function setLinkToken($subscribers_data) {
+    $subscribers_count = count($subscribers_data['data'][key($subscribers_data['data'])]);
+    $subscribers_data['fields'][] = 'link_token';
     $subscribers_data['data']['link_token'] = array_map(
       function () {
         return Security::generateRandomString(Subscriber::LINK_TOKEN_LENGTH);