Some code optimizations

muckiware · Feb 25, 2024 · aaf70b7 · aaf70b7
1 parent dd4392d
commit aaf70b7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/src/Indexing/Write.php b/src/Indexing/Write.php
@@ -93,30 +93,12 @@ public function getIndexStructureInstances(?string $itemId=null): array
 
                 case 'product':
 
-                    if ($itemId) {
-                        $items = $this->products->getProductByProductId(
-                            $itemId,
-                            $indexStructure->getSalesChannelId()
-                        )->getElements();
-                    } else {
-                        $items = $this->products->getAllActiveProduct(
-                            $indexStructure->getSalesChannelId()
-                        )->getElements();
-                    }
+                    $items = $this->products->getItems($itemId, $indexStructure->getSalesChannelId());
                     break;
 
                 case 'category':
 
-                    if ($itemId) {
-                        $items = $this->categories->getCategoryByCategoryId(
-                            $itemId,
-                            $indexStructure->getSalesChannelId()
-                        )->getElements();
-                    } else {
-                        $items = $this->categories->getAllActiveCategories(
-                            $indexStructure->getSalesChannelId()
-                        )->getElements();
-                    }
+                    $items = $this->categories->getItems($itemId, $indexStructure->getSalesChannelId());
                     break;
 
                 default:

diff --git a/src/Resources/app/administration/src/module/muwa-search-structure/snippet/en-GB.json b/src/Resources/app/administration/src/module/muwa-search-structure/snippet/en-GB.json
@@ -7,7 +7,7 @@
       "saveSuccessAlertMessage": "Search index structure was saved successfully."
     },
     "tabs": {
-      "structureList": "Index configurations",
+      "structureList": "Index Configurations",
       "structureIndices": "Indices Structures",
       "serverInfo": "Server Info"
     },

diff --git a/src/Services/Content/Categories.php b/src/Services/Content/Categories.php
@@ -64,5 +64,14 @@ protected function getCriteriaAssociations(string $salesChannelId): Criteria
             ->addFilter(new EqualsFilter('type', CategoryDefinition::TYPE_PAGE))
         ;
     }
+
+    public function getItems(?string $itemId, string $salesChannelId): array
+    {
+        if ($itemId) {
+            return $this->getCategoryByCategoryId($itemId, $salesChannelId)->getElements();
+        } else {
+            return $this->getAllActiveCategories($salesChannelId)->getElements();
+        }
+    }
 }
 
diff --git a/src/Services/Content/Products.php b/src/Services/Content/Products.php
@@ -85,5 +85,14 @@ protected function getCriteriaAssociations(string $salesChannelId): Criteria
             ]))
         ;
     }
+
+    public function getItems(?string $itemId, string $salesChannelId): array
+    {
+        if ($itemId) {
+            return $this->getProductByProductId($itemId, $salesChannelId)->getElements();
+        } else {
+            return $this->getAllActiveProduct($salesChannelId)->getElements();
+        }
+    }
 }