https://github.com/thehcginstitute-com/m1/issues/590

thehcginstitute-com · May 2, 2024 · d30011d · d30011d
1 parent f543a9a
commit d30011d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php b/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
@@ -9,7 +9,6 @@ final class Ebizmarts_MailChimp_Model_ProcessWebhook {
  * "Refactor `Ebizmarts_MailChimp_Model_ProcessWebhook`": https://github.com/cabinetsbay/site/issues/590
  * @used-by Ebizmarts_MailChimp_Model_Cron::deleteWebhookRequests()
  * @used-by Ebizmarts_MailChimp_Model_Cron::processWebhookData()
- * @used-by Ebizmarts_MailChimp_WebhookController::indexAction()
  */
  function __construct() {
  $this->_helper = hcg_mc_h();
@@ -18,19 +17,6 @@ function __construct() {
  $this->_interestGroupHandle = Mage::getModel('mailchimp/api_subscribers_InterestGroupHandle');
  }
 
- /**
- * 2024-05-02 Dmitrii Fediuk https://upwork.com/fl/mage2pro
- * "Refactor `Ebizmarts_MailChimp_Model_ProcessWebhook`": https://github.com/cabinetsbay/site/issues/590
- * @used-by Ebizmarts_MailChimp_WebhookController::indexAction()
- */
- function saveWebhookRequest(array $data):void {
- Mage::getModel('mailchimp/webhookrequest')
- ->setType($data['type'])
- ->setFiredAt($data['fired_at'])
- ->setDataRequest($this->_helper->serialize($data['data']))
- ->save();
- }
-
  /**
  * Process Webhook request
  *

diff --git a/app/code/community/Ebizmarts/MailChimp/controllers/WebhookController.php b/app/code/community/Ebizmarts/MailChimp/controllers/WebhookController.php
@@ -1,5 +1,4 @@
 <?php
-use Ebizmarts_MailChimp_Model_ProcessWebhook as Process;
 class Ebizmarts_MailChimp_WebhookController extends Mage_Core_Controller_Front_Action
 {
  protected $_mailchimpHelper = null;
@@ -69,8 +68,7 @@ function indexAction()
  //Validate "wkey" GET parameter
  if ($myKey == $requestKey) {
  if ($request->getPost('type')) {
- $p = new Process; /** @var Process $p */
- $p->saveWebhookRequest($data);
+ self::saveWebhookRequest($data);
  }
  # 2024-03-16 Dmitrii Fediuk https://upwork.com/fl/mage2pro
  # "«Webhook successfully created» should not be logged as an error my MailChimp":
@@ -113,4 +111,17 @@ protected function _deleteWebhook($storeId, $listId)
  }
  }
  }
+
+ /**
+ * 2024-05-02 Dmitrii Fediuk https://upwork.com/fl/mage2pro
+ * "Refactor `Ebizmarts_MailChimp_Model_ProcessWebhook`": https://github.com/cabinetsbay/site/issues/590
+ * @used-by Ebizmarts_MailChimp_WebhookController::indexAction()
+ */
+ private static function saveWebhookRequest(array $d):void {
+ Mage::getModel('mailchimp/webhookrequest')
+ ->setType($d['type'])
+ ->setFiredAt($d['fired_at'])
+ ->setDataRequest(hcg_mc_h()->serialize($d['data']))
+ ->save();
+ }
 }
diff --git a/app/code/local/HCG/MailChimp/lib/h/main.php b/app/code/local/HCG/MailChimp/lib/h/main.php
@@ -74,6 +74,7 @@
  * @used-by Ebizmarts_MailChimp_Model_System_Config_Source_List::makeHelper()
  * @used-by Ebizmarts_MailChimp_Model_System_Config_Source_Store::makeHelper()
  * @used-by Ebizmarts_MailChimp_Model_System_Config_Source_Userinfo::toOptionArray()
+ * @used-by Ebizmarts_MailChimp_WebhookController::saveWebhookRequest()
  * @used-by HCG\MailChimp\Batch\HandleErrorItem::p()
  * @used-by HCG\MailChimp\Observer\AddTabToCustomer::p() (https://github.com/thehcginstitute-com/m1/issues/580)
  * @used-by app/design/adminhtml/default/default/template/ebizmarts/mailchimp/customer/tab/mailchimp.phtml