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

orm isRelatedById method

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-11-08 11:22:38 +02:00
parent 930f706dd3
commit c95be2f54e
10 changed files with 132 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Formula/Functions/EntityGroup/IsRelatedType.php
+2 -1
View File
@@ -61,6 +61,7 @@ class IsRelatedType extends \Espo\Core\Formula\Functions\Base implements
return $this->entityManager
->getRDBRepository($this->getEntity()->getEntityType())
->isRelated($this->getEntity(), $link, $id);
->getRelation($this->getEntity(), $link)
->isRelatedById($id);
}
}
application/Espo/Core/Portal/Acl/DefaultOwnershipChecker.php
+10 -2
View File
@@ -105,7 +105,11 @@ class DefaultOwnershipChecker implements
$repository = $this->entityManager->getRDBRepository($entity->getEntityType());
foreach ($accountIdList as $accountId) {
if ($repository->isRelated($entity, self::FIELD_ACCOUNTS, $accountId)) {
if (
$repository
->getRelation($entity, self::FIELD_ACCOUNTS)
->isRelatedById($accountId)
) {
return true;
}
}
@@ -146,7 +150,11 @@ class DefaultOwnershipChecker implements
) {
$repository = $this->entityManager->getRDBRepository($entity->getEntityType());
if ($repository->isRelated($entity, self::FIELD_CONTACTS, $contactId)) {
if (
$repository
->getRelation($entity, self::FIELD_CONTACTS)
->isRelatedById($contactId)
) {
return true;
}
}
application/Espo/ORM/Mapper/BaseMapper.php
+4 -4
View File
@@ -318,7 +318,7 @@ class BaseMapper implements RDBMapper
case Entity::BELONGS_TO:
/** @var Entity $relEntity */
$params['whereClause'][$foreignKey] = $entity->get($key);
$params['whereClause'][] = [$foreignKey =>$entity->get($key)];
$params['offset'] = 0;
$params['limit'] = 1;
$params['from'] = $relEntity->getEntityType();
@@ -358,7 +358,7 @@ class BaseMapper implements RDBMapper
$params['from'] = $relEntity->getEntityType();
$params['fromAlias'] ??= lcfirst($relEntity->getEntityType());
$params['whereClause'][$foreignKey] = $entity->get($key);
$params['whereClause'][] = [$foreignKey => $entity->get($key)];
if ($relType == Entity::HAS_CHILDREN) {
$foreignType = $keySet['foreignType'] ?? null;
@@ -367,7 +367,7 @@ class BaseMapper implements RDBMapper
throw new RuntimeException("Bad relation key.");
}
$params['whereClause'][$foreignType] = $entity->getEntityType();
$params['whereClause'][] = [$foreignType => $entity->getEntityType()];
}
$relConditions = $this->getRelationParam($entity, $relationName, 'conditions');
@@ -456,7 +456,7 @@ class BaseMapper implements RDBMapper
return null;
}
$params['whereClause'][$foreignKey] = $foreignEntityId;
$params['whereClause'][] = [$foreignKey => $foreignEntityId];
$params['offset'] = 0;
$params['limit'] = 1;
application/Espo/ORM/Repository/RDBRelation.php
+22 -5
View File
@@ -74,7 +74,7 @@ class RDBRelation
}
if (!$entity->hasRelation($relationName)) {
throw new RuntimeException("Entity does not have a relation '{$relationName}'.");
throw new RuntimeException("Entity does not have a relation '$relationName'.");
}
$this->relationName = $relationName;
@@ -103,7 +103,7 @@ class RDBRelation
private function createSelectBuilder(?Select $query = null): Builder
{
if ($this->noBuilder) {
throw new RuntimeException("Can't use query builder for the '{$this->relationType}' relation type.");
throw new RuntimeException("Can't use query builder for the '$this->relationType' relation type.");
}
return new Builder($this->entityManager, $this->entity, $this->relationName, $query);
@@ -115,7 +115,7 @@ class RDBRelation
public function clone(Select $query): Builder
{
if ($this->noBuilder) {
throw new RuntimeException("Can't use clone for the '{$this->relationType}' relation type.");
throw new RuntimeException("Can't use clone for the '$this->relationType' relation type.");
}
if ($query->getFrom() !== $this->foreignEntityType) {
@@ -134,6 +134,7 @@ class RDBRelation
{
$mapper = $this->entityManager->getMapper();
/** @noinspection PhpConditionAlreadyCheckedInspection */
if (!$mapper instanceof RDBMapper) {
throw new LogicException();
}
@@ -251,7 +252,7 @@ class RDBRelation
* * `where(string $key, string $value)`
*
* @param WhereItem|array<string|int, mixed>|string $clause A key or where clause.
* @param mixed[]|scalar|null $value A value. Should be omitted if the first argument is not string.
* @param array<int, mixed>|scalar|null $value A value. Should be omitted if the first argument is not string.
*/
public function where($clause = [], $value = null): Builder
{
@@ -267,7 +268,7 @@ class RDBRelation
* * `having(string $key, string $value)`
*
* @param WhereItem|array<string|int, mixed>|string $clause A key or where clause.
* @param mixed[]|string|null $value A value. Should be omitted if the first argument is not string.
* @param array<int, mixed>|string|null $value A value. Should be omitted if the first argument is not string.
*/
public function having($clause = [], $value = null): Builder
{
@@ -396,6 +397,22 @@ class RDBRelation
->findOne();
}
/**
* Whether related with another entity. An entity is specified by an ID.
* Does not work with 'belongsToParent' relations.
*/
public function isRelatedById(string $id): bool
{
if ($this->isBelongsToParentType()) {
throw new LogicException("Can't use isRelatedById for 'belongsToParent'.");
}
return (bool) $this->createSelectBuilder()
->select(['id'])
->where(['id' => $id])
->findOne();
}
private function isRelatedBelongsToParent(Entity $entity): bool
{
$fromEntity = $this->entity;
application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
+13 -15
View File
@@ -106,15 +106,16 @@ class RDBRelationSelectBuilder
return $this->createSelectBuilder()->clone($newQuery);
}
protected function createSelectBuilder(): SelectBuilder
private function createSelectBuilder(): SelectBuilder
{
return new SelectBuilder();
}
protected function getMapper(): RDBMapper
private function getMapper(): RDBMapper
{
$mapper = $this->entityManager->getMapper();
/** @noinspection PhpConditionAlreadyCheckedInspection */
if (!$mapper instanceof RDBMapper) {
throw new LogicException();
}
@@ -155,7 +156,7 @@ class RDBRelationSelectBuilder
* @param array<string|int, mixed> $where
* @return array<string|int, mixed>
*/
protected function applyMiddleAliasToWhere(array $where): array
private function applyMiddleAliasToWhere(array $where): array
{
$transformedWhere = [];
@@ -293,7 +294,7 @@ class RDBRelationSelectBuilder
* * `where(string $key, string $value)`
*
* @param WhereItem|array<int|string, mixed>|string $clause A key or where clause.
* @param mixed[]|scalar|null $value A value. Should be omitted if the first argument is not string.
* @param array<int, mixed>|scalar|null $value A value. Should be omitted if the first argument is not string.
*/
public function where($clause = [], $value = null): self
{
@@ -322,8 +323,8 @@ class RDBRelationSelectBuilder
* * `having(array $clause)`
* * `having(string $key, string $value)`
*
* @param WhereItem|array<mixed, mixed>|string $clause A key or where clause.
* @param mixed[]|string|null $value A value. Should be omitted if the first argument is not string.
* @param WhereItem|array<int|string, mixed>|string $clause A key or where clause.
* @param array<int, mixed>|string|null $value A value. Should be omitted if the first argument is not string.
*/
public function having($clause = [], $value = null): self
{
@@ -411,7 +412,7 @@ class RDBRelationSelectBuilder
return $this->group($groupBy);
}
protected function getMiddleTableAlias(): ?string
private function getMiddleTableAlias(): ?string
{
if (!$this->isManyMany()) {
return null;
@@ -430,7 +431,7 @@ class RDBRelationSelectBuilder
return $this->middleTableAlias;
}
protected function applyRelationAliasToWhereClauseKey(string $item): string
private function applyRelationAliasToWhereClauseKey(string $item): string
{
if (!$this->isManyMany()) {
return $item;
@@ -445,7 +446,7 @@ class RDBRelationSelectBuilder
* @param array<int|string, mixed> $where
* @return array<int|string, mixed>
*/
protected function applyRelationAliasToWhereClause(array $where): array
private function applyRelationAliasToWhereClause(array $where): array
{
if (!$this->isManyMany()) {
return $where;
@@ -457,10 +458,6 @@ class RDBRelationSelectBuilder
$transformedKey = $key;
$transformedValue = $value;
if (is_int($key)) {
$transformedKey = $key;
}
if (is_string($key)) {
$transformedKey = $this->applyRelationAliasToWhereClauseKey($key);
}
@@ -475,7 +472,7 @@ class RDBRelationSelectBuilder
return $transformedWhere;
}
protected function isManyMany(): bool
private function isManyMany(): bool
{
return $this->relationType === Entity::MANY_MANY;
}
@@ -484,7 +481,7 @@ class RDBRelationSelectBuilder
* @param Collection<Entity> $collection
* @return Collection<Entity>
*/
protected function handleReturnCollection(Collection $collection): Collection
private function handleReturnCollection(Collection $collection): Collection
{
if (!$collection instanceof SthCollection) {
return $collection;
@@ -499,6 +496,7 @@ class RDBRelationSelectBuilder
/**
* @return mixed
* @noinspection PhpSameParameterValueInspection
*/
private function getRelationParam(string $param)
{
application/Espo/Tools/EmailNotification/Processor.php
+2 -2
View File
@@ -790,8 +790,8 @@ class Processor
foreach ($eaList as $ea) {
if (
$emailRepository->isRelated($emailSubject, 'toEmailAddresses', $ea) ||
$emailRepository->isRelated($emailSubject, 'ccEmailAddresses', $ea)
$emailRepository->getRelation($emailSubject, 'toEmailAddresses')->isRelated($ea) ||
$emailRepository->getRelation($emailSubject, 'ccEmailAddresses')->isRelated($ea)
) {
return;
}