Configure ModeSwithcers, Refinement CategoryIndexer Class, preparatio…

…n of logic for new indexer
Nosto · Aug 28, 2024 · 95324ee · 95324ee
1 parent adb846e
commit 95324ee
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 17 deletions.
diff --git a/Model/Indexer/AbstractIndexer.php b/Model/Indexer/AbstractIndexer.php
@@ -51,7 +51,7 @@
 use Nosto\Tagging\Helper\Scope as NostoHelperScope;
 use Nosto\Tagging\Logger\Logger as NostoLogger;
 use Nosto\Tagging\Model\Indexer\Dimensions\AbstractDimensionModeConfiguration as DimensionModeConfiguration;
-use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch\ModeSwitcherInterface;
+use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcherInterface;
 use Nosto\Tagging\Model\Indexer\Dimensions\StoreDimensionProvider;
 use Nosto\Tagging\Model\Service\Indexer\IndexerStatusServiceInterface;
 use Nosto\Tagging\Util\Benchmark;

diff --git a/Model/Indexer/CategoryIndexer.php b/Model/Indexer/CategoryIndexer.php
@@ -43,8 +43,8 @@
 use Nosto\NostoException;
 use Nosto\Tagging\Helper\Scope as NostoHelperScope;
 use Nosto\Tagging\Logger\Logger as NostoLogger;
-use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch\ModeSwitcher as CategoryModeSwitcher;
-use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch\ModeSwitcherInterface;
+use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcher as CategoryModeSwitcher;
+use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcherInterface;
 use Nosto\Tagging\Model\Indexer\Dimensions\StoreDimensionProvider;
 use Nosto\Tagging\Model\ResourceModel\Magento\Category\Collection as CategoryCollection;
 use Nosto\Tagging\Model\ResourceModel\Magento\Category\CollectionBuilder;
@@ -66,11 +66,15 @@ class CategoryIndexer extends AbstractIndexer
     /** @var CategoryModeSwitcher */
     private CategoryModeSwitcher $modeSwitcher;
 
+    /** @var CollectionBuilder */
+    private CollectionBuilder $categoryCollectionBuilder;
+
     /**
      * Constructor.
      * @param NostoHelperScope $nostoHelperScope
      * @param CategoryUpdateService $categoryUpdateService
      * @param NostoLogger $logger
+     * @param CollectionBuilder $categoryCollectionBuilder
      * @param CategoryModeSwitcher $modeSwitcher
      * @param StoreDimensionProvider $dimensionProvider
      * @param Emulation $storeEmulation
@@ -82,6 +86,7 @@ public function __construct(
         NostoHelperScope              $nostoHelperScope,
         CategoryUpdateService         $categoryUpdateService,
         NostoLogger                   $logger,
+        CollectionBuilder             $categoryCollectionBuilder,
         CategoryModeSwitcher          $modeSwitcher,
         StoreDimensionProvider        $dimensionProvider,
         Emulation                     $storeEmulation,
@@ -91,6 +96,8 @@ public function __construct(
     ) {
         $this->categoryUpdateService = $categoryUpdateService;
         $this->modeSwitcher = $modeSwitcher;
+        $this->categoryCollectionBuilder = $categoryCollectionBuilder;
+
         parent::__construct(
             $nostoHelperScope,
             $logger,
@@ -139,7 +146,16 @@ public function getIndexerId(): string
      */
     public function getCollection(Store $store, array $ids = []) //: CategoryCollection
     {
-        // @TODO: implement
+        $this->categoryCollectionBuilder->initDefault($store);
+
+        if (!empty($ids)) {
+            $this->categoryCollectionBuilder->withIds($ids);
+        } else {
+            $this->categoryCollectionBuilder->withStore($store);
+        }
+
         return null;
+        // @TODO: Implement logic
+        // return $this->categoryCollectionBuilder->build();
     }
 }
diff --git a/Model/Indexer/Dimensions/ModeSwitcher/DimensionModeConfiguration.php b/Model/Indexer/Dimensions/ModeSwitcher/DimensionModeConfiguration.php
@@ -34,7 +34,7 @@
  *
  */
 
-namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch;
+namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher;
 
 use Nosto\Tagging\Model\Indexer\Dimensions\AbstractDimensionModeConfiguration;
 

diff --git a/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcher.php b/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcher.php
@@ -35,7 +35,7 @@
  *
  */
 
-namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch;
+namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher;
 
 use Magento\Indexer\Model\DimensionMode;
 use Magento\Indexer\Model\DimensionModes;

diff --git a/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguration.php b/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguration.php
@@ -34,7 +34,7 @@
  *
  */
 
-namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch;
+namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher;
 
 use InvalidArgumentException;
 use Magento\Framework\App\Cache\TypeListInterface;

diff --git a/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherInterface.php b/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherInterface.php
@@ -34,7 +34,7 @@
  *
  */
 
-namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch;
+namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher;
 
 use Magento\Indexer\Model\ModeSwitcherInterface as MagentoModeSwitcherInterface;
 

diff --git a/Model/Indexer/ProductIndexer.php b/Model/Indexer/ProductIndexer.php
@@ -43,8 +43,8 @@
 use Nosto\NostoException;
 use Nosto\Tagging\Helper\Scope as NostoHelperScope;
 use Nosto\Tagging\Logger\Logger as NostoLogger;
-use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher as ProductModeSwitcher;
-use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcherInterface;
+use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcher as ProductModeSwitcher;
+use Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcherInterface;
 use Nosto\Tagging\Model\Indexer\Dimensions\StoreDimensionProvider;
 use Nosto\Tagging\Model\ResourceModel\Magento\Product\Collection as ProductCollection;
 use Nosto\Tagging\Model\ResourceModel\Magento\Product\CollectionBuilder;

diff --git a/etc/di.xml b/etc/di.xml
@@ -180,8 +180,19 @@
         <arguments>
             <argument name="dimensionSwitchers" xsi:type="array">
                 <item name="nosto_index_product" xsi:type="object">
-                    Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch\ModeSwitcher
+                    Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcher
                 </item>
+                <item name="nosto_index_category" xsi:type="object">
+                    Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher\ModeSwitcher
+                </item>
+
+            </argument>
+        </arguments>
+    </type>
+    <type name="Nosto\Tagging\Model\Indexer\CategoryIndexer">
+        <arguments>
+            <argument name="dimensionProvider" xsi:type="object" shared="false">
+                Nosto\Tagging\Model\Indexer\Dimensions\StoreDimensionProvider
             </argument>
         </arguments>
     </type>
@@ -238,4 +249,15 @@
             <argument name="batchSize" xsi:type="number">500</argument>
         </arguments>
     </type>
+    <type name="Nosto\Tagging\Model\Service\Update\CategoryUpdateService">
+        <arguments>
+            <argument name="upsertBulkPublisher" xsi:type="object" shared="false">
+                Nosto\Tagging\Model\Service\Sync\Upsert\AsyncBulkPublisher
+            </argument>
+            <argument name="deleteBulkPublisher" xsi:type="object" shared="false">
+                Nosto\Tagging\Model\Service\Sync\Delete\AsyncBulkPublisher
+            </argument>
+            <argument name="batchSize" xsi:type="number">500</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/etc/indexer.xml b/etc/indexer.xml
@@ -38,4 +38,9 @@
         <title>Nosto Product Indexer</title>
         <description>Populates message queue with product ids to be sent to Nosto</description>
     </indexer>
+    <indexer id="nosto_index_category" view_id="nosto_index_category" class="Nosto\Tagging\Model\Indexer\CategoryIndexer">
+        <title>Nosto Category Indexer</title>
+        <!-- @TODO: Add description-->
+        <description>Category</description>
+    </indexer>
 </config>
diff --git a/etc/mview.xml b/etc/mview.xml
@@ -66,11 +66,13 @@
     </view>
 
     <view id="nosto_index_category" class="Nosto\Tagging\Model\Indexer\CategoryIndexer" group="indexer">
-        <table name="catalog_category_entity" entity_column="entity_id" />
-        <table name="catalog_category_entity_decimal" entity_column="entity_id" />
-        <table name="catalog_category_entity_int" entity_column="entity_id" />
-        <table name="catalog_category_entity_text" entity_column="entity_id" />
-        <table name="catalog_category_entity_varchar" entity_column="entity_id" />
-        <table name="catalog_category_entity_datetime" entity_column="entity_id" />
+        <subscriptions>
+            <table name="catalog_category_entity" entity_column="entity_id" />
+            <table name="catalog_category_entity_decimal" entity_column="entity_id" />
+            <table name="catalog_category_entity_int" entity_column="entity_id" />
+            <table name="catalog_category_entity_text" entity_column="entity_id" />
+            <table name="catalog_category_entity_varchar" entity_column="entity_id" />
+            <table name="catalog_category_entity_datetime" entity_column="entity_id" />
+        </subscriptions>
     </view>
 </config>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ @@
      *
      */
-    namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitch;
+    namespace Nosto\Tagging\Model\Indexer\Dimensions\ModeSwitcher;
     use Nosto\Tagging\Model\Indexer\Dimensions\AbstractDimensionModeConfiguration;
@@ Expand Down @@