CheckoutAgreements getList refactoring

Author: Stanislav Idolov

app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidation.php

@@ -23,11 +23,6 @@ class GuestValidation
      */
     private $scopeConfiguration;
 
-    /**
-     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface
-     */
-    private $checkoutAgreementsRepository;
-
     /**
      * @var \Magento\Checkout\Api\AgreementsValidatorInterface
      */
@@ -46,20 +41,17 @@ class GuestValidation
     /**
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
-     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
      * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList
      * @param ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
      */
     public function __construct(
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
-        \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository,
         \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList,
         \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
     ) {
         $this->agreementsValidator = $agreementsValidator;
         $this->scopeConfiguration = $scopeConfiguration;
-        $this->checkoutAgreementsRepository = $checkoutAgreementsRepository;
         $this->checkoutAgreementsList = $checkoutAgreementsList;
         $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter;
     }

app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php

@@ -19,11 +19,6 @@ class Validation
      */
     protected $scopeConfiguration;
 
-    /**
-     * @var \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface
-     */
-    protected $checkoutAgreementsRepository;
-
     /**
      * @var \Magento\Checkout\Api\AgreementsValidatorInterface
      */
@@ -42,20 +37,17 @@ class Validation
     /**
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration
-     * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository
      * @param \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList
      * @param ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
      */
     public function __construct(
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementsValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfiguration,
-        \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface $checkoutAgreementsRepository,
         \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface $checkoutAgreementsList,
         \Magento\CheckoutAgreements\Model\Api\SearchCriteria\ActiveStoreAgreementsFilter $activeStoreAgreementsFilter
     ) {
         $this->agreementsValidator = $agreementsValidator;
         $this->scopeConfiguration = $scopeConfiguration;
-        $this->checkoutAgreementsRepository = $checkoutAgreementsRepository;
         $this->checkoutAgreementsList = $checkoutAgreementsList;
         $this->activeStoreAgreementsFilter = $activeStoreAgreementsFilter;
     }

app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php

@@ -66,10 +66,6 @@ protected function setUp()
             ['getAgreementIds']
         );
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $repositoryMock = $this->createMock(
-            \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface::class
-        );
-
         $this->checkoutAgreementsListMock = $this->createMock(
             \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
         );
@@ -80,7 +76,6 @@ protected function setUp()
         $this->model = new \Magento\CheckoutAgreements\Model\Checkout\Plugin\GuestValidation(
             $this->agreementsValidatorMock,
             $this->scopeConfigMock,
-            $repositoryMock,
             $this->checkoutAgreementsListMock,
             $this->agreementsFilterMock
         );

app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php

@@ -66,10 +66,6 @@ protected function setUp()
             ['getAgreementIds']
         );
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $repositoryMock = $this->createMock(
-            \Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface::class
-        );
-
         $this->checkoutAgreementsListMock = $this->createMock(
             \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::class
         );
@@ -80,7 +76,6 @@ protected function setUp()
         $this->model = new \Magento\CheckoutAgreements\Model\Checkout\Plugin\Validation(
             $this->agreementsValidatorMock,
             $this->scopeConfigMock,
-            $repositoryMock,
             $this->checkoutAgreementsListMock,
             $this->agreementsFilterMock
         );