Updated code and add logger

mohitalgolia · mohitalgolia · commit 378497768d98 · 2024-02-19T19:39:42.000+05:30
diff --git a/Block/Adminhtml/Job/View.php b/Block/Adminhtml/Job/View.php
@@ -3,27 +3,26 @@
 namespace Algolia\AlgoliaSearch\Block\Adminhtml\Job;
 
 use Magento\Backend\Block\Widget\Button;
-use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 
 class View extends Template
 {
-    /** @var SessionManager */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /**
      * @param Context $context
-     * @param SessionManager $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param array $data
      */
     public function __construct(
         Context          $context,
-        SessionManager   $backendSession,
+        SessionManagerInterface   $backendSession,
         array $data = []
     ) {
         parent::__construct($context, $data);
-
         $this->backendSession = $backendSession;
     }
 
diff --git a/Block/Adminhtml/LandingPage/SearchConfiguration.php b/Block/Adminhtml/LandingPage/SearchConfiguration.php
@@ -6,14 +6,14 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Algolia\AlgoliaSearch\Model\LandingPage;
 use Magento\Backend\Block\Template\Context;
-use Magento\Backend\Model\Session;
+use Magento\Framework\Session\SessionManagerInterface;
 
 class SearchConfiguration extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'landingpage/search-configuration.phtml';
 
-    /** @var Session */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /** @var ConfigHelper */
@@ -27,14 +27,14 @@ class SearchConfiguration extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param Session $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        Session $backendSession,
+        SessionManagerInterface $backendSession,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
diff --git a/Block/Adminhtml/Query/Merchandising.php b/Block/Adminhtml/Query/Merchandising.php
@@ -6,14 +6,14 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Algolia\AlgoliaSearch\Model\Query;
 use Magento\Backend\Block\Template\Context;
-use Magento\Backend\Model\Session;
+use Magento\Framework\Session\SessionManagerInterface;
 
 class Merchandising extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'query/edit/merchandising.phtml';
 
-    /** @var Session */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /** @var ConfigHelper */
@@ -27,14 +27,14 @@ class Merchandising extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param Session $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        Session $backendSession,
+        SessionManagerInterface $backendSession,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
diff --git a/Block/Adminhtml/QueueArchive/View.php b/Block/Adminhtml/QueueArchive/View.php
@@ -3,23 +3,23 @@
 namespace Algolia\AlgoliaSearch\Block\Adminhtml\QueueArchive;
 
 use Magento\Backend\Block\Widget\Button;
-use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 
 class View extends Template
 {
-    /** @var SessionManager */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /**
      * @param Context $context
-     * @param SessionManager $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param array $data
      */
     public function __construct(
         Context          $context,
-        SessionManager   $backendSession,
+        SessionManagerInterface   $backendSession,
         array $data = []
     ) {
         parent::__construct($context, $data);
diff --git a/Controller/Adminhtml/Landingpage/AbstractAction.php b/Controller/Adminhtml/Landingpage/AbstractAction.php
@@ -5,13 +5,13 @@
 use Algolia\AlgoliaSearch\Helper\MerchandisingHelper;
 use Algolia\AlgoliaSearch\Model\LandingPageFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\Session;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 abstract class AbstractAction extends \Magento\Backend\App\Action
 {
 
-    /** @var Session */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /** @var LandingPageFactory */
@@ -25,14 +25,14 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
 
     /**
      * @param Context $context
-     * @param Session $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param LandingPageFactory $landingPageFactory
      * @param MerchandisingHelper $merchandisingHelper
      * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Context $context,
-        Session $backendSession,
+        SessionManagerInterface $backendSession,
         LandingPageFactory $landingPageFactory,
         MerchandisingHelper $merchandisingHelper,
         StoreManagerInterface $storeManager
diff --git a/Controller/Adminhtml/Landingpage/Save.php b/Controller/Adminhtml/Landingpage/Save.php
@@ -5,7 +5,7 @@
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Helper\MerchandisingHelper;
 use Algolia\AlgoliaSearch\Model\LandingPageFactory;
-use Magento\Backend\Model\Session;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
@@ -29,11 +29,16 @@ class Save extends AbstractAction
      */
     protected $configHelper;
 
+    /**
+     * @var SessionManagerInterface
+     */
+    protected $backendSession;
+
     /**
      * PHP Constructor
      *
      * @param \Magento\Backend\App\Action\Context $context
-     * @param Session $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param LandingPageFactory $landingPageFactory
      * @param MerchandisingHelper $merchandisingHelper
      * @param StoreManagerInterface $storeManager
@@ -43,7 +48,7 @@ class Save extends AbstractAction
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        Session $backendSession,
+        SessionManagerInterface $backendSession,
         LandingPageFactory $landingPageFactory,
         MerchandisingHelper $merchandisingHelper,
         StoreManagerInterface $storeManager,
diff --git a/Controller/Adminhtml/Query/AbstractAction.php b/Controller/Adminhtml/Query/AbstractAction.php
@@ -5,12 +5,12 @@
 use Algolia\AlgoliaSearch\Helper\MerchandisingHelper;
 use Algolia\AlgoliaSearch\Model\QueryFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\Session;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 abstract class AbstractAction extends \Magento\Backend\App\Action
 {
-    /** @var Session */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /** @var QueryFactory */
@@ -24,14 +24,14 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
 
     /**
      * @param Context $context
-     * @param Session $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param QueryFactory $queryFactory
      * @param MerchandisingHelper $merchandisingHelper
      * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Context $context,
-        Session $backendSession,
+        SessionManagerInterface $backendSession,
         QueryFactory $queryFactory,
         MerchandisingHelper $merchandisingHelper,
         StoreManagerInterface $storeManager
diff --git a/Controller/Adminhtml/Query/Save.php b/Controller/Adminhtml/Query/Save.php
@@ -6,7 +6,7 @@
 use Algolia\AlgoliaSearch\Helper\MerchandisingHelper;
 use Algolia\AlgoliaSearch\Model\ImageUploader;
 use Algolia\AlgoliaSearch\Model\QueryFactory;
-use Magento\Backend\Model\Session;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
@@ -29,11 +29,16 @@ class Save extends AbstractAction
      */
     protected $imageUploader;
 
+    /**
+     * @var SessionManagerInterface
+     */
+    protected  $backendSession;
+
     /**
      * PHP Constructor
      *
      * @param \Magento\Backend\App\Action\Context $context
-     * @param Session $backendSession
+     * @param SessionManagerInterface $backendSession
      * @param QueryFactory $queryFactory
      * @param MerchandisingHelper $merchandisingHelper
      * @param StoreManagerInterface $storeManager
@@ -45,7 +50,7 @@ class Save extends AbstractAction
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        Session $backendSession,
+        SessionManagerInterface $backendSession,
         QueryFactory $queryFactory,
         MerchandisingHelper $merchandisingHelper,
         StoreManagerInterface $storeManager,
diff --git a/Controller/Adminhtml/Queue/AbstractAction.php b/Controller/Adminhtml/Queue/AbstractAction.php
@@ -5,12 +5,12 @@
 use Algolia\AlgoliaSearch\Model\JobFactory;
 use Algolia\AlgoliaSearch\Model\ResourceModel\Job as JobResourceModel;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Indexer\Model\IndexerFactory;
 
 abstract class AbstractAction extends \Magento\Backend\App\Action
 {
-    /** @var SessionManager */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /** @var \Algolia\AlgoliaSearch\Model\JobFactory */
@@ -24,14 +24,14 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
 
     /**
      * @param Context          $context
-     * @param SessionManager          $backendSession
+     * @param SessionManagerInterface          $backendSession
      * @param JobFactory       $jobFactory
      * @param JobResourceModel $jobResourceModel
      * @param IndexerFactory   $indexerFactory
      */
     public function __construct(
         Context $context,
-        SessionManager $backendSession,
+        SessionManagerInterface $backendSession,
         JobFactory $jobFactory,
         JobResourceModel $jobResourceModel,
         IndexerFactory $indexerFactory
diff --git a/Controller/Adminhtml/QueueArchive/AbstractAction.php b/Controller/Adminhtml/QueueArchive/AbstractAction.php
@@ -5,12 +5,12 @@
 use Algolia\AlgoliaSearch\Model\QueueArchiveFactory;
 use Algolia\AlgoliaSearch\Model\ResourceModel\QueueArchive as QueueArchiveResourceModel;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Indexer\Model\IndexerFactory;
 
 abstract class AbstractAction extends \Magento\Backend\App\Action
 {
-    /** @var SessionManager */
+    /** @var SessionManagerInterface */
     protected $backendSession;
 
     /** @var \Algolia\AlgoliaSearch\Model\QueueArchiveFactory */
@@ -24,14 +24,14 @@ abstract class AbstractAction extends \Magento\Backend\App\Action
 
     /**
      * @param Context          $context
-     * @param SessionManager          $backendSession
+     * @param SessionManagerInterface          $backendSession
      * @param QueueArchiveFactory       $queueArchiveFactory
      * @param QueueArchiveResourceModel $queueArchiveResourceModel
      * @param IndexerFactory   $indexerFactory
      */
     public function __construct(
         Context $context,
-        SessionManager $backendSession,
+        SessionManagerInterface $backendSession,
         QueueArchiveFactory $queueArchiveFactory,
         QueueArchiveResourceModel $queueArchiveResourceModel,
         IndexerFactory $indexerFactory
diff --git a/Helper/ConfigHelper.php b/Helper/ConfigHelper.php
@@ -200,7 +200,7 @@ class ConfigHelper
      * @var GroupExcludedWebsiteRepositoryInterface
      */
     protected $groupExcludedWebsiteRepository;
-  
+
     /**
      * @var CookieHelper
      */
@@ -1010,6 +1010,7 @@ public function getAutocompleteMinimumCharacterLength($storeId = null): int
      * @param $currentCustomerGroupId
      * @param $attrs
      * @return array
+     * @throws Magento\Framework\Exception\LocalizedException
      * @throws Magento\Framework\Exception\NoSuchEntityException
      */
     public function getSortingIndices($originalIndexName, $storeId = null, $currentCustomerGroupId = null, $attrs = null)
@@ -1068,7 +1069,7 @@ public function getSortingIndices($originalIndexName, $storeId = null, $currentC
                 $sortAttribute = $attr['attribute'];
             }
             if ($indexName && $sortAttribute) {
-                $attrs[$key]['name'] = $indexName;                
+                $attrs[$key]['name'] = $indexName;
                 if (!array_key_exists('label', $attrs[$key]) && array_key_exists('sortLabel', $attrs[$key])) {
                     $attrs[$key]['label'] = $attrs[$key]['sortLabel'];
                 }
diff --git a/Helper/Entity/Product/PriceManager/Configurable.php b/Helper/Entity/Product/PriceManager/Configurable.php
@@ -16,7 +16,9 @@ protected function getRulePrice($groupId, $product, $subProducts)
     {
         $childrenPrices = [];
         $typeInstance = $product->getTypeInstance();
+
         if (!$typeInstance instanceof \Magento\ConfigurableProduct\Model\Product\Type\Configurable) {
+            $this->logger->log('Unexpected product type encountered, reverting to default price calculation. Where Product Id is ' .$product->getId(). ' and Group Id is ' .$groupId);
             return parent::getRulePrice($groupId, $product, $subProducts);
         }
 
diff --git a/Helper/Entity/Product/PriceManager/ProductWithoutChildren.php b/Helper/Entity/Product/PriceManager/ProductWithoutChildren.php
diff --git a/Helper/Entity/ProductHelper.php b/Helper/Entity/ProductHelper.php
