fix: Uuid incompatibility

Author: Epx-jules

.gitignore

@@ -4,4 +4,5 @@ composer.lock
 composer.phar
 .php_cs
 .php_cs.cache
-.phpunit.result.cache
+.phpunit.result.cache
+.idea

composer.json

@@ -18,7 +18,8 @@
         "php-http/curl-client": "^2.2",
         "monolog/monolog": "^2.3|^3.0",
         "symfony/property-access": "^3.4|^4.3|^5|^6.0|^7.0",
-        "symfony/http-client": "^5.4|^6.2|^7.0"
+        "symfony/http-client": "^5.4|^6.2|^7.0",
+        "ramsey/uuid": "^4.8"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^5.0|^6.0",

src/Finder/CollectionFinder.php

@@ -7,6 +7,7 @@
 use ACSEO\TypesenseBundle\Client\CollectionClient;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
+use Ramsey\Uuid\UuidInterface;
 
 class CollectionFinder implements CollectionFinderInterface
 {
@@ -18,7 +19,7 @@ public function __construct(CollectionClient $collectionClient, EntityManagerInt
     {
         $this->collectionConfig = $collectionConfig;
         $this->collectionClient = $collectionClient;
-        $this->em               = $em;
+        $this->em = $em;
     }
 
     public function rawQuery(TypesenseQuery $query)
@@ -33,7 +34,7 @@ public function query(TypesenseQuery $query): TypesenseResponse
         return $this->hydrate($results);
     }
 
-    public function hydrateResponse(TypesenseResponse $response) : TypesenseResponse
+    public function hydrateResponse(TypesenseResponse $response): TypesenseResponse
     {
         return $this->hydrate($response);
     }
@@ -44,9 +45,9 @@ public function hydrateResponse(TypesenseResponse $response) : TypesenseResponse
      * @param TypesenseResponse $results
      * @return TypesenseResponse
      */
-    private function hydrate(TypesenseResponse $results) : TypesenseResponse
+    private function hydrate(TypesenseResponse $results): TypesenseResponse
     {
-        $ids             = [];
+        $ids = [];
         $primaryKeyInfos = $this->getPrimaryKeyInfo();
         foreach ($results->getResults() as $result) {
             $ids[] = $result['document'][$primaryKeyInfos['documentAttribute']];
@@ -73,6 +74,14 @@ private function hydrate(TypesenseResponse $results) : TypesenseResponse
                 $idA = $a->$entityIdMethod();
                 $idB = $b->$entityIdMethod();
 
+                if ($idA instanceof UuidInterface) {
+                    $idA = $idA->toString();
+                }
+
+                if ($idB instanceof UuidInterface) {
+                    $idB = $idB->toString();
+                }
+
                 return $idIndex[$idA] <=> $idIndex[$idB];
             });
 
@@ -85,7 +94,7 @@ private function hydrate(TypesenseResponse $results) : TypesenseResponse
         return $results;
     }
 
-    private function search(TypesenseQuery $query) : TypesenseResponse
+    private function search(TypesenseQuery $query): TypesenseResponse
     {
         $result = $this->collectionClient->search($this->collectionConfig['typesense_name'], $query);