Bugfix(grid) fix product grid query builder after optymise (#1866)

ergonode · Jan 26, 2022 · 1082ecd · 1082ecd
1 parent 7c537f8
commit 1082ecd
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## CHANGELOG FOR 1.1.x
+#### 1.1.9
+- bugfix [#1848](https://github.com/ergonode/backend/issues/1848) Long response times for product grid endpoint - change query after postgress query problem (rprzedzik)
+
 #### 1.1.8
 - bugfix [#1848](https://github.com/ergonode/backend/issues/1848) Long response times for product grid endpoint (rprzedzik)
+
 #### 1.1.7
 - bugfix [#1816](https://github.com/ergonode/backend/issues/1816) Fixed product audits (rprzedzik)
 

diff --git a/composer.json b/composer.json
@@ -72,6 +72,7 @@
         "behatch/contexts": "^3.3",
         "dama/doctrine-test-bundle": "^6.6",
         "escapestudios/symfony2-coding-standard": "^3.10",
+        "fakerphp/faker": "1.17.0",
         "friends-of-behat/symfony-extension": "^2.0.5",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "infection/infection": "^0.17.5",

diff --git a/composer.lock b/composer.lock
diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/DateAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/DateAttributeDataSetQueryBuilder.php
@@ -56,6 +56,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),

diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/NumericAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/NumericAttributeDataSetQueryBuilder.php
@@ -55,6 +55,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\d+(\\.\\d+)?$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),

diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/PriceAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/PriceAttributeDataSetQueryBuilder.php
@@ -56,6 +56,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\d+(\\.\\d+)?$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),

diff --git a/module/product/src/Infrastructure/Grid/Builder/Query/UnitAttributeDataSetQueryBuilder.php b/module/product/src/Infrastructure/Grid/Builder/Query/UnitAttributeDataSetQueryBuilder.php
@@ -58,6 +58,7 @@ public function addSelect(QueryBuilder $query, string $key, AbstractAttribute $a
 		            JOIN product_value pv ON pv.value_id = vt.value_id
 		            WHERE attribute_id = \'%s\'
                     AND language = \'%s\'
+                    AND value ~ \'^\d+(\\.\\d+)?$\'
 		        )',
                 $key,
                 $attribute->getId()->getValue(),