Skip to content

Commit 40b875d

Browse files
committed
MC-31767: [AR] Data sync is not enabled by default
1 parent 45b8b40 commit 40b875d

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

app/code/Magento/Analytics/Setup/Patch/Data/ActivateDataCollection.php

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
declare(strict_types=1);
8+
79
namespace Magento\Analytics\Setup\Patch\Data;
810

911
use Magento\Analytics\Model\Config\Backend\CollectionTime;
1012
use Magento\Analytics\Model\SubscriptionStatusProvider;
1113
use Magento\Framework\App\Config\ScopeConfigInterface;
14+
use Magento\Framework\Exception\LocalizedException;
1215
use Magento\Framework\Setup\Patch\DataPatchInterface;
1316

1417
/**
@@ -39,33 +42,33 @@ class ActivateDataCollection implements DataPatchInterface
3942
/**
4043
* @param ScopeConfigInterface $scopeConfig
4144
* @param SubscriptionStatusProvider $subscriptionStatusProvider
42-
* @param CollectionTime $collectionTimeBackandModel
45+
* @param CollectionTime $collectionTimeBackendModel
4346
*/
4447
public function __construct(
4548
ScopeConfigInterface $scopeConfig,
4649
SubscriptionStatusProvider $subscriptionStatusProvider,
47-
CollectionTime $collectionTimeBackandModel
50+
CollectionTime $collectionTimeBackendModel
4851
) {
4952
$this->scopeConfig = $scopeConfig;
5053
$this->subscriptionStatusProvider = $subscriptionStatusProvider;
51-
$this->collectionTimeBackendModel = $collectionTimeBackandModel;
54+
$this->collectionTimeBackendModel = $collectionTimeBackendModel;
5255
}
5356

5457
/**
5558
* @inheritDoc
56-
* @throws \Exception
59+
* @throws LocalizedException
5760
*/
5861
public function apply()
5962
{
6063
$subscriptionStatus = $this->subscriptionStatusProvider->getStatus();
61-
if ($subscriptionStatus !== $this->subscriptionStatusProvider->getStatusForDisabledSubscription()) {
62-
$isCollectionProcessActivated = $this->scopeConfig->getValue(CollectionTime::CRON_SCHEDULE_PATH);
63-
if (!$isCollectionProcessActivated) {
64-
$this->collectionTimeBackendModel
65-
->setValue($this->scopeConfig->getValue($this->analyticsCollectionTimeConfigPath));
66-
$this->collectionTimeBackendModel->setPath($this->analyticsCollectionTimeConfigPath);
67-
$this->collectionTimeBackendModel->afterSave();
68-
}
64+
$isCollectionProcessActivated = $this->scopeConfig->getValue(CollectionTime::CRON_SCHEDULE_PATH);
65+
if ($subscriptionStatus !== $this->subscriptionStatusProvider->getStatusForDisabledSubscription()
66+
&& !$isCollectionProcessActivated
67+
) {
68+
$this->collectionTimeBackendModel
69+
->setValue($this->scopeConfig->getValue($this->analyticsCollectionTimeConfigPath));
70+
$this->collectionTimeBackendModel->setPath($this->analyticsCollectionTimeConfigPath);
71+
$this->collectionTimeBackendModel->afterSave();
6972
}
7073

7174
return $this;

app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
declare(strict_types=1);
8+
79
namespace Magento\Analytics\Setup\Patch\Data;
810

911
use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
@@ -13,7 +15,7 @@
1315
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1416

1517
/**
16-
* Initial patch
18+
* Active subscription process for Advanced Reporting
1719
*/
1820
class PrepareInitialConfig implements DataPatchInterface, PatchVersionInterface
1921
{

0 commit comments

Comments
 (0)