From b69d706cc4aadc63c4de9a67314c898d5233b1be Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 29 Oct 2021 13:16:47 +0300
Subject: [PATCH] fix where

---
 .../Espo/Core/Select/Where/ItemGeneralConverter.php       | 8 ++++++--
 tests/unit/Espo/Core/Select/Where/ConverterTest.php       | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/Espo/Core/Select/Where/ItemGeneralConverter.php b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
index 4e4e1211d7..a2343919bb 100644
--- a/application/Espo/Core/Select/Where/ItemGeneralConverter.php
+++ b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
@@ -40,6 +40,7 @@ use Espo\{
     Entities\User,
     Core\Utils\Config,
     Core\Select\Helpers\RandomStringGenerator,
+    Core\Utils\Metadata,
 };
 
 use DateTime;
@@ -68,6 +69,8 @@ class ItemGeneralConverter implements ItemConverter
 
     protected $config;
 
+    protected $metadata;
+
     public function __construct(
         string $entityType,
         User $user,
@@ -77,7 +80,8 @@ class ItemGeneralConverter implements ItemConverter
         RandomStringGenerator $randomStringGenerator,
         EntityManager $entityManager,
         ORMDefs $ormDefs,
-        Config $config
+        Config $config,
+        Metadata $metadata
     ) {
         $this->entityType = $entityType;
         $this->user = $user;
@@ -88,6 +92,7 @@ class ItemGeneralConverter implements ItemConverter
         $this->entityManager = $entityManager;
         $this->ormDefs = $ormDefs;
         $this->config = $config;
+        $this->metadata = $metadata;
     }
 
     public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
@@ -264,7 +269,6 @@ class ItemGeneralConverter implements ItemConverter
     ): array {
 
         $link = $this->metadata->get(['entityDefs', $this->entityType, 'fields', $attribute, 'link']);
-
         $column = $this->metadata->get(['entityDefs', $this->entityType, 'fields', $attribute, 'column']);
 
         $alias =  $link . 'ColumnFilter' . $this->randomStringGenerator->generate();
diff --git a/tests/unit/Espo/Core/Select/Where/ConverterTest.php b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
index 642a6a64d5..f8e6b266e3 100644
--- a/tests/unit/Espo/Core/Select/Where/ConverterTest.php
+++ b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
@@ -39,6 +39,7 @@ use Espo\Core\{
     Select\Where\ItemConverter,
     Select\Helpers\RandomStringGenerator,
     Utils\Config,
+    Utils\Metadata,
 };
 
 use Espo\{
@@ -63,6 +64,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
         $this->user = $this->createMock(User::class);
 
         $this->config = $this->createMock(Config::class);
+        $this->metadata = $this->createMock(Metadata::class);
 
         $this->scanner = $this->createMock(Scanner::class);
         $this->randomStringGenerator = $this->createMock(RandomStringGenerator::class);
@@ -105,7 +107,8 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
             $this->randomStringGenerator,
             $this->entityManager,
             $this->ormDefs,
-            $this->config
+            $this->config,
+            $this->metadata
         );
 
         $this->converter = new Converter(