espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

email search by address change

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-09-13 15:44:54 +03:00
parent bb2d1650a8
commit aa09d7dde6
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
+21 -20
View File
@@ -29,19 +29,21 @@
namespace Espo\Classes\Select\Email\Where\ItemConverters;
use Espo\Core\Select\Helpers\RandomStringGenerator;
use Espo\Core\Select\Where\Item;
use Espo\Core\Select\Where\ItemConverter;
use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\Where\OrGroup;
use Espo\ORM\Query\Part\WhereClause;
use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
use Espo\ORM\Query\SelectBuilder;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
class EmailAddressEquals implements ItemConverter
{
public function __construct(
private EmailAddressHelper $emailAddressHelper,
private RandomStringGenerator $randomStringGenerator
) {}
public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
@@ -58,24 +60,23 @@ class EmailAddressEquals implements ItemConverter
return WhereClause::fromRaw(['id' => null]);
}
$queryBuilder->distinct();
$alias = 'emailEmailAddress' . $this->randomStringGenerator->generate();
$queryBuilder->leftJoin(
'EmailEmailAddress',
$alias,
[
'emailId:' => 'id',
'deleted' => false,
]
return OrGroup::create(
Cond::equal(
Expr::column('fromEmailAddressId'),
$emailAddressId
),
Cond::exists(
SelectBuilder::create()
->from('EmailEmailAddress', 'sq')
->where(['emailAddressId' => $emailAddressId])
->where(
Cond::equal(
Expr::column('sq.emailId'),
Expr::column('email.id')
)
)
->build()
)
);
return WhereClause::fromRaw([
'OR' => [
'fromEmailAddressId' => $emailAddressId,
$alias . '.emailAddressId' => $emailAddressId,
],
]);
}
}
application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
+17 -18
View File
@@ -29,12 +29,14 @@
namespace Espo\Classes\Select\Email\Where\ItemConverters;
use Espo\Core\Select\Helpers\RandomStringGenerator;
use Espo\Core\Select\Where\Item;
use Espo\Core\Select\Where\ItemConverter;
use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\WhereClause;
use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
use Espo\ORM\Query\SelectBuilder;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
class ToEquals implements ItemConverter
@@ -43,7 +45,6 @@ class ToEquals implements ItemConverter
public function __construct(
private EmailAddressHelper $emailAddressHelper,
private RandomStringGenerator $randomStringGenerator
) {}
public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
@@ -60,22 +61,20 @@ class ToEquals implements ItemConverter
return WhereClause::fromRaw(['id' => null]);
}
$queryBuilder->distinct();
$alias = 'emailEmailAddress' . $this->randomStringGenerator->generate();
$queryBuilder->leftJoin(
'EmailEmailAddress',
$alias,
[
'emailId:' => 'id',
'deleted' => false,
]
return Cond::exists(
SelectBuilder::create()
->from('EmailEmailAddress', 'sq')
->where([
'emailAddressId' => $emailAddressId,
'addressType' => $this->addressType,
])
->where(
Cond::equal(
Expr::column('sq.emailId'),
Expr::column('email.id')
)
)
->build()
);
return WhereClause::fromRaw([
$alias . '.emailAddressId' => $emailAddressId,
$alias . '.addressType' => $this->addressType,
]);
}
}