admin checkout agreement controllers refactor

Author: AnshuMishra17

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\CheckoutAgreements\Controller\Adminhtml;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
+
 abstract class Agreement extends \Magento\Backend\App\Action
 {
     /**
@@ -20,15 +23,35 @@ abstract class Agreement extends \Magento\Backend\App\Action
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
+    
+    /**
+     * @var CheckoutAgreementsRepositoryInterface
+     */
+    protected $_agreementRepository;
+    
+    /**
+     * @var \Magento\CheckoutAgreements\Model\AgreementFactory
+     */
+    protected $_agreementFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
+     * @param CheckoutAgreementsRepositoryInterface $agreementRepository
+     * @param \Magento\CheckoutAgreements\Model\AgreementFactory $agreementFactory
      * @codeCoverageIgnore
      */
-    public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
-    {
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        CheckoutAgreementsRepositoryInterface $agreementRepository = null,
+        \Magento\CheckoutAgreements\Model\AgreementFactory $agreementFactory = null
+    ) {
         $this->_coreRegistry = $coreRegistry;
+        $this->_agreementRepository = $agreementRepository ?:
+                ObjectManager::getInstance()->get(CheckoutAgreementsRepositoryInterface::class);
+        $this->_agreementFactory = $agreementFactory ?:
+                ObjectManager::getInstance()->get(\Magento\CheckoutAgreements\Model\AgreementFactory::class);
         parent::__construct($context);
     }
 

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php

@@ -14,15 +14,15 @@ class Delete extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
     public function execute()
     {
         $id = (int)$this->getRequest()->getParam('id');
-        $model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class)->load($id);
-        if (!$model->getId()) {
+        $repository = $this->_agreementRepository->get($id);
+        if (!$repository->getAgreementId()) {
             $this->messageManager->addError(__('This condition no longer exists.'));
             $this->_redirect('checkout/*/');
             return;
         }
 
         try {
-            $model->delete();
+            $repository->delete();
             $this->messageManager->addSuccess(__('You deleted the condition.'));
             $this->_redirect('checkout/*/');
             return;

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php

@@ -15,7 +15,7 @@ class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
     public function execute()
     {
         $id = $this->getRequest()->getParam('id');
-        $agreementModel = $this->_objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
+        $agreementModel = $this->_agreementFactory->create();
 
         if ($id) {
             $agreementModel->load($id);
@@ -26,7 +26,7 @@ public function execute()
             }
         }
 
-        $data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getAgreementData(true);
+        $data = $this->_session->getAgreementData(true);
         if (!empty($data)) {
             $agreementModel->setData($data);
         }

app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Save.php

@@ -15,7 +15,7 @@ public function execute()
     {
         $postData = $this->getRequest()->getPostValue();
         if ($postData) {
-            $model = $this->_objectManager->get(\Magento\CheckoutAgreements\Model\Agreement::class);
+            $model = $this->_agreementFactory->create();
             $model->setData($postData);
 
             try {
@@ -36,7 +36,7 @@ public function execute()
                 $this->messageManager->addError(__('Something went wrong while saving this condition.'));
             }
 
-            $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setAgreementData($postData);
+            $this->_session->setAgreementData($postData);
             $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
     }