Merge pull request #11 from MacPaw/develop

Release

Author: zakhar-huzenko

src/Context/ORMContext.php

@@ -9,6 +9,8 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\QueryBuilder;
+use JsonException;
 use RuntimeException;
 
 final class ORMContext implements Context
@@ -22,6 +24,8 @@ public function __construct(EntityManagerInterface $manager)
 
     /**
      * @And I see :count entities :entityClass
+     * 
+     * @param class-string $entityClass
      */
     public function andISeeInRepository(int $count, string $entityClass): void
     {
@@ -30,6 +34,8 @@ public function andISeeInRepository(int $count, string $entityClass): void
 
     /**
      * @Then I see :count entities :entityClass
+     * 
+     * @param class-string $entityClass
      */
     public function thenISeeInRepository(int $count, string $entityClass): void
     {
@@ -38,6 +44,8 @@ public function thenISeeInRepository(int $count, string $entityClass): void
 
     /**
      * @And I see entity :entity with id :id
+     * 
+     * @param class-string $entityClass
      */
     public function andISeeEntityInRepositoryWithId(string $entityClass, string $id): void
     {
@@ -46,6 +54,8 @@ public function andISeeEntityInRepositoryWithId(string $entityClass, string $id)
 
     /**
      * @Then I see entity :entity with id :id
+     * 
+     * @param class-string $entityClass
      */
     public function thenISeeEntityInRepositoryWithId(string $entityClass, string $id): void
     {
@@ -54,6 +64,8 @@ public function thenISeeEntityInRepositoryWithId(string $entityClass, string $id
 
     /**
      * @Then I see entity :entity with properties:
+     * 
+     * @param class-string $entityClass
      */
     public function andISeeEntityInRepositoryWithProperties(string $entityClass, PyStringNode $string): void
     {
@@ -62,6 +74,7 @@ public function andISeeEntityInRepositoryWithProperties(string $entityClass, PyS
     }
 
     /**
+     * @param class-string $entityClass
      * @param array<string, mixed> $params
      *
      * @throws NonUniqueResultException
@@ -74,12 +87,20 @@ private function seeInRepository(int $count, string $entityClass, ?array $params
             ->select('count(e)');
 
         if (null !== $params) {
+            $metadata = $this->manager->getClassMetadata($entityClass);
+
             foreach ($params as $columnName => $columnValue) {
                 if ($columnValue === null) {
                     $query->andWhere(sprintf('e.%s IS NULL', $columnName));
                 } else {
-                    $query->andWhere(sprintf('e.%s = :%s', $columnName, $columnName))
-                        ->setParameter($columnName, $columnValue);
+                    if ($this->isJsonField($metadata, $columnName)) {
+                        // Handle JSON fields with proper DQL
+                        $this->addJsonFieldCondition($query, $columnName, $columnValue);
+                    } else {
+                        // Regular field comparison
+                        $query->andWhere(sprintf('e.%s = :%s', $columnName, $columnName))
+                            ->setParameter($columnName, $columnValue);
+                    }
                 }
             }
         }
@@ -93,4 +114,74 @@ private function seeInRepository(int $count, string $entityClass, ?array $params
             );
         }
     }
+
+    /**
+     * Check if a field is mapped as JSON type
+     * 
+     * @param \Doctrine\ORM\Mapping\ClassMetadata<object> $metadata
+     */
+    private function isJsonField(\Doctrine\ORM\Mapping\ClassMetadata $metadata, string $fieldName): bool
+    {
+        if (!$metadata->hasField($fieldName)) {
+            return false;
+        }
+
+        $fieldMapping = $metadata->getFieldMapping($fieldName);
+
+        return \in_array($fieldMapping['type'], ['json', 'json_array'], true);
+    }
+
+    /**
+     * Add JSON field condition using DQL-compatible functions
+     * Uses CONCAT for PostgreSQL to convert JSON to string for comparison
+     *
+     * @param mixed $expectedValue
+     */
+    private function addJsonFieldCondition(QueryBuilder $query, string $fieldName, $expectedValue): void
+    {
+        $platform = $this->manager->getConnection()->getDatabasePlatform();
+        $platformName = $platform->getName();
+
+        // Normalize JSON value - ensure consistent encoding
+        $expectedJson = $this->normalizeJsonValue($expectedValue);
+        $paramName = $fieldName . '_json';
+
+        if ($platformName === 'postgresql') {
+            // PostgreSQL: Use CONCAT to convert JSON to string for comparison
+            // CONCAT('', field) effectively casts JSON to text in a DQL-compatible way
+            $query->andWhere(sprintf('CONCAT(\'\', e.%s) = :%s', $fieldName, $paramName))
+                ->setParameter($paramName, $expectedJson);
+        } elseif ($platformName === 'mysql') {
+            // MySQL: Use JSON_UNQUOTE to extract JSON as string
+            $query->andWhere(sprintf('JSON_UNQUOTE(e.%s) = :%s', $fieldName, $paramName))
+                ->setParameter($paramName, $expectedJson);
+        } else {
+            // Fallback for other databases (SQLite, etc.)
+            $query->andWhere(sprintf('e.%s = :%s', $fieldName, $paramName))
+                ->setParameter($paramName, $expectedJson);
+        }
+    }
+
+    /**
+     * Normalize JSON value to ensure consistent comparison
+     * This handles arrays, objects, and already-encoded JSON strings
+     *
+     * @param mixed $value
+     */
+    private function normalizeJsonValue($value): string
+    {
+        if (is_string($value)) {
+            // If it's already a JSON string, decode and re-encode for normalization
+            try {
+                $decoded = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
+                return json_encode($decoded, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
+            } catch (JsonException $e) {
+                // If it's not valid JSON, treat as regular string
+                return json_encode($value, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
+            }
+        }
+
+        // For arrays/objects, encode with consistent flags
+        return json_encode($value, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+    }
 }