[BUGFIX] Fixes multiple sortings

When multiple sorting options are passed as an argument the solr server response was not resolved correctly which lead to an TYPO3 Exception. Fixes: #3627 Ports: #3628
TYPO3-Solr · Sep 11, 2023 · d90304a · d90304a
1 parent 01a4c6f
commit d90304a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Classes/Domain/Search/ResultSet/ResultSetReconstitutionProcessor.php b/Classes/Domain/Search/ResultSet/ResultSetReconstitutionProcessor.php
@@ -96,9 +96,8 @@ public function process(SearchResultSet $resultSet): SearchResultSet
     protected function parseSortingIntoObjects(SearchResultSet $resultSet): SearchResultSet
     {
         $configuration = $resultSet->getUsedSearchRequest()->getContextTypoScriptConfiguration();
+        $activeSortings = $resultSet->getUsedSearchRequest()->getSeperatedSortings();
         $hasSorting = $resultSet->getUsedSearchRequest()->getHasSorting();
-        $activeSortingName = $resultSet->getUsedSearchRequest()->getSortingName();
-        $activeSortingDirection = $resultSet->getUsedSearchRequest()->getSortingDirection();
 
         // no configuration available
         if (!isset($configuration)) {
@@ -116,9 +115,9 @@ protected function parseSortingIntoObjects(SearchResultSet $resultSet): SearchRe
 
             // when we have an active sorting in the request we compare the sortingName and mark is as active and
             // use the direction from the request
-            if ($hasSorting && $activeSortingName == $sortingName) {
+            if ($hasSorting && array_key_exists($sortingName, $activeSortings)) {
                 $selected = true;
-                $direction = $activeSortingDirection;
+                $direction = $activeSortings[$sortingName];
             }
 
             $field = $sortingOptions['field'];

diff --git a/Classes/Domain/Search/SearchRequest.php b/Classes/Domain/Search/SearchRequest.php
@@ -21,6 +21,7 @@
 use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration;
 use ApacheSolrForTypo3\Solr\System\Util\ArrayAccessor;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * The searchRequest is used to act as an api to the arguments that have been passed
@@ -339,6 +340,22 @@ public function getHasFacetValue(string $facetName, $facetValue): bool
         return $this->activeFacetContainer->hasFacetValue($facetName, $facetValue);
     }
 
+    /**
+     * Returns all sortings in the sorting string e.g. ['title' => 'asc', 'relevance' => 'desc']
+     */
+    public function getSeperatedSortings(): array
+    {
+        $parsedSortings = [];
+        $explodedSortings = GeneralUtility::trimExplode(',', $this->getSorting(), true);
+
+        foreach ($explodedSortings as $sorting) {
+            $sortingSeperated = explode(' ', $sorting);
+            $parsedSortings[$sortingSeperated[0]] = $sortingSeperated[1];
+        }
+
+        return $parsedSortings;
+    }
+
     /**
      * @return bool
      */

diff --git a/Tests/Unit/Domain/Search/ResultSet/ResultSetReconstitutionProcessorTest.php b/Tests/Unit/Domain/Search/ResultSet/ResultSetReconstitutionProcessorTest.php
@@ -1066,6 +1066,9 @@ public function canReturnSortingsAndMarkedSelectedAsActive()
         $searchResultSet->getUsedSearchRequest()->expects(self::any())->method('getHasSorting')->willReturn(true);
         $searchResultSet->getUsedSearchRequest()->expects(self::any())->method('getSortingName')->willReturn('title');
         $searchResultSet->getUsedSearchRequest()->expects(self::any())->method('getSortingDirection')->willReturn('desc');
+        $searchResultSet->getUsedSearchRequest()->expects(self::any())->method('getSeperatedSortings')->willReturn(
+            ['title' => 'desc', 'relevance' => 'asc']
+        );
 
         $processor = $this->getConfiguredReconstitutionProcessor($configuration, $searchResultSet);
         $processor->process($searchResultSet);