[Magento Community Engineering] Community Contributions - 2.4-develop-expedited-prs

 - merged with '2.4-develop-fast-lane-prs' branch

Author: magento-engcom-team

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -17,6 +17,7 @@
 use Magento\Customer\Model\Data\CustomerSecureFactory;
 use Magento\Customer\Model\Delegation\Data\NewOperation;
 use Magento\Customer\Model\Delegation\Storage as DelegatedStorage;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
@@ -31,6 +32,8 @@
 /**
  * Customer repository.
  *
+ * CRUD operations for customer entity
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -187,8 +190,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
     {
         /** @var NewOperation|null $delegatedNewOperation */
         $delegatedNewOperation = !$customer->getId() ? $this->delegatedStorage->consumeNewOperation() : null;
-        $prevCustomerData = null;
-        $prevCustomerDataArr = null;
+        $prevCustomerData = $prevCustomerDataArr = null;
         if ($customer->getId()) {
             $prevCustomerData = $this->getById($customer->getId());
             $prevCustomerDataArr = $prevCustomerData->__toArray();
@@ -214,6 +216,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
                 $prevCustomerData ? $prevCustomerData->getStoreId() : $this->storeManager->getStore()->getId()
             );
         }
+        $this->setCustomerGroupId($customerModel, $customerArr, $prevCustomerDataArr);
         // Need to use attribute set or future updates can cause data loss
         if (!$customerModel->getAttributeSetId()) {
             $customerModel->setAttributeSetId(CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER);
@@ -452,4 +455,18 @@ private function setValidationFlag($customerArray, $customerModel)
             $customerModel->setData('ignore_validation_flag', true);
         }
     }
+
+    /**
+     * Set customer group id
+     *
+     * @param Customer $customerModel
+     * @param array $customerArr
+     * @param array $prevCustomerDataArr
+     */
+    private function setCustomerGroupId($customerModel, $customerArr, $prevCustomerDataArr)
+    {
+        if (!isset($customerArr['group_id']) && $prevCustomerDataArr && isset($prevCustomerDataArr['group_id'])) {
+            $customerModel->setGroupId($prevCustomerDataArr['group_id']);
+        }
+    }
 }

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php

@@ -211,6 +211,7 @@ public function testSave()
                 'setFirstFailure',
                 'setLockExpires',
                 'save',
+                'setGroupId'
             ]
         );
 
@@ -245,9 +246,15 @@ public function testSave()
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
-        $this->customer->expects($this->atLeastOnce())
+        $this->customer->expects($this->at(4))
             ->method('__toArray')
             ->willReturn([]);
+        $this->customer->expects($this->at(3))
+            ->method('__toArray')
+            ->willReturn(['group_id' => 1]);
+        $customerModel->expects($this->once())
+            ->method('setGroupId')
+            ->with(1);
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('retrieve')
             ->with($customerId)

app/code/Magento/Wishlist/Controller/Index/Send.php

@@ -25,9 +25,8 @@
 use Magento\Customer\Model\Customer;
 
 /**
- * Class Send
+ * Class Send Email Wishlist Controller
  *
- * @package Magento\Wishlist\Controller\Index
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Send extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
@@ -204,7 +203,7 @@ public function execute()
                 $error = __('Please enter an email address.');
             } else {
                 if (count($emails) > $emailsLeft) {
-                    $error = __('This wish list can be shared %1 more times.', $emailsLeft);
+                    $error = __('Maximum of %1 emails can be sent.', $emailsLeft);
                 } else {
                     foreach ($emails as $index => $email) {
                         $email = trim($email);
@@ -319,7 +318,6 @@ protected function addLayoutHandles(ResultLayout $resultLayout)
      *
      * @param int $wishlistId
      * @param \Magento\Framework\View\Result\Layout $resultLayout
-     * @return mixed
      */
     protected function getRssLink($wishlistId, ResultLayout $resultLayout)
     {

app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php

@@ -5,7 +5,10 @@
  */
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
 use Magento\Customer\Model\Data\Customer as CustomerData;
+use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
@@ -14,15 +17,13 @@
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\Mail\TransportInterface;
 use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Result\Layout as ResultLayout;
 use Magento\Store\Model\Store;
 use Magento\Wishlist\Controller\Index\Send;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Captcha\Helper\Data as CaptchaHelper;
-use Magento\Captcha\Model\DefaultModel as CaptchaModel;
-use Magento\Customer\Model\Session;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -212,7 +213,12 @@ protected function setUp()
         );
     }
 
-    public function testExecuteNoFormKeyValidated()
+    /**
+     * Verify execute method without Form Key validated
+     *
+     * @return void
+     */
+    public function testExecuteNoFormKeyValidated(): void
     {
         $this->formKeyValidator->expects($this->once())
             ->method('validate')
@@ -228,8 +234,43 @@ public function testExecuteNoFormKeyValidated()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\NotFoundException
-     * @expectedExceptionMessage Page not found.
+     * Verify execute with no emails left
+     *
+     * @return void
+     */
+    public function testExecuteWithNoEmailLeft(): void
+    {
+        $expectedMessage = new Phrase('Maximum of %1 emails can be sent.', [0]);
+
+        $this->formKeyValidator->expects($this->once())
+            ->method('validate')
+            ->with($this->request)
+            ->willReturn(true);
+
+        $this->request->expects($this->at(0))
+            ->method('getPost')
+            ->with('emails')
+            ->willReturn('[email protected]', '[email protected]');
+        $this->request->expects($this->at(1))
+            ->method('getPost')
+            ->with('message');
+        $wishlist = $this->createMock(\Magento\Wishlist\Model\Wishlist::class);
+        $this->wishlistProvider->expects($this->once())
+            ->method('getWishlist')
+            ->willReturn($wishlist);
+        $this->resultRedirect->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/share')
+            ->willReturnSelf();
+        $this->messageManager->expects($this->once())
+            ->method('addErrorMessage')
+            ->with($expectedMessage);
+
+        $this->assertEquals($this->resultRedirect, $this->model->execute());
+    }
+
+    /**
+     * Execute method with no wishlist available
      */
     public function testExecuteNoWishlistAvailable()
     {
@@ -241,6 +282,8 @@ public function testExecuteNoWishlistAvailable()
         $this->wishlistProvider->expects($this->once())
             ->method('getWishlist')
             ->willReturn(null);
+        $this->expectException(\Magento\Framework\Exception\NotFoundException::class);
+        $this->expectExceptionMessage('Page not found');
 
         $this->model->execute();
     }