ENGCOM-8034: #28422 :- Newsletter subscription confirmation email nev…

…er sent again #29510 - Merge Pull Request #29510 from konarshankar07/magento2:newsletter-confirmation-email--task-28422 - Merged commits: 1. 1a7c8cd 2. 6e53e0d 3. ea584f9 4. ab3db16
magento · Aug 21, 2020 · ec8a262 · ec8a262
2 parents 8b7d949 + ab3db16
commit ec8a262
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 11 deletions.
diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManager.php b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
@@ -195,12 +195,14 @@ private function saveSubscriber(
     ): bool {
         $statusChanged = (int)$subscriber->getStatus() !== $status;
         $emailChanged = $subscriber->getEmail() !== $customer->getEmail();
-        if ($subscriber->getId()
-            && !$statusChanged
-            && (int)$subscriber->getCustomerId() === (int)$customer->getId()
-            && (int)$subscriber->getStoreId() === $storeId
-            && !$emailChanged
-        ) {
+        if ($this->dontNeedToSaveSubscriber(
+            $subscriber,
+            $customer,
+            $statusChanged,
+            $storeId,
+            $status,
+            $emailChanged
+        )) {
             return false;
         }
 
@@ -220,10 +222,37 @@ private function saveSubscriber(
 
         /**
          * If the subscriber is waiting to confirm from the customer
-         * and customer changed the email
+         * or customer changed the email
          * than need to send confirmation letter to the new email
          */
-        return $status === Subscriber::STATUS_NOT_ACTIVE && $emailChanged;
+        return $status === Subscriber::STATUS_NOT_ACTIVE || $emailChanged;
+    }
+
+    /**
+     *  Don't need to save subscriber model
+     *
+     * @param Subscriber $subscriber
+     * @param CustomerInterface $customer
+     * @param bool $statusChanged
+     * @param int $storeId
+     * @param int $status
+     * @param bool $emailChanged
+     * @return bool
+     */
+    private function dontNeedToSaveSubscriber(
+        Subscriber $subscriber,
+        CustomerInterface $customer,
+        bool $statusChanged,
+        int $storeId,
+        int $status,
+        bool $emailChanged
+    ): bool {
+        return $subscriber->getId()
+            && !$statusChanged
+            && (int)$subscriber->getCustomerId() === (int)$customer->getId()
+            && (int)$subscriber->getStoreId() === $storeId
+            && !$emailChanged
+            && $status !== Subscriber::STATUS_NOT_ACTIVE;
     }
 
     /**

diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
@@ -454,7 +454,7 @@ public function subscribeCustomerDataProvider(): array
                     'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
                     'subscriber_confirm_code' => '',
                 ],
-                'needToSendEmail' => false,
+                'needToSendEmail' => true,
             ],
             'Update subscription data: subscription confirm required ' => [
                 'subscriber_data' => [
@@ -618,7 +618,7 @@ public function unsubscribeCustomerDataProvider(): array
                     'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
                     'subscriber_confirm_code' => '',
                 ],
-                'needToSendEmail' => false,
+                'needToSendEmail' => true,
             ],
             'Update subscription data' => [
                 'subscriber_data' => [
@@ -642,7 +642,7 @@ public function unsubscribeCustomerDataProvider(): array
                     'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                     'subscriber_confirm_code' => '',
                 ],
-                'needToSendEmail' => false,
+                'needToSendEmail' => true,
             ],
         ];
     }