Fix magento#30296 - fix retrieving send count by ip, add verification…

… of ip conversion into int to integration test
Bartlomiejsz · Oct 7, 2020 · bc53649 · bc53649
1 parent ccc83b2
commit bc53649
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
@@ -43,7 +43,7 @@ public function getSendCount($object, $ip, $startTime, $websiteId = null)
                 AND  time>=:time
                 AND  website_id=:website_id'
         );
-        $bind = ['ip' => ip2long($ip), 'time' => $startTime, 'website_id' => (int)$websiteId];
+        $bind = ['ip' => $ip, 'time' => $startTime, 'website_id' => (int)$websiteId];
 
         $row = $connection->fetchRow($select, $bind);
         return $row['count'];

diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
@@ -28,6 +28,9 @@ class SendFriendTest extends TestCase
     /** @var SendFriend */
     private $sendFriend;
 
+    /** @var ResourceModel\SendFriend */
+    private $sendFriendResource;
+
     /** @var CookieManagerInterface */
     private $cookieManager;
 
@@ -43,6 +46,7 @@ protected function setUp(): void
 
         $this->objectManager = Bootstrap::getObjectManager();
         $this->sendFriend = $this->objectManager->get(SendFriendFactory::class)->create();
+        $this->sendFriendResource = $this->objectManager->get(ResourceModel\SendFriend::class);
         $this->cookieManager = $this->objectManager->get(CookieManagerInterface::class);
         $this->request = $this->objectManager->get(RequestInterface::class);
     }
@@ -191,10 +195,21 @@ public function testisExceedLimitByCookies(): void
      */
     public function testisExceedLimitByIp(): void
     {
+        $remoteAddr = '127.0.0.1';
         $parameters = $this->objectManager->create(Parameters::class);
-        $parameters->set('REMOTE_ADDR', '127.0.0.1');
+        $parameters->set('REMOTE_ADDR', $remoteAddr);
         $this->request->setServer($parameters);
         $this->assertTrue($this->sendFriend->isExceedLimit());
+        // Verify that ip is saved correctly as integer value
+        $this->assertEquals(
+            1,
+            (int)$this->sendFriendResource->getSendCount(
+                null,
+                ip2long($remoteAddr),
+                time() - (60 * 60 * 24 * 365),
+                1
+            )
+        );
     }
 
     /**