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

portal access filter ref, no distinct

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-09-14 09:53:35 +03:00
parent 744331e87d
commit 9302c3de01
3 changed files with 96 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php
+55 -22
View File
@@ -34,6 +34,10 @@ use Espo\Core\Select\Helpers\FieldHelper;
use Espo\Entities\User;
use Espo\Modules\Crm\Entities\Account;
use Espo\Modules\Crm\Entities\Contact;
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\SelectBuilder as QueryBuilder;
class PortalOnlyAccount implements Filter
@@ -45,63 +49,92 @@ class PortalOnlyAccount implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$orGroup = [];
$orBuilder = OrGroup::createBuilder();
$accountIdList = $this->user->getLinkMultipleIdList('accounts');
$contactId = $this->user->get('contactId');
if (count($accountIdList)) {
if ($this->fieldHelper->hasAccountField()) {
$orGroup['accountId'] = $accountIdList;
$orBuilder->add(
Cond::in(
Expr::column('accountId'),
$accountIdList
)
);
}
if ($this->fieldHelper->hasAccountsRelation()) {
$queryBuilder
->leftJoin('accounts', 'accountsAccess')
->distinct();
$defs = $this->fieldHelper->getRelationDefs('accounts');
$orGroup['accountsAccess.id'] = $accountIdList;
$orBuilder->add(
Cond::in(
Expr::column('id'),
QueryBuilder::create()
->from(ucfirst($defs->getRelationshipName()), 'm')
->select($defs->getMidKey())
->where([$defs->getForeignMidKey() => $accountIdList])
->build()
)
);
}
if ($this->fieldHelper->hasParentField()) {
$orGroup[] = [
'parentType' => Account::ENTITY_TYPE,
'parentId' => $accountIdList,
];
$orBuilder->add(
WhereClause::fromRaw([
'parentType' => Account::ENTITY_TYPE,
'parentId' => $accountIdList,
])
);
if ($contactId) {
$orGroup[] = [
'parentType' => Contact::ENTITY_TYPE,
'parentId' => $contactId,
];
$orBuilder->add(
WhereClause::fromRaw([
'parentType' => Contact::ENTITY_TYPE,
'parentId' => $contactId,
])
);
}
}
}
if ($contactId) {
if ($this->fieldHelper->hasContactField()) {
$orGroup['contactId'] = $contactId;
$orBuilder->add(
WhereClause::fromRaw(['contactId' => $contactId])
);
}
if ($this->fieldHelper->hasContactsRelation()) {
$queryBuilder
->leftJoin('contacts', 'contactsAccess')
->distinct();
$defs = $this->fieldHelper->getRelationDefs('contacts');
$orGroup['contactsAccess.id'] = $contactId;
$orBuilder->add(
Cond::in(
Expr::column('id'),
QueryBuilder::create()
->from(ucfirst($defs->getRelationshipName()), 'm')
->select($defs->getMidKey())
->where([$defs->getForeignMidKey() => $contactId])
->build()
)
);
}
}
if ($this->fieldHelper->hasCreatedByField()) {
$orGroup['createdById'] = $this->user->getId();
$orBuilder->add(
WhereClause::fromRaw(['createdById' => $this->user->getId()])
);
}
if (empty($orGroup)) {
$orGroup = $orBuilder->build();
if ($orGroup->getItemCount() === 0) {
$queryBuilder->where(['id' => null]);
return;
}
$queryBuilder->where(['OR' => $orGroup]);
$queryBuilder->where($orGroup);
}
}
application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php
+32 -13
View File
@@ -33,6 +33,10 @@ use Espo\Core\Select\AccessControl\Filter;
use Espo\Core\Select\Helpers\FieldHelper;
use Espo\Entities\User;
use Espo\Modules\Crm\Entities\Contact;
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\SelectBuilder as QueryBuilder;
class PortalOnlyContact implements Filter
@@ -44,41 +48,56 @@ class PortalOnlyContact implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$orGroup = [];
$orBuilder = OrGroup::createBuilder();
$contactId = $this->user->get('contactId');
if ($contactId) {
if ($this->fieldHelper->hasContactField()) {
$orGroup['contactId'] = $contactId;
$orBuilder->add(
WhereClause::fromRaw(['contactId' => $contactId])
);
}
if ($this->fieldHelper->hasContactsRelation()) {
$queryBuilder
->leftJoin('contacts', 'contactsAccess')
->distinct();
$defs = $this->fieldHelper->getRelationDefs('contacts');
$orGroup['contactsAccess.id'] = $contactId;
$orBuilder->add(
Cond::in(
Expr::column('id'),
QueryBuilder::create()
->from(ucfirst($defs->getRelationshipName()), 'm')
->select($defs->getMidKey())
->where([$defs->getForeignMidKey() => $contactId])
->build()
)
);
}
if ($this->fieldHelper->hasParentField()) {
$orGroup[] = [
'parentType' => Contact::ENTITY_TYPE,
'parentId' => $contactId,
];
$orBuilder->add(
WhereClause::fromRaw([
'parentType' => Contact::ENTITY_TYPE,
'parentId' => $contactId,
])
);
}
}
if ($this->fieldHelper->hasCreatedByField()) {
$orGroup['createdById'] = $this->user->getId();
$orBuilder->add(
WhereClause::fromRaw(['createdById' => $this->user->getId()])
);
}
if (empty($orGroup)) {
$orGroup = $orBuilder->build();
if ($orGroup->getItemCount() === 0) {
$queryBuilder->where(['id' => null]);
return;
}
$queryBuilder->where(['OR' => $orGroup]);
$queryBuilder->where($orGroup);
}
}
application/Espo/Core/Select/Helpers/FieldHelper.php
+9
View File
@@ -29,6 +29,7 @@
namespace Espo\Core\Select\Helpers;
use Espo\ORM\Defs\RelationDefs;
use Espo\ORM\EntityManager;
use Espo\ORM\Entity;
use Espo\ORM\BaseEntity;
@@ -125,6 +126,14 @@ class FieldHelper
$this->getRelationParam($this->getSeed(), 'accounts', 'entity') === 'Account';
}
public function getRelationDefs(string $name): RelationDefs
{
return $this->entityManager
->getDefs()
->getEntity($this->entityType)
->getRelation($name);
}
/**
* @return mixed
*/