ADS-4289 Support more sorting options

src/Search/Request/Handler/SortHandlers/CustomFieldSortingHandler.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nosto\NostoIntegration\Search\Request\Handler\SortHandlers;
+
+use Nosto\NostoIntegration\Search\Request\SearchRequest;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
+
+class CustomFieldSortingHandler implements SortingHandlerInterface
+{
+    public function supportsSorting(FieldSorting $fieldSorting): bool
+    {
+        return str_starts_with($fieldSorting->getField(), 'customFields');
+    }
+
+    public function generateSorting(FieldSorting $fieldSorting, SearchRequest $searchNavigationRequest): void
+    {
+        $searchNavigationRequest->setSort($fieldSorting->getField(), $fieldSorting->getDirection());
+    }
+}

src/Search/Request/Handler/SortHandlers/ProductNumberSortingHandler.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nosto\NostoIntegration\Search\Request\Handler\SortHandlers;
+
+use Nosto\NostoIntegration\Search\Request\SearchRequest;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
+
+class ProductNumberSortingHandler implements SortingHandlerInterface
+{
+    public function supportsSorting(FieldSorting $fieldSorting): bool
+    {
+        return $fieldSorting->getField() === 'product.productNumber';
+    }
+
+    public function generateSorting(FieldSorting $fieldSorting, SearchRequest $searchNavigationRequest): void
+    {
+        $searchNavigationRequest->setSort('customFields.productNumber', $fieldSorting->getDirection());
+    }
+}

src/Search/Request/Handler/SortHandlers/RatingSortingHandler.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nosto\NostoIntegration\Search\Request\Handler\SortHandlers;
+
+use Nosto\NostoIntegration\Search\Request\SearchRequest;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
+
+class RatingSortingHandler implements SortingHandlerInterface
+{
+    public function supportsSorting(FieldSorting $fieldSorting): bool
+    {
+        return $fieldSorting->getField() === 'product.ratingAverage';
+    }
+
+    public function generateSorting(FieldSorting $fieldSorting, SearchRequest $searchNavigationRequest): void
+    {
+        $searchNavigationRequest->setSort('ratingValue', $fieldSorting->getDirection());
+    }
+}

src/Search/Request/Handler/SortHandlers/StockSortingHandler.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nosto\NostoIntegration\Search\Request\Handler\SortHandlers;
+
+use Nosto\NostoIntegration\Search\Request\SearchRequest;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
+
+class StockSortingHandler implements SortingHandlerInterface
+{
+    public function supportsSorting(FieldSorting $fieldSorting): bool
+    {
+        return $fieldSorting->getField() === 'product.stock';
+    }
+
+    public function generateSorting(FieldSorting $fieldSorting, SearchRequest $searchNavigationRequest): void
+    {
+        $searchNavigationRequest->setSort('inventoryLevel', $fieldSorting->getDirection());
+    }
+}

src/Search/Request/Handler/SortingHandlerService.php

@@ -4,11 +4,15 @@
 
 namespace Nosto\NostoIntegration\Search\Request\Handler;
 
+use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\CustomFieldSortingHandler;
 use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\PriceSortingHandler;
 use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\ProductNameSortingHandler;
+use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\ProductNumberSortingHandler;
+use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\RatingSortingHandler;
 use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\ReleaseDateSortingHandler;
 use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\ScoreSortingHandler;
 use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\SortingHandlerInterface;
+use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\StockSortingHandler;
 use Nosto\NostoIntegration\Search\Request\Handler\SortHandlers\TopSellerSortingHandler;
 use Nosto\NostoIntegration\Search\Request\SearchRequest;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
@@ -32,10 +36,14 @@ public function handle(SearchRequest $searchNavigationRequest, Criteria $criteri
     protected function getSortingHandlers(): array
     {
         return [
-            new ScoreSortingHandler(),
+            new CustomFieldSortingHandler(),
             new PriceSortingHandler(),
             new ProductNameSortingHandler(),
+            new ProductNumberSortingHandler(),
+            new RatingSortingHandler(),
             new ReleaseDateSortingHandler(),
+            new ScoreSortingHandler(),
+            new StockSortingHandler(),
             new TopSellerSortingHandler(),
         ];
     }

src/Search/Request/SearchRequest.php

@@ -33,7 +33,7 @@ public function __construct(
 
     private array $filters = [];
 
-    private array $sessionParams = [];
+    private ?array $sessionParams = null;
 
     public function setQuery(string $query): void
     {