Merge branch 'ACP2E-3329' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-11-27-CE

Author: vkolesny

app/code/Magento/Customer/Model/Visitor.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -35,10 +35,10 @@
  */
 class Visitor extends AbstractModel
 {
-    const VISITOR_TYPE_CUSTOMER = 'c';
-    const VISITOR_TYPE_VISITOR = 'v';
-    const DEFAULT_ONLINE_MINUTES_INTERVAL = 15;
-    const XML_PATH_ONLINE_INTERVAL = 'customer/online_customers/online_minutes_interval';
+    public const VISITOR_TYPE_CUSTOMER = 'c';
+    public const VISITOR_TYPE_VISITOR = 'v';
+    public const DEFAULT_ONLINE_MINUTES_INTERVAL = 15;
+    public const XML_PATH_ONLINE_INTERVAL = 'customer/online_customers/online_minutes_interval';
     private const SECONDS_24_HOURS = 86400;
 
     /**
@@ -213,7 +213,6 @@ public function afterSave()
         return parent::afterSave();
     }
 
-
     /**
      * Save visitor by request
      *
@@ -293,6 +292,7 @@ public function bindCustomerLogin($observer)
         if (!$this->getCustomerId()) {
             $this->setDoCustomerLogin(true);
             $this->setCustomerId($customer->getId());
+            $this->setCreatedAt((new \DateTime())->format(DateTime::DATETIME_PHP_FORMAT));
         }
         return $this;
     }

app/code/Magento/Customer/Observer/Visitor/InitByRequestObserver.php

@@ -1,38 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Customer\Observer\Visitor;
 
-use Magento\Customer\Model\Visitor;
 use Magento\Framework\Event\Observer;
-use Magento\Framework\Session\SessionManagerInterface;
 
 /**
  * Visitor Observer
- * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class InitByRequestObserver extends AbstractVisitorObserver
 {
-    /**
-     * @var SessionManagerInterface
-     */
-    private $sessionManager;
-
-    /**
-     * @param Visitor $visitor
-     * @param SessionManagerInterface $sessionManager
-     */
-    public function __construct(
-        Visitor $visitor,
-        SessionManagerInterface $sessionManager
-    ) {
-        parent::__construct($visitor);
-        $this->sessionManager = $sessionManager;
-    }
-
     /**
      * Init visitor by request
      *
@@ -41,9 +21,6 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        if ($observer->getRequest()->getFullActionName() === 'customer_account_loginPost') {
-            $this->sessionManager->setVisitorData(['do_customer_login' => true]);
-        }
         $this->visitor->initByRequest($observer);
     }
 }

dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Model;
 
@@ -25,11 +25,14 @@ public function testBindCustomerLogin()
         // Visitor has not customer ID yet
         $this->assertTrue($visitor->getDoCustomerLogin());
         $this->assertEquals($customer->getId(), $visitor->getCustomerId());
+        $this->assertNotNull($visitor->getCreatedAt());
 
         // Visitor already has customer ID
+        $createdAt = $visitor->getCreatedAt();
         $visitor->unsDoCustomerLogin();
         $this->_loginCustomer('customer@example.com', 'password');
         $this->assertNull($visitor->getDoCustomerLogin());
+        $this->assertEquals($createdAt, $visitor->getCreatedAt());
     }
 
     /**