EZP-31325: Fixed sorting by Content & Location ID

* Indexed new normalized Solr Fields "content_id_normalized" and "location_id_normalized" as integers (*_i) * Aligned SortClause\ContentId and SortClause\Location\Id to use the new Fields.
ezsystems · May 29, 2020 · 0a57b75 · 0a57b75
1 parent 9f44a81
commit 0a57b75
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php b/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php
@@ -87,6 +87,12 @@ public function mapFields(Content $content)
                 $contentInfo->id,
                 new FieldType\IdentifierField()
             ),
+            // explicit integer representation to allow sorting
+            new Field(
+                'content_id_normalized',
+                $contentInfo->id,
+                new FieldType\IntegerField()
+            ),
             new Field(
                 'content_type_id',
                 $contentInfo->contentTypeId,

diff --git a/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php b/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php
@@ -48,6 +48,12 @@ public function mapFields(Location $location)
                 $location->id,
                 new FieldType\IdentifierField()
             ),
+            // explicit integer representation to allow sorting
+            new Field(
+                'location_id_normalized',
+                $location->id,
+                new FieldType\IntegerField()
+            ),
             new Field(
                 'document_type',
                 DocumentMapper::DOCUMENT_TYPE_IDENTIFIER_LOCATION,

diff --git a/lib/Query/Common/SortClauseVisitor/ContentId.php b/lib/Query/Common/SortClauseVisitor/ContentId.php
@@ -39,6 +39,6 @@ public function canVisit(SortClause $sortClause)
      */
     public function visit(SortClause $sortClause)
     {
-        return 'content_id_id' . $this->getDirection($sortClause);
+        return 'content_id_normalized_i' . $this->getDirection($sortClause);
     }
 }
diff --git a/lib/Query/Location/SortClauseVisitor/Location/Id.php b/lib/Query/Location/SortClauseVisitor/Location/Id.php
@@ -39,6 +39,6 @@ public function canVisit(SortClause $sortClause)
      */
     public function visit(SortClause $sortClause)
     {
-        return 'location_id' . $this->getDirection($sortClause);
+        return 'location_id_normalized_i' . $this->getDirection($sortClause);
     }
 }