Skip to content

Commit 59632d8

Browse files
mslabkomslabko
committed
MAGETWO-86143: Disable statistic collecting for Reports module
1 parent 653c6aa commit 59632d8

11 files changed

+63
-61
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
4040
protected $httpHeader;
4141

4242
/**
43+
* Skip logging during request. Do not use this property directly, but use self::isSkipRequestLogging instead
44+
*
4345
* @var bool
4446
*/
4547
protected $skipRequestLogging = false;
@@ -144,11 +146,12 @@ public function setSkipRequestLogging($skipRequestLogging)
144146
}
145147

146148
/**
149+
* Check if we can log request fot event. Additionally prevent logging for safe methods (e.g. GET request)
150+
*
147151
* @return bool
148152
*/
149153
private function isSkipRequestLogging()
150154
{
151-
// do not handle visitor session for safe methods (e.g. GET request)
152155
if ($this->requestSafety->isSafeMethod()) {
153156
return true;
154157
}

‎app/code/Magento/Reports/Model/Event/IsReportEnabled.php renamed to ‎app/code/Magento/Reports/Model/ReportStatus.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\Reports\Model\Event;
8+
namespace Magento\Reports\Model;
99

1010
use Magento\Framework\App\Config\ScopeConfigInterface;
1111
use Magento\Framework\Exception\InputException;
12-
use Magento\Reports\Model\Event;
1312

1413
/**
1514
* Is report for specified event type is enabled in system configuration
1615
*/
17-
class IsReportEnabled
16+
class ReportStatus
1817
{
1918
/**
2019
* @var ScopeConfigInterface
@@ -36,7 +35,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
3635
* @return bool
3736
* @throws InputException
3837
*/
39-
public function execute(string $reportEventType): bool
38+
public function isReportEnabled(string $reportEventType): bool
4039
{
4140
return (bool)$this->scopeConfig->getValue('reports/options/enabled')
4241
&& (bool)$this->scopeConfig->getValue($this->getConfigPathByEventType($reportEventType));

‎app/code/Magento/Reports/Observer/CatalogProductCompareAddProductObserver.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,29 @@ class CatalogProductCompareAddProductObserver implements ObserverInterface
3434
protected $eventSaver;
3535

3636
/**
37-
* @var \Magento\Reports\Model\Event\IsReportEnabled
37+
* @var \Magento\Reports\Model\ReportStatus
3838
*/
39-
private $isReportEnabled;
39+
private $reportStatus;
4040

4141
/**
4242
* @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
4343
* @param \Magento\Customer\Model\Session $customerSession
4444
* @param \Magento\Customer\Model\Visitor $customerVisitor
4545
* @param EventSaver $eventSaver
46-
* @param Event\IsReportEnabled $isReportEnabled
46+
* @param \Magento\Reports\Model\ReportStatus $reportStatus
4747
*/
4848
public function __construct(
4949
\Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
5050
\Magento\Customer\Model\Session $customerSession,
5151
\Magento\Customer\Model\Visitor $customerVisitor,
5252
EventSaver $eventSaver,
53-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
53+
\Magento\Reports\Model\ReportStatus $reportStatus
5454
) {
5555
$this->_productCompFactory = $productCompFactory;
5656
$this->_customerSession = $customerSession;
5757
$this->_customerVisitor = $customerVisitor;
5858
$this->eventSaver = $eventSaver;
59-
$this->isReportEnabled = $isReportEnabled;
59+
$this->reportStatus = $reportStatus;
6060
}
6161

6262
/**
@@ -69,8 +69,8 @@ public function __construct(
6969
*/
7070
public function execute(\Magento\Framework\Event\Observer $observer)
7171
{
72-
if (!$this->isReportEnabled->execute(Event::EVENT_PRODUCT_COMPARE)) {
73-
return ;
72+
if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_COMPARE)) {
73+
return;
7474
}
7575
$productId = $observer->getEvent()->getProduct()->getId();
7676
$viewData = ['product_id' => $productId];

‎app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ class CatalogProductCompareClearObserver implements ObserverInterface
1818
protected $_productCompFactory;
1919

2020
/**
21-
* @var \Magento\Reports\Model\Event\IsReportEnabled
21+
* @var \Magento\Reports\Model\ReportStatus
2222
*/
23-
private $isReportEnabled;
23+
private $reportStatus;
2424

2525
/**
2626
* @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
2727
*/
2828
public function __construct(
2929
\Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
30-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
30+
\Magento\Reports\Model\ReportStatus $reportStatus
3131
) {
3232
$this->_productCompFactory = $productCompFactory;
33-
$this->isReportEnabled = $isReportEnabled;
33+
$this->reportStatus = $reportStatus;
3434
}
3535

3636
/**
@@ -44,8 +44,8 @@ public function __construct(
4444
*/
4545
public function execute(\Magento\Framework\Event\Observer $observer)
4646
{
47-
if (!$this->isReportEnabled->execute(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW)) {
48-
return ;
47+
if (!$this->reportStatus->isReportEnabled(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW)) {
48+
return;
4949
}
5050

5151
$this->_productCompFactory->create()->calculate();

‎app/code/Magento/Reports/Observer/CatalogProductViewObserver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class CatalogProductViewObserver implements ObserverInterface
3939
protected $eventSaver;
4040

4141
/**
42-
* @var \Magento\Reports\Model\Event\IsReportEnabled
42+
* @var \Magento\Reports\Model\ReportStatus
4343
*/
44-
private $isReportEnabled;
44+
private $reportStatus;
4545

4646
/**
4747
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -56,14 +56,14 @@ public function __construct(
5656
\Magento\Customer\Model\Session $customerSession,
5757
\Magento\Customer\Model\Visitor $customerVisitor,
5858
EventSaver $eventSaver,
59-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
59+
\Magento\Reports\Model\ReportStatus $reportStatus
6060
) {
6161
$this->_storeManager = $storeManager;
6262
$this->_productIndxFactory = $productIndxFactory;
6363
$this->_customerSession = $customerSession;
6464
$this->_customerVisitor = $customerVisitor;
6565
$this->eventSaver = $eventSaver;
66-
$this->isReportEnabled = $isReportEnabled;
66+
$this->reportStatus = $reportStatus;
6767
}
6868

6969
/**
@@ -74,8 +74,8 @@ public function __construct(
7474
*/
7575
public function execute(\Magento\Framework\Event\Observer $observer)
7676
{
77-
if (!$this->isReportEnabled->execute(Event::EVENT_PRODUCT_VIEW)) {
78-
return ;
77+
if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_VIEW)) {
78+
return;
7979
}
8080

8181
$productId = $observer->getEvent()->getProduct()->getId();

‎app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ class CheckoutCartAddProductObserver implements ObserverInterface
1919
protected $eventSaver;
2020

2121
/**
22-
* @var Event\IsReportEnabled
22+
* @var \Magento\Reports\Model\ReportStatus
2323
*/
24-
private $isReportEnabled;
24+
private $reportStatus;
2525

2626
/**
2727
* @param EventSaver $eventSaver
2828
*/
2929
public function __construct(
3030
EventSaver $eventSaver,
31-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
31+
\Magento\Reports\Model\ReportStatus $reportStatus
3232
) {
3333
$this->eventSaver = $eventSaver;
34-
$this->isReportEnabled = $isReportEnabled;
34+
$this->reportStatus = $reportStatus;
3535
}
3636

3737
/**
@@ -42,8 +42,8 @@ public function __construct(
4242
*/
4343
public function execute(\Magento\Framework\Event\Observer $observer)
4444
{
45-
if (!$this->isReportEnabled->execute(Event::EVENT_PRODUCT_TO_CART)) {
46-
return ;
45+
if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_TO_CART)) {
46+
return;
4747
}
4848

4949
$quoteItem = $observer->getEvent()->getItem();

‎app/code/Magento/Reports/Observer/SendfriendProductObserver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ class SendfriendProductObserver implements ObserverInterface
1919
protected $eventSaver;
2020

2121
/**
22-
* @var Event\IsReportEnabled
22+
* @var \Magento\Reports\Model\ReportStatus
2323
*/
24-
private $isReportEnabled;
24+
private $reportStatus;
2525

2626
/**
2727
* @param EventSaver $eventSaver
2828
*/
2929
public function __construct(
3030
EventSaver $eventSaver,
31-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
31+
\Magento\Reports\Model\ReportStatus $reportStatus
3232
) {
3333
$this->eventSaver = $eventSaver;
34-
$this->isReportEnabled = $isReportEnabled;
34+
$this->reportStatus = $reportStatus;
3535
}
3636

3737
/**
@@ -42,8 +42,8 @@ public function __construct(
4242
*/
4343
public function execute(\Magento\Framework\Event\Observer $observer)
4444
{
45-
if (!$this->isReportEnabled->execute(Event::EVENT_PRODUCT_SEND)) {
46-
return ;
45+
if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_SEND)) {
46+
return;
4747
}
4848

4949
$this->eventSaver->save(

‎app/code/Magento/Reports/Observer/WishlistAddProductObserver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ class WishlistAddProductObserver implements ObserverInterface
1919
protected $eventSaver;
2020

2121
/**
22-
* @var Event\IsReportEnabled
22+
* @var \Magento\Reports\Model\ReportStatus
2323
*/
24-
private $isReportEnabled;
24+
private $reportStatus;
2525

2626
/**
2727
* @param EventSaver $eventSaver
2828
*/
2929
public function __construct(
3030
EventSaver $eventSaver,
31-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
31+
\Magento\Reports\Model\ReportStatus $reportStatus
3232
) {
3333
$this->eventSaver = $eventSaver;
34-
$this->isReportEnabled = $isReportEnabled;
34+
$this->reportStatus = $reportStatus;
3535
}
3636

3737
/**
@@ -42,8 +42,8 @@ public function __construct(
4242
*/
4343
public function execute(\Magento\Framework\Event\Observer $observer)
4444
{
45-
if (!$this->isReportEnabled->execute(Event::EVENT_PRODUCT_TO_WISHLIST)) {
46-
return ;
45+
if (!$this->reportStatus->isReportEnabled(Event::EVENT_PRODUCT_TO_WISHLIST)) {
46+
return;
4747
}
4848

4949
$this->eventSaver->save(

‎app/code/Magento/Reports/Observer/WishlistShareObserver.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ class WishlistShareObserver implements ObserverInterface
1919
protected $eventSaver;
2020

2121
/**
22-
* @var Event\IsReportEnabled
22+
* @var \Magento\Reports\Model\ReportStatus
2323
*/
24-
private $isReportEnabled;
24+
private $reportStatus;
2525

2626
/**
2727
* @param EventSaver $eventSaver
2828
*/
2929
public function __construct(
3030
EventSaver $eventSaver,
31-
\Magento\Reports\Model\Event\IsReportEnabled $isReportEnabled
31+
\Magento\Reports\Model\ReportStatus $reportStatus
3232
) {
3333
$this->eventSaver = $eventSaver;
34-
$this->isReportEnabled = $isReportEnabled;
34+
$this->reportStatus = $reportStatus;
3535
}
3636

3737
/**
@@ -42,8 +42,8 @@ public function __construct(
4242
*/
4343
public function execute(\Magento\Framework\Event\Observer $observer)
4444
{
45-
if (!$this->isReportEnabled->execute(Event::EVENT_WISHLIST_SHARE)) {
46-
return ;
45+
if (!$this->reportStatus->isReportEnabled(Event::EVENT_WISHLIST_SHARE)) {
46+
return;
4747
}
4848

4949
$this->eventSaver->save(

‎app/code/Magento/Reports/Test/Unit/Observer/CatalogProductCompareAddProductObserverTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class CatalogProductCompareAddProductObserverTest extends \PHPUnit\Framework\Tes
5151
protected $productCompModelMock;
5252

5353
/**
54-
* @var \Magento\Reports\Model\Event\IsReportEnabled|\PHPUnit_Framework_MockObject_MockObject
54+
* @var \Magento\Reports\Model\ReportStatus|\PHPUnit_Framework_MockObject_MockObject
5555
*/
56-
private $isReportEnabledMock;
56+
private $reportStatusMock;
5757

5858
/**
5959
* {@inheritDoc}
@@ -103,9 +103,9 @@ protected function setUp()
103103
->setMethods(['save'])
104104
->getMock();
105105

106-
$this->isReportEnabledMock = $this->getMockBuilder(\Magento\Reports\Model\Event\IsReportEnabled::class)
106+
$this->reportStatusMock = $this->getMockBuilder(\Magento\Reports\Model\ReportStatus::class)
107107
->disableOriginalConstructor()
108-
->setMethods(['execute'])
108+
->setMethods(['isReportEnabled'])
109109
->getMock();
110110

111111
$this->observer = $objectManager->getObject(
@@ -115,7 +115,7 @@ protected function setUp()
115115
'customerSession' => $this->customerSessionMock,
116116
'customerVisitor' => $this->customerVisitorMock,
117117
'eventSaver' => $this->eventSaverMock,
118-
'isReportEnabled' => $this->isReportEnabledMock
118+
'reportStatus' => $this->reportStatusMock
119119
]
120120
);
121121
}
@@ -138,7 +138,7 @@ public function testCatalogProductCompareAddProduct($isLoggedIn, $userKey, $user
138138
];
139139
$observerMock = $this->getObserverMock($productId);
140140

141-
$this->isReportEnabledMock->expects($this->once())->method('execute')->willReturn(true);
141+
$this->reportStatusMock->expects($this->once())->method('isReportEnabled')->willReturn(true);
142142
$this->customerSessionMock->expects($this->any())->method('isLoggedIn')->willReturn($isLoggedIn);
143143
$this->customerSessionMock->expects($this->any())->method('getCustomerId')->willReturn($customerId);
144144

0 commit comments

Comments
 (0)