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

const ID usage

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-11-11 17:41:22 +02:00
parent 0531b7239c
commit 6d1c4d2aa8
85 changed files with 252 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Classes/Acl/WorkingTimeRange/AssignmentChecker.php
+2 -1
View File
@@ -36,6 +36,7 @@ use Espo\Entities\User;
use Espo\Entities\WorkingTimeRange;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
/**
* @implements AssignmentCheckerInterface<WorkingTimeRange>
@@ -73,7 +74,7 @@ class AssignmentChecker implements AssignmentCheckerInterface
$users = $this->entityManager
->getRDBRepositoryByClass(User::class)
->where(['id' => $entity->getUsers()->getIdList()])
->where([Attribute::ID => $entity->getUsers()->getIdList()])
->find();
foreach ($users as $targetUser) {
application/Espo/Classes/AssignmentNotificators/Email.php
+2 -1
View File
@@ -36,6 +36,7 @@ use Espo\Entities\EmailFolder;
use Espo\Modules\Crm\Entities\Account;
use Espo\Modules\Crm\Entities\Contact;
use Espo\Modules\Crm\Entities\Lead;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Stream\Service as StreamService;
use Espo\Core\Notification\AssignmentNotificator;
use Espo\Core\Notification\AssignmentNotificator\Params;
@@ -269,7 +270,7 @@ class Email implements AssignmentNotificator
'relatedId' => $entity->getId(),
'relatedType' => EmailEntity::ENTITY_TYPE,
])
->select(['id'])
->select([Attribute::ID])
->findOne();
if ($existing) {
application/Espo/Classes/FieldConverters/RelationshipRole.php
+3 -2
View File
@@ -33,6 +33,7 @@ use Espo\Core\Utils\Database\Orm\Defs\AttributeDefs;
use Espo\Core\Utils\Database\Orm\Defs\EntityDefs;
use Espo\Core\Utils\Database\Orm\FieldConverter;
use Espo\ORM\Defs\FieldDefs;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Type\AttributeType;
use RuntimeException;
@@ -155,7 +156,7 @@ class RelationshipRole implements FieldConverter
'EXISTS' => [
'from' => $entityType,
'fromAlias' => 'sq',
'select' => ['id'],
'select' => [Attribute::ID],
'leftJoins' => [
[
$link,
@@ -177,7 +178,7 @@ class RelationshipRole implements FieldConverter
'EXISTS' => [
'from' => $entityType,
'fromAlias' => 'sq',
'select' => ['id'],
'select' => [Attribute::ID],
'leftJoins' => [
[
$link,
application/Espo/Classes/FieldProcessing/Email/FolderDataLoader.php
+3 -2
View File
@@ -35,6 +35,7 @@ use Espo\Entities\Email;
use Espo\Entities\EmailFolder;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
/**
* @implements Loader<Email>
@@ -53,8 +54,8 @@ class FolderDataLoader implements Loader
$folder = $this->entityManager
->getRDBRepositoryByClass(EmailFolder::class)
->select(['id', 'name'])
->where(['id' => $folderId])
->select([Attribute::ID, 'name'])
->where([Attribute::ID => $folderId])
->findOne();
if (!$folder) {
application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php
+5 -4
View File
@@ -33,6 +33,7 @@ use Espo\Modules\Crm\Entities\Call;
use Espo\Modules\Crm\Entities\Meeting;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\EmailAddress as EmailAddressRepository;
use Espo\Entities\EmailAddress;
use Espo\Entities\Email;
@@ -211,8 +212,8 @@ class IcsDataLoader implements Loader
$found1 = $this->entityManager
->getRDBRepository(Meeting::ENTITY_TYPE)
->select(['id'])
->where(['id' => $id])
->select([Attribute::ID])
->where([Attribute::ID => $id])
->findOne();
if ($found1) {
@@ -221,8 +222,8 @@ class IcsDataLoader implements Loader
$found2 = $this->entityManager
->getRDBRepository(Call::ENTITY_TYPE)
->select(['id'])
->where(['id' => $id])
->select([Attribute::ID])
->where([Attribute::ID => $id])
->findOne();
if ($found2) {
application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php
+2 -1
View File
@@ -30,6 +30,7 @@
namespace Espo\Classes\FieldProcessing\Email;
use Espo\ORM\Entity;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\EmailAddress as EmailAddressRepository;
use Espo\Core\FieldProcessing\Loader;
use Espo\Core\FieldProcessing\Loader\Params;
@@ -63,7 +64,7 @@ class StringDataLoader implements Loader
$emailAddressCollection = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->getRelation($this->user, 'emailAddresses')
->select(['id'])
->select([Attribute::ID])
->find();
foreach ($emailAddressCollection as $emailAddress) {
application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php
+3 -2
View File
@@ -40,6 +40,7 @@ use Espo\Core\FieldProcessing\Loader\Params;
use Espo\Core\ORM\EntityManager;
use DateTime;
use Espo\ORM\Name\Attribute;
use Exception;
/**
@@ -65,7 +66,7 @@ class LastAccessLoader implements Loader
$authToken = $this->entityManager
->getRDBRepository(AuthToken::ENTITY_TYPE)
->select(['id', 'lastAccess'])
->select([Attribute::ID, 'lastAccess'])
->where([
'userId' => $entity->getId(),
])
@@ -97,7 +98,7 @@ class LastAccessLoader implements Loader
$authLogRecord = $this->entityManager
->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
->select(['id', Field::CREATED_AT])
->select([Attribute::ID, Field::CREATED_AT])
->where($where)
->order('requestTime', true)
->findOne();
application/Espo/Classes/Jobs/Cleanup.php
+5 -4
View File
@@ -49,6 +49,7 @@ use Espo\Entities\ScheduledJob;
use Espo\Entities\ScheduledJobLogRecord;
use Espo\Entities\UniqueId;
use Espo\Entities\UserReaction;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\DeleteBuilder;
use Espo\ORM\Repository\RDBRepository;
use Espo\Core\ORM\Entity as CoreEntity;
@@ -174,7 +175,7 @@ class Cleanup implements JobDataLess
/** @var iterable<ScheduledJobLogRecord> $scheduledJobList */
$scheduledJobList = $this->entityManager
->getRDBRepository(ScheduledJob::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->find();
foreach ($scheduledJobList as $scheduledJob) {
@@ -183,7 +184,7 @@ class Cleanup implements JobDataLess
/** @var iterable<ScheduledJobLogRecord> $ignoreLogRecordList */
$ignoreLogRecordList = $this->entityManager
->getRDBRepository(ScheduledJobLogRecord::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'scheduledJobId' => $scheduledJobId,
])
@@ -487,7 +488,7 @@ class Cleanup implements JobDataLess
->getRDBRepository(Email::ENTITY_TYPE)
->clone($query)
->sth()
->select(['id'])
->select([Attribute::ID])
->where([
'createdAt<' => $dateBefore,
'deleted' => true,
@@ -783,7 +784,7 @@ class Cleanup implements JobDataLess
$deletedEntityList = $repository
->clone($query)
->select(['id', 'deleted'])
->select([Attribute::ID, Attribute::DELETED])
->where($whereClause)
->find();
application/Espo/Classes/MassAction/Email/MoveToFolder.php
+3 -2
View File
@@ -42,6 +42,7 @@ use Espo\Entities\EmailFolder;
use Espo\Entities\GroupEmailFolder;
use Espo\Entities\User;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Email\Folder;
use Espo\Tools\Email\InboxService as EmailService;
use Exception;
@@ -89,7 +90,7 @@ class MoveToFolder implements MassAction
if ($folderId && str_starts_with($folderId, 'group:')) {
$folder = $this->entityManager
->getRDBRepositoryByClass(GroupEmailFolder::class)
->where(['id' => substr($folderId, 6)])
->where([Attribute::ID => substr($folderId, 6)])
->findOne();
if (!$folder) {
@@ -107,7 +108,7 @@ class MoveToFolder implements MassAction
->getRDBRepositoryByClass(Email::class)
->clone($query)
->sth()
->select(['id'])
->select([Attribute::ID])
->find();
$count = 0;
application/Espo/Classes/MassAction/User/MassDelete.php
+2 -1
View File
@@ -43,6 +43,7 @@ use Espo\Core\ORM\EntityManager;
use Espo\Core\Utils\SystemUser;
use Espo\Entities\User;
use Espo\ORM\Name\Attribute;
/**
* Extended to forbid removal of own and system users.
@@ -83,7 +84,7 @@ class MassDelete implements MassAction
->getRDBRepository(User::ENTITY_TYPE)
->clone($query)
->sth()
->select(['id', 'userName'])
->select([Attribute::ID, 'userName'])
->find();
foreach ($collection as $entity) {
application/Espo/Classes/MassAction/User/MassUpdate.php
+2 -1
View File
@@ -47,6 +47,7 @@ use Espo\Core\Utils\SystemUser;
use Espo\Entities\User;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\MassUpdate\Data as MassUpdateData;
class MassUpdate implements MassAction
@@ -103,7 +104,7 @@ class MassUpdate implements MassAction
->getRDBRepository(User::ENTITY_TYPE)
->clone($query)
->sth()
->select(['id', 'userName'])
->select([Attribute::ID, 'userName'])
->find();
foreach ($collection as $entity) {
application/Espo/Classes/RecordHooks/Note/AssignmentCheck.php
+3 -2
View File
@@ -40,6 +40,7 @@ use Espo\Entities\Note;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\User as UserRepository;
/**
@@ -74,8 +75,8 @@ class AssignmentCheck implements SaveHook
/** @var iterable<User> $targetUserList */
$targetUserList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id', 'type'])
->where(['id' => $userIdList])
->select([Attribute::ID, 'type'])
->where([Attribute::ID => $userIdList])
->find();
}
application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
+3 -2
View File
@@ -34,6 +34,7 @@ use Espo\Core\Select\AccessControl\Filter;
use Espo\Entities\Email;
use Espo\Entities\Team;
use Espo\Entities\User;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -45,7 +46,7 @@ class OnlyTeam implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$subQuery = QueryBuilder::create()
->select('id')
->select(Attribute::ID)
->from(Email::ENTITY_TYPE)
->leftJoin(Team::RELATIONSHIP_ENTITY_TEAM, 'entityTeam', [
'entityTeam.entityId:' => 'id',
@@ -67,7 +68,7 @@ class OnlyTeam implements Filter
$queryBuilder->where(
Cond::in(
Cond::column('id'),
Cond::column(Attribute::ID),
$subQuery
)
);
application/Espo/Classes/Select/Email/TextFilter.php
+2 -1
View File
@@ -34,6 +34,7 @@ use Espo\Core\Select\Text\Filter\Data;
use Espo\Core\Select\Text\DefaultFilter;
use Espo\Core\Select\Text\ConfigProvider;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\SelectBuilder;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -114,7 +115,7 @@ class TextFilter implements Filter
{
$emailAddress = $this->entityManager
->getRDBRepository(EmailAddress::ENTITY_TYPE)
->select('id')
->select(Attribute::ID)
->where(['lower' => strtolower($value)])
->findOne();
application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
+3 -2
View File
@@ -32,6 +32,7 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters;
use Espo\Core\Select\Where\Item;
use Espo\Core\Select\Where\ItemConverter;
use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\Where\OrGroup;
@@ -51,13 +52,13 @@ class EmailAddressEquals implements ItemConverter
$value = $item->getValue();
if (!$value) {
return WhereClause::fromRaw(['id' => null]);
return WhereClause::fromRaw([Attribute::ID => null]);
}
$emailAddressId = $this->emailAddressHelper->getEmailAddressIdByValue($value);
if (!$emailAddressId) {
return WhereClause::fromRaw(['id' => null]);
return WhereClause::fromRaw([Attribute::ID => null]);
}
return OrGroup::create(
application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
+2 -1
View File
@@ -33,6 +33,7 @@ use Espo\Core\Select\Where\ItemConverter;
use Espo\Core\Select\Where\Item;
use Espo\Entities\Email;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
use Espo\ORM\Query\Part\WhereClause;
@@ -233,7 +234,7 @@ class InFolder implements ItemConverter
$emailAddressList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->getRelation($this->user, 'emailAddresses')
->select(['id'])
->select([Attribute::ID])
->find();
$emailAddressIdList = [];
application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
+3 -2
View File
@@ -32,6 +32,7 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters;
use Espo\Core\Select\Where\Item;
use Espo\Core\Select\Where\ItemConverter;
use Espo\Classes\Select\Email\Helpers\EmailAddressHelper;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\WhereClause;
@@ -52,13 +53,13 @@ class ToEquals implements ItemConverter
$value = $item->getValue();
if (!$value) {
return WhereClause::fromRaw(['id' => null]);
return WhereClause::fromRaw([Attribute::ID => null]);
}
$emailAddressId = $this->emailAddressHelper->getEmailAddressIdByValue($value);
if (!$emailAddressId) {
return WhereClause::fromRaw(['id' => null]);
return WhereClause::fromRaw([Attribute::ID => null]);
}
return Cond::exists(
application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php
+2 -1
View File
@@ -33,6 +33,7 @@ use Espo\Core\Select\AccessControl\Filter;
use Espo\Entities\EmailAccount;
use Espo\Entities\User;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
class OnlyOwn implements Filter
@@ -59,7 +60,7 @@ class OnlyOwn implements Filter
$emailAccountList = $this->entityManager
->getRDBRepository(EmailAccount::ENTITY_TYPE)
->select('id')
->select(Attribute::ID)
->where([
'assignedUserId' => $this->user->getId(),
])
application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
+2 -1
View File
@@ -33,6 +33,7 @@ use Espo\Core\Select\Bool\Filter;
use Espo\Entities\EmailAccount;
use Espo\Entities\User;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Where\OrGroupBuilder;
use Espo\ORM\Query\Part\WhereClause;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -55,7 +56,7 @@ class OnlyMy implements Filter
$emailAccountList = $this->entityManager
->getRDBRepository(EmailAccount::ENTITY_TYPE)
->select('id')
->select(Attribute::ID)
->where([
'assignedUserId' => $this->user->getId(),
])
application/Espo/Classes/Select/User/BoolFilters/OnlyMe.php
+2 -1
View File
@@ -31,6 +31,7 @@ namespace Espo\Classes\Select\User\BoolFilters;
use Espo\Core\Select\Bool\Filter;
use Espo\Entities\User;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Where\OrGroupBuilder;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -42,6 +43,6 @@ class OnlyMe implements Filter
public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void
{
$queryBuilder->where(['id' => $this->user->getId()]);
$queryBuilder->where([Attribute::ID => $this->user->getId()]);
}
}
application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
+3 -2
View File
@@ -32,6 +32,7 @@ namespace Espo\Classes\Select\User\BoolFilters;
use Espo\Entities\Team;
use Espo\Entities\User;
use Espo\Core\Select\Bool\Filter;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition;
use Espo\ORM\Query\Part\Expression;
use Espo\ORM\Query\Part\Where\OrGroupBuilder;
@@ -52,7 +53,7 @@ class OnlyMyTeam implements Filter
if (count($teamIdList) === 0) {
$orGroupBuilder->add(
WhereClause::fromRaw(['id' => null])
WhereClause::fromRaw([Attribute::ID => null])
);
return;
@@ -60,7 +61,7 @@ class OnlyMyTeam implements Filter
$orGroupBuilder->add(
Condition::in(
Expression::column('id'),
Expression::column(Attribute::ID),
SelectBuilder::create()
->from(Team::RELATIONSHIP_TEAM_USER)
->select('userId')
application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php
+2 -1
View File
@@ -32,6 +32,7 @@ namespace Espo\Classes\Select\User\Where\ItemConverters;
use Espo\Core\Select\Where\Item;
use Espo\Core\Select\Where\ItemConverter;
use Espo\Entities\User;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\WhereClause;
use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -56,7 +57,7 @@ class IsOfType implements ItemConverter
User::TYPE_API => WhereClause::fromRaw([
'type' => User::TYPE_API,
]),
default => WhereClause::fromRaw(['id' => null]),
default => WhereClause::fromRaw([Attribute::ID => null]),
};
}
}
application/Espo/Core/Authentication/Hook/Hooks/FailedAttemptsLimit.php
+2 -1
View File
@@ -40,6 +40,7 @@ use Espo\ORM\EntityManager;
use Espo\Entities\AuthLogRecord;
use DateTime;
use Espo\ORM\Name\Attribute;
use Exception;
use RuntimeException;
@@ -77,7 +78,7 @@ class FailedAttemptsLimit implements BeforeLogin
$wasFailed = (bool) $this->entityManager
->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where($where)
->findOne();
application/Espo/Core/Authentication/Hook/Hooks/FailedCodeAttemptsLimit.php
+2 -1
View File
@@ -38,6 +38,7 @@ use Espo\Entities\AuthLogRecord;
use Espo\ORM\EntityManager;
use DateTime;
use Espo\ORM\Name\Attribute;
use Exception;
use RuntimeException;
@@ -80,7 +81,7 @@ class FailedCodeAttemptsLimit implements BeforeLogin
$wasFailed = (bool) $this->entityManager
->getRDBRepository(AuthLogRecord::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where($where)
->findOne();
application/Espo/Core/Console/Commands/AuthTokenCheck.php
+1 -1
View File
@@ -73,7 +73,7 @@ class AuthTokenCheck implements Command
->getRDBRepository(User::ENTITY_TYPE)
->select(Attribute::ID)
->where([
'id' => $userId,
Attribute::ID => $userId,
'isActive' => true,
])
->findOne();
application/Espo/Core/Console/Commands/Extension.php
+2 -1
View File
@@ -39,6 +39,7 @@ use Espo\Core\Upgrades\ExtensionManager;
use Espo\Core\Container;
use Espo\Core\Utils\File\Manager as FileManager;
use Espo\ORM\Name\Attribute;
use Throwable;
/**
@@ -169,7 +170,7 @@ class Extension implements Command
$record = $this->entityManager
->getRDBRepository(ExtensionEntity::ENTITY_TYPE)
->where([
'id' => $id,
Attribute::ID => $id,
'isInstalled' => true,
])
->findOne();
application/Espo/Core/Duplicate/Finder.php
+6 -5
View File
@@ -36,6 +36,7 @@ use Espo\Core\Select\SelectBuilderFactory;
use Espo\ORM\Collection;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\WhereItem;
use RuntimeException;
@@ -94,7 +95,7 @@ class Finder
$where = Cond::and(
$where,
Cond::notEqual(
Cond::column('id'),
Cond::column(Attribute::ID),
$entity->getId()
)
);
@@ -103,7 +104,7 @@ class Finder
$duplicate = $this->entityManager
->getRDBRepository($entityType)
->where($where)
->select('id')
->select(Attribute::ID)
->findOne();
return (bool) $duplicate;
@@ -122,7 +123,7 @@ class Finder
$where = Cond::and(
$where,
Cond::notEqual(
Cond::column('id'),
Cond::column(Attribute::ID),
$entity->getId()
)
);
@@ -134,7 +135,7 @@ class Finder
->from($entityType)
->withStrictAccessControl()
->buildQueryBuilder()
->select(['id'])
->select([Attribute::ID])
->limit(0, self::LIMIT);
} catch (Forbidden|BadRequest $e) {
throw new RuntimeException($e->getMessage(), 0, $e);
@@ -160,7 +161,7 @@ class Finder
return $repository
->clone($baseQueryBuilder->build())
->select(['*'])
->where(['id' => $ids])
->where([Attribute::ID => $ids])
->find();
}
application/Espo/Core/ExternalAccount/ClientManager.php
+3 -2
View File
@@ -43,6 +43,7 @@ use Espo\Core\InjectableFactory;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\Utils\Config;
use Espo\Core\Utils\Metadata;
use Espo\ORM\Name\Attribute;
use RuntimeException;
class ClientManager
@@ -399,8 +400,8 @@ class ClientManager
{
$account = $this->entityManager
->getRDBRepository(ExternalAccount::ENTITY_TYPE)
->select(['id', 'isLocked'])
->where(['id' => $id])
->select([Attribute::ID, 'isLocked'])
->where([Attribute::ID => $id])
->findOne();
if (!$account) {
application/Espo/Core/FieldProcessing/Relation/Saver.php
+4 -3
View File
@@ -36,6 +36,7 @@ use Espo\ORM\Entity;
use Espo\Core\FieldProcessing\Saver as SaverInterface;
use Espo\Core\FieldProcessing\Saver\Params;
use Espo\Core\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Repository\Option\SaveOption;
/**
@@ -122,7 +123,7 @@ class Saver implements SaverInterface
$previous = $this->entityManager
->getRDBRepository($foreignEntityType)
->select(['id'])
->select([Attribute::ID])
->where([$foreignKey => $entity->getId()])
->findOne();
@@ -178,10 +179,10 @@ class Saver implements SaverInterface
$anotherEntity = $this->entityManager
->getRDBRepository($entityType)
->select(['id'])
->select([Attribute::ID])
->where([
$idAttribute => $entity->get($idAttribute),
'id!=' => $entity->getId(),
Attribute::ID . '!=' => $entity->getId(),
])
->findOne();
application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php
+2 -1
View File
@@ -33,6 +33,7 @@ use Espo\Core\Exceptions\Error;
use Espo\Core\Di;
use Espo\ORM\Name\Attribute;
use stdClass;
use PDO;
@@ -133,7 +134,7 @@ class SumRelatedType extends \Espo\Core\Formula\Functions\Base implements
$sqQueryBuilder
->order([])
->select(['id']);
->select([Attribute::ID]);
$queryBuilder->where([
'id=s' => $sqQueryBuilder->build(),
application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php
+2 -1
View File
@@ -39,6 +39,7 @@ use Espo\Core\Formula\Func;
use Espo\Core\Select\SelectBuilderFactory;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Order;
class FindManyType implements Func
@@ -127,7 +128,7 @@ class FindManyType implements Func
}
$queryBuilder
->select(['id'])
->select([Attribute::ID])
->limit(0, $limit);
$collection = $this->entityManager
application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php
+2 -1
View File
@@ -40,6 +40,7 @@ use Espo\Core\Formula\ArgumentList;
use Espo\Core\Formula\Functions\BaseFunction;
use Espo\Core\Di;
use Espo\Core\Select\Helpers\RandomStringGenerator;
use Espo\ORM\Name\Attribute;
class FindRelatedManyType extends BaseFunction implements
Di\EntityManagerAware,
@@ -212,7 +213,7 @@ class FindRelatedManyType extends BaseFunction implements
$collection = $entityManager
->getRDBRepository($foreignEntityType)
->clone($queryBuilder->build())
->select(['id'])
->select([Attribute::ID])
->find();
$idList = [];
application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php
+3 -2
View File
@@ -31,6 +31,7 @@ namespace Espo\Core\Formula\Functions\RecordGroup;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\ORM\Name\Attribute;
use Espo\Core\Formula\{
Functions\BaseFunction,
ArgumentList,
@@ -100,7 +101,7 @@ class FindRelatedOneType extends BaseFunction implements
$relatedEntity = $entityManager
->getRDBRepository($entityType)
->getRelation($entity, $link)
->select(['id'])
->select([Attribute::ID])
->findOne();
if (!$relatedEntity) {
@@ -191,7 +192,7 @@ class FindRelatedOneType extends BaseFunction implements
$relatedEntity = $entityManager
->getRDBRepository($foreignEntityType)
->clone($queryBuilder->build())
->select(['id'])
->select([Attribute::ID])
->findOne();
if ($relatedEntity) {
application/Espo/Core/Rebuild/Actions/AddSystemUser.php
+1 -1
View File
@@ -64,7 +64,7 @@ class AddSystemUser implements RebuildAction
->getQueryBuilder()
->delete()
->from(User::ENTITY_TYPE)
->where(['id' => $user->getId()])
->where([Attribute::ID => $user->getId()])
->build()
);
}
application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php
+1 -1
View File
@@ -70,7 +70,7 @@ class PortalOnlyContact implements Filter
$orBuilder->add(
Cond::in(
Expr::column('id'),
Expr::column(Attribute::ID),
QueryBuilder::create()
->from(ucfirst($defs->getRelationshipName()), 'm')
->select($defs->getMidKey())
application/Espo/Core/Select/Bool/Filters/Shared.php
+3 -2
View File
@@ -34,6 +34,7 @@ use Espo\Core\Select\Bool\Filter;
use Espo\Core\Select\Helpers\FieldHelper;
use Espo\Entities\User;
use Espo\ORM\Defs;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Where\OrGroupBuilder;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
@@ -67,10 +68,10 @@ class Shared implements Filter
$key2 = $relationDefs->getForeignMidKey();
$subQuery = QueryBuilder::create()
->select('id')
->select(Attribute::ID)
->from($this->entityType)
->leftJoin($middleEntityType, 'collaboratorsMiddle', [
"collaboratorsMiddle.$key1:" => 'id',
"collaboratorsMiddle.$key1:" => Attribute::ID,
'collaboratorsMiddle.deleted' => false,
])
->where(["collaboratorsMiddle.$key2" => $this->user->getId()])
application/Espo/Core/Select/Helpers/RelationQueryHelper.php
+3 -2
View File
@@ -32,6 +32,7 @@ namespace Espo\Core\Select\Helpers;
use Espo\Core\Name\Field;
use Espo\Entities\User;
use Espo\ORM\Defs;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition;
use Espo\ORM\Query\Part\Expression;
use Espo\ORM\Query\Part\WhereItem;
@@ -82,7 +83,7 @@ class RelationQueryHelper
$key2 = $relationDefs->getForeignMidKey();
$joinWhere = [
"m.$key1:" => 'id',
"m.$key1:" => Attribute::ID,
'm.deleted' => false,
];
@@ -91,7 +92,7 @@ class RelationQueryHelper
}
$subQuery = QueryBuilder::create()
->select('id')
->select(Attribute::ID)
->from($entityType)
->leftJoin($middleEntityType, 'm', $joinWhere)
->where(["m.$key2" => $userId])
application/Espo/Core/Select/Text/DefaultFilter.php
+2 -1
View File
@@ -31,6 +31,7 @@ namespace Espo\Core\Select\Text;
use Espo\Core\ORM\Type\FieldType;
use Espo\Core\Select\Text\Filter\Data;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder as QueryBuilder;
use Espo\ORM\Query\Part\Where\OrGroup;
use Espo\ORM\Query\Part\Where\OrGroupBuilder;
@@ -65,7 +66,7 @@ class DefaultFilter implements Filter
$orGroup = $orGroupBuilder->build();
if ($orGroup->getItemCount() === 0) {
$queryBuilder->where(['id' => null]);
$queryBuilder->where([Attribute::ID => null]);
return;
}
application/Espo/Core/Select/Where/Converter.php
+3 -2
View File
@@ -31,6 +31,7 @@ namespace Espo\Core\Select\Where;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Select\Where\Item\Type;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition as Cond;
use Espo\ORM\Query\Part\Expression as Expr;
use Espo\ORM\Query\Part\Where\Comparison;
@@ -132,14 +133,14 @@ class Converter
$subQueryBuilder = QueryBuilder::create()
->from($entityType)
->select('id');
->select(Attribute::ID);
$subQueryBuilder->where(
$this->convert($subQueryBuilder, $item)
);
return Cond::in(
Expr::column('id'),
Expr::column(Attribute::ID),
$subQueryBuilder->build()
);
}
application/Espo/Core/Upgrades/Actions/Extension/Install.php
+4 -3
View File
@@ -34,6 +34,7 @@ use Espo\Core\Utils\Util;
use Espo\Core\Exceptions\Error;
use Espo\Entities\Extension;
use Espo\ORM\Name\Attribute;
use Throwable;
class Install extends \Espo\Core\Upgrades\Actions\Base\Install
@@ -92,7 +93,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
$extensionEntity = $this->getExtensionEntity();
if ($extensionEntity) {
$id = $extensionEntity->get('id');
$id = $extensionEntity->get(Attribute::ID);
}
return !isset($id);
@@ -204,7 +205,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
}
$this->executeAction(Base::UNINSTALL, [
'id' => $extensionEntity->get('id'),
'id' => $extensionEntity->get(Attribute::ID),
'skipSystemRebuild' => true,
'skipAfterScript' => true,
'parentProcessId' => $this->getProcessId(),
@@ -225,7 +226,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
}
$this->executeAction(Base::DELETE, [
'id' => $extensionEntity->get('id'),
'id' => $extensionEntity->get(Attribute::ID),
'parentProcessId' => $this->getProcessId(),
]);
}
application/Espo/Core/Utils/Database/Orm/Converter.php
+2 -2
View File
@@ -884,12 +884,12 @@ class Converter
$itemDefs = [
'skipRebuild' => true,
'attributes' => [
'id' => [
Attribute::ID => [
'type' => Entity::ID,
'autoincrement' => true,
'dbType' => Types::BIGINT, // ignored because of `skipRebuild`
],
'deleted' => [
Attribute::DELETED => [
'type' => Entity::BOOL,
],
],
application/Espo/Core/Utils/Database/Orm/LinkConverters/HasOne.php
+2 -1
View File
@@ -34,6 +34,7 @@ use Espo\Core\Utils\Database\Orm\Defs\EntityDefs;
use Espo\Core\Utils\Database\Orm\Defs\RelationDefs;
use Espo\Core\Utils\Database\Orm\LinkConverter;
use Espo\ORM\Defs\RelationDefs as LinkDefs;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Type\AttributeType;
use Espo\ORM\Type\RelationType;
@@ -55,7 +56,7 @@ class HasOne implements LinkConverter
->withType($noJoin ? AttributeType::VARCHAR : AttributeType::FOREIGN)
->withNotStorable()
->withParam('relation', $name)
->withParam('foreign', 'id');
->withParam('foreign', Attribute::ID);
$nameAttributeDefs = !$noForeignName ?
(
application/Espo/Core/Utils/ScheduledJob.php
+3 -2
View File
@@ -35,6 +35,7 @@ use Espo\Entities\Job;
use Espo\Core\ORM\EntityManager;
use Espo\Core\Utils\DateTime as DateTimeUtil;
use Espo\ORM\Name\Attribute;
use Exception;
use RuntimeException;
use DateTime;
@@ -135,7 +136,7 @@ class ScheduledJob
try {
$r1From = new DateTime('-' . $this->checkingCronPeriod);
$r1To = new DateTime('+' . $this->checkingCronPeriod);
} catch (Exception $e) {
} catch (Exception) {
throw new RuntimeException();
}
@@ -146,7 +147,7 @@ class ScheduledJob
return (bool) $this->entityManager
->getRDBRepository(Job::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->leftJoin('scheduledJob')
->where([
'OR' => [
application/Espo/Core/Webhook/Manager.php
+2 -1
View File
@@ -39,6 +39,7 @@ use Espo\Core\Utils\Log;
use Espo\Entities\Webhook;
use Espo\Entities\WebhookEventQueueItem;
use Espo\ORM\Name\Attribute;
use RuntimeException;
/**
@@ -142,7 +143,7 @@ class Manager
{
$notExists = !$this->entityManager
->getRDBRepository(Webhook::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'event' => $event,
'isActive' => true,
application/Espo/Entities/Note.php
+3 -2
View File
@@ -37,6 +37,7 @@ use Espo\Core\Field\DateTime;
use Espo\ORM\Collection;
use Espo\ORM\Entity as OrmEntity;
use Espo\ORM\Name\Attribute;
use RuntimeException;
use stdClass;
@@ -167,10 +168,10 @@ class Note extends Entity
$collection = $this->entityManager
->getRDBRepository(Attachment::ENTITY_TYPE)
->select(['id', 'name', 'type'])
->select([Attribute::ID, 'name', 'type'])
->order(Field::CREATED_AT)
->where([
'id' => $attachmentsIds
Attribute::ID => $attachmentsIds
])
->find();
application/Espo/Modules/Crm/Classes/Acl/Meeting/AssignmentChecker.php
+2 -1
View File
@@ -37,6 +37,7 @@ use Espo\Modules\Crm\Entities\Call;
use Espo\Modules\Crm\Entities\Meeting;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
/**
* @implements AssignmentCheckerInterface<Meeting|Call>
@@ -83,7 +84,7 @@ class AssignmentChecker implements AssignmentCheckerInterface
$usersCollection = $this->entityManager
->getRDBRepository($entity->getEntityType())
->getRelation($entity, 'users')
->select('id')
->select(Attribute::ID)
->find();
foreach ($usersCollection as $user) {
application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php
+4 -3
View File
@@ -36,6 +36,7 @@ use Espo\Core\FieldProcessing\Loader;
use Espo\Core\FieldProcessing\Loader\Params;
use Espo\Core\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use stdClass;
/**
@@ -77,9 +78,9 @@ class PhoneNumberMapLoader implements Loader
$entityList = $this->entityManager
->getRDBRepository($entityType)
->where([
'id' => $idList,
Attribute::ID => $idList,
])
->select(['id', 'phoneNumber'])
->select([Attribute::ID, 'phoneNumber'])
->find();
foreach ($entityList as $entity) {
@@ -89,7 +90,7 @@ class PhoneNumberMapLoader implements Loader
continue;
}
if (strpos($phoneNumber, self::ERASED_PART) === 0) {
if (str_starts_with($phoneNumber, self::ERASED_PART)) {
continue;
}
application/Espo/Modules/Crm/Classes/RecordHooks/TargetList/AfterCreate.php
+4 -3
View File
@@ -40,6 +40,7 @@ use Espo\Modules\Crm\Entities\TargetList;
use Espo\Modules\Crm\Tools\TargetList\MetadataProvider;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
/**
* @implements SaveHook<TargetList>
@@ -107,7 +108,7 @@ class AfterCreate implements SaveHook
->getQueryBuilder()
->select()
->from(CampaignLogRecord::ENTITY_TYPE)
->select(['id', 'parentId', 'parentType'])
->select([Attribute::ID, 'parentId', 'parentType'])
->where([
'isTest' => false,
'campaignId' => $sourceCampaignId,
@@ -122,11 +123,11 @@ class AfterCreate implements SaveHook
$queryBuilder->group([
'parentId',
'parentType',
'id',
Attribute::ID,
]);
$notQueryBuilder->where(['action=' => $excludingActionList]);
$notQueryBuilder->select(['id']);
$notQueryBuilder->select([Attribute::ID]);
/** @var iterable<CampaignLogRecord> $logRecords */
$logRecords = $this->entityManager
application/Espo/Modules/Crm/Classes/Select/Account/AccessControlFilters/PortalOnlyAccount.php
+3 -2
View File
@@ -30,6 +30,7 @@
namespace Espo\Modules\Crm\Classes\Select\Account\AccessControlFilters;
use Espo\Core\Select\AccessControl\Filter;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
use Espo\Entities\User;
@@ -44,11 +45,11 @@ class PortalOnlyAccount implements Filter
$accountIdList = $this->user->getLinkMultipleIdList(User::LINK_ACCOUNTS);
if (!count($accountIdList)) {
$queryBuilder->where(['id' => null]);
$queryBuilder->where([Attribute::ID => null]);
return;
}
$queryBuilder->where(['id' => $accountIdList]);
$queryBuilder->where([Attribute::ID => $accountIdList]);
}
}
application/Espo/Modules/Crm/Classes/Select/Contact/AccessControlFilters/PortalOnlyContact.php
+3 -3
View File
@@ -30,12 +30,12 @@
namespace Espo\Modules\Crm\Classes\Select\Contact\AccessControlFilters;
use Espo\Core\Select\AccessControl\Filter;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
use Espo\Entities\User;
class PortalOnlyContact implements Filter
{
public function __construct(private User $user)
{}
@@ -44,11 +44,11 @@ class PortalOnlyContact implements Filter
$contactId = $this->user->getContactId();
if ($contactId === null) {
$queryBuilder->where(['id' => null]);
$queryBuilder->where([Attribute::ID => null]);
return;
}
$queryBuilder->where(['id' => $contactId]);
$queryBuilder->where([Attribute::ID => $contactId]);
}
}
application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyOwn.php
+3 -2
View File
@@ -31,6 +31,7 @@ namespace Espo\Modules\Crm\Classes\Select\Meeting\AccessControlFilters;
use Espo\Core\Select\AccessControl\Filter;
use Espo\ORM\Defs;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
use Espo\ORM\Query\Part\Condition as Cond;
@@ -55,9 +56,9 @@ class OnlyOwn implements Filter
$queryBuilder->where(
Cond::in(
Cond::column('id'),
Cond::column(Attribute::ID),
SelectBuilder::create()
->select('id')
->select(Attribute::ID)
->from($this->entityType)
->leftJoin($middleEntityType, 'usersMiddle', [
"usersMiddle.{$key1}:" => 'id',
application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyTeam.php
+3 -2
View File
@@ -31,6 +31,7 @@ namespace Espo\Modules\Crm\Classes\Select\Meeting\AccessControlFilters;
use Espo\Core\Select\AccessControl\Filter;
use Espo\ORM\Defs;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
use Espo\ORM\Query\Part\Condition as Cond;
@@ -55,9 +56,9 @@ class OnlyTeam implements Filter
$queryBuilder->where(
Cond::in(
Cond::column('id'),
Cond::column(Attribute::ID),
SelectBuilder::create()
->select('id')
->select(Attribute::ID)
->from($this->entityType)
->leftJoin('EntityTeam', 'entityTeam', [
'entityTeam.entityId:' => 'id',
application/Espo/Modules/Crm/Hooks/CaseObj/Contacts.php
+3 -2
View File
@@ -37,6 +37,7 @@ use Espo\Modules\Crm\Entities\CaseObj;
use Espo\Modules\Crm\Entities\Contact;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Repository\Option\SaveOptions;
use Espo\Tools\Stream\Service as StreamService;
@@ -75,7 +76,7 @@ class Contacts implements AfterSave
if ($fetchedContactId) {
$previousPortalUser = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'contactId' => $fetchedContactId,
'type' => User::TYPE_PORTAL,
@@ -101,7 +102,7 @@ class Contacts implements AfterSave
$portalUser = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'contactId' => $contactId,
'type' => User::TYPE_PORTAL,
application/Espo/Modules/Crm/Hooks/Meeting/ParentLink.php
+4 -3
View File
@@ -35,6 +35,7 @@ use Espo\Modules\Crm\Entities\Account;
use Espo\Modules\Crm\Entities\Lead;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Repository\Option\SaveOptions;
/**
@@ -78,7 +79,7 @@ class ParentLink implements BeforeSave
$parent = $this->entityManager
->getRDBRepository($parentType)
->select($columnList)
->where(['id' => $parentId])
->where([Attribute::ID => $parentId])
->findOne();
}
@@ -118,8 +119,8 @@ class ParentLink implements BeforeSave
) {
$account = $this->entityManager
->getRDBRepository(Account::ENTITY_TYPE)
->select(['id', 'name'])
->where(['id' => $entity->get('accountId')])
->select([Attribute::ID, 'name'])
->where([Attribute::ID => $entity->get('accountId')])
->findOne();
if ($account) {
application/Espo/Modules/Crm/Hooks/Task/ParentLink.php
+6 -5
View File
@@ -37,6 +37,7 @@ use Espo\Modules\Crm\Entities\Lead;
use Espo\Modules\Crm\Entities\Task;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Repository\Option\SaveOptions;
/**
@@ -91,7 +92,7 @@ class ParentLink implements BeforeSave
$parent = $this->entityManager
->getRDBRepository($parentType)
->select($columnList)
->where(['id' => $parentId])
->where([Attribute::ID => $parentId])
->findOne();
}
@@ -153,8 +154,8 @@ class ParentLink implements BeforeSave
) {
$account = $this->entityManager
->getRDBRepository(Account::ENTITY_TYPE)
->select(['id', 'name'])
->where(['id' => $entity->get('accountId')])
->select([Attribute::ID, 'name'])
->where([Attribute::ID => $entity->get('accountId')])
->findOne();
if ($account) {
@@ -168,8 +169,8 @@ class ParentLink implements BeforeSave
) {
$contact = $this->entityManager
->getRDBRepository(Contact::ENTITY_TYPE)
->select(['id', 'name'])
->where(['id' => $entity->get('contactId')])
->select([Attribute::ID, 'name'])
->where([Attribute::ID => $entity->get('contactId')])
->findOne();
if ($contact) {
application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php
+2 -1
View File
@@ -39,6 +39,7 @@ use Espo\Modules\Crm\Entities\Meeting;
use Espo\Modules\Crm\Entities\Reminder;
use Espo\Modules\Crm\Entities\Task;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\PopupNotification\Item;
use Espo\Tools\PopupNotification\Provider;
use Exception;
@@ -152,7 +153,7 @@ class PopupNotificationsProvider implements Provider
->getQueryBuilder()
->delete()
->from(Reminder::ENTITY_TYPE)
->where(['id' => $id])
->where([Attribute::ID => $id])
->build();
$this->entityManager->getQueryExecutor()->execute($deleteQuery);
application/Espo/Modules/Crm/Tools/Calendar/Service.php
+3 -2
View File
@@ -55,6 +55,7 @@ use Espo\Modules\Crm\Tools\Calendar\Items\NonWorkingRange;
use Espo\Modules\Crm\Tools\Calendar\Items\WorkingRange;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Select;
use Espo\Tools\WorkingTime\Calendar as WorkingCalendar;
use Espo\Tools\WorkingTime\CalendarFactory as WorkingCalendarFactory;
@@ -614,7 +615,7 @@ class Service
$userList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id', 'name'])
->select([Attribute::ID, 'name'])
->leftJoin(Field::TEAMS)
->where([
'isActive' => true,
@@ -686,7 +687,7 @@ class Service
$teamList = iterator_to_array(
$this->entityManager
->getRDBRepositoryByClass(Team::class)
->where(['id' => $teamIdList])
->where([Attribute::ID => $teamIdList])
->find()
);
application/Espo/Modules/Crm/Tools/Lead/ConvertService.php
+5 -4
View File
@@ -57,6 +57,7 @@ use Espo\Modules\Crm\Tools\Lead\Convert\Values;
use Espo\ORM\Collection;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\Attachment as AttachmentRepository;
use Espo\Tools\Stream\Service as StreamService;
use RuntimeException;
@@ -496,7 +497,7 @@ class ConvertService
/** @var Collection<Meeting> $meetings */
$meetings = $leadRepository
->getRelation($lead, 'meetings')
->select(['id', 'parentId', 'parentType'])
->select([Attribute::ID, 'parentId', 'parentType'])
->find();
foreach ($meetings as $meeting) {
@@ -523,7 +524,7 @@ class ConvertService
/** @var Collection<Call> $calls */
$calls = $leadRepository
->getRelation($lead, 'calls')
->select(['id', 'parentId', 'parentType'])
->select([Attribute::ID, 'parentId', 'parentType'])
->find();
foreach ($calls as $call) {
@@ -550,7 +551,7 @@ class ConvertService
/** @var Collection<Email> $emails */
$emails = $leadRepository
->getRelation($lead, 'emails')
->select(['id', 'parentId', 'parentType'])
->select([Attribute::ID, 'parentId', 'parentType'])
->find();
foreach ($emails as $email) {
@@ -570,7 +571,7 @@ class ConvertService
/** @var Collection<Document> $documents */
$documents = $leadRepository
->getRelation($lead, 'documents')
->select(['id'])
->select([Attribute::ID])
->find();
foreach ($documents as $document) {
application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php
+3 -2
View File
@@ -31,6 +31,7 @@ namespace Espo\Modules\Crm\Tools\MassEmail;
use Espo\ORM\Collection;
use Espo\ORM\Entity;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\EmailAddress as EmailAddressRepository;
use Espo\Entities\EmailAddress;
use Espo\Modules\Crm\Entities\TargetList;
@@ -103,7 +104,7 @@ class QueueCreator
->getRDBRepositoryByClass(TargetList::class)
->getRelation($excludingTargetList, $link)
->sth()
->select(['id', 'emailAddress'])
->select([Attribute::ID, 'emailAddress'])
->find();
foreach ($excludingList as $excludingTarget) {
@@ -131,7 +132,7 @@ class QueueCreator
$recordList = $this->entityManager
->getRDBRepositoryByClass(TargetList::class)
->getRelation($targetList, $link)
->select(['id', 'emailAddress'])
->select([Attribute::ID, 'emailAddress'])
->sth()
->where(['@relation.optedOut' => false])
->find();
application/Espo/Modules/Crm/Tools/Meeting/Service.php
+2 -1
View File
@@ -44,6 +44,7 @@ use Espo\Modules\Crm\Entities\Meeting;
use Espo\ORM\Collection;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use LogicException;
class Service
@@ -227,7 +228,7 @@ class Service
$itemCollection = $this->entityManager
->getRDBRepository($entityType)
->getRelation($entity, $link)
->select(['id', 'name', 'acceptanceStatus', 'emailAddress'])
->select([Attribute::ID, 'name', 'acceptanceStatus', 'emailAddress'])
->order('name')
->find();
application/Espo/Modules/Crm/Tools/Opportunity/Report/Util.php
+2 -1
View File
@@ -32,6 +32,7 @@ namespace Espo\Modules\Crm\Tools\Opportunity\Report;
use Espo\Core\Utils\Metadata;
use Espo\Modules\Crm\Entities\Opportunity as OpportunityEntity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
class Util
@@ -62,7 +63,7 @@ class Util
->getQueryBuilder()
->select()
->from(OpportunityEntity::ENTITY_TYPE)
->select('id')
->select(Attribute::ID)
->where($whereClause)
->build();
application/Espo/Repositories/ArrayValue.php
+3 -2
View File
@@ -34,6 +34,7 @@ use Espo\Entities\ArrayValue as ArrayValueEntity;
use Espo\ORM\Entity;
use Espo\Core\Repositories\Database;
use Espo\ORM\Name\Attribute;
use RuntimeException;
use LogicException;
@@ -83,7 +84,7 @@ class ArrayValue extends Database
$isTransaction = true;
$existingList = $this
->select(['id', 'value'])
->select([Attribute::ID, 'value'])
->where([
'entityType' => $entity->getEntityType(),
'entityId' => $entity->getId(),
@@ -148,7 +149,7 @@ class ArrayValue extends Database
$this->entityManager->getTransactionManager()->start();
$list = $this
->select(['id'])
->select([Attribute::ID])
->where([
'entityType' => $entity->getEntityType(),
'entityId' => $entity->getId(),
application/Espo/Repositories/EmailAddress.php
+4 -3
View File
@@ -35,6 +35,7 @@ use Espo\ORM\Entity;
use Espo\Entities\EmailAddress as EmailAddressEntity;
use Espo\Core\Di;
use Espo\ORM\Name\Attribute;
use stdClass;
/**
@@ -215,7 +216,7 @@ class EmailAddress extends Database implements
}
if ($onlyName) {
$select = ['id', 'name'];
$select = [Attribute::ID, 'name'];
if ($itemEntityType === UserEntity::ENTITY_TYPE) {
$select[] = 'isActive';
@@ -224,7 +225,7 @@ class EmailAddress extends Database implements
$entity = $this->entityManager
->getRDBRepository($itemEntityType)
->select($select)
->where(['id' => $itemEntityId])
->where([Attribute::ID => $itemEntityId])
->findOne();
} else {
$entity = $this->entityManager->getEntityById($itemEntityType, $itemEntityId);
@@ -292,7 +293,7 @@ class EmailAddress extends Database implements
$entity = $this->entityManager
->getRDBRepository($itemEntityType)
->select($select)
->where(['id' => $itemEntityId])
->where([Attribute::ID => $itemEntityId])
->findOne();
} else {
$entity = $this->entityManager->getEntityById($itemEntityType, $itemEntityId);
application/Espo/Repositories/Preferences.php
+5 -4
View File
@@ -33,6 +33,7 @@ use Espo\Entities\Autofollow;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\EntityFactory;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Repository\Repository;
use Espo\Core\Utils\Json;
@@ -131,9 +132,9 @@ class Preferences implements Repository,
$select = $this->entityManager->getQueryBuilder()
->select()
->from(PreferencesEntity::ENTITY_TYPE)
->select(['id', 'data'])
->select([Attribute::ID, 'data'])
->where([
'id' => $id,
Attribute::ID => $id,
])
->limit(0, 1)
->build();
@@ -264,9 +265,9 @@ class Preferences implements Repository,
$insert = $this->entityManager->getQueryBuilder()
->insert()
->into(PreferencesEntity::ENTITY_TYPE)
->columns(['id', 'data'])
->columns([Attribute::ID, 'data'])
->values([
'id' => $entity->getId(),
Attribute::ID => $entity->getId(),
'data' => $dataString,
])
->updateSet([
application/Espo/Services/RecordTree.php
+3 -2
View File
@@ -33,6 +33,7 @@ use Espo\Core\Acl\Table;
use Espo\Core\Exceptions\BadRequest;
use Espo\ORM\Collection;
use Espo\ORM\Entity;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Order;
use Espo\Core\Acl\Table as AclTable;
use Espo\Core\Exceptions\Error;
@@ -189,7 +190,7 @@ class RecordTree extends Record
$one = $this->entityManager
->getRDBRepository($entityType)
->clone($query)
->select(['id'])
->select([Attribute::ID])
->findOne();
if ($one) {
@@ -380,7 +381,7 @@ class RecordTree extends Record
$collection = $this->getRepository()
->clone($query)
->select(['id'])
->select([Attribute::ID])
->find();
foreach ($collection as $entity) {
application/Espo/Services/User.php
+2 -1
View File
@@ -43,6 +43,7 @@ use Espo\Core\Record\DeleteParams;
use Espo\Core\Record\UpdateParams;
use Espo\Core\Utils\PasswordHash;
use Espo\ORM\Entity;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
use Espo\Tools\User\UserUtil;
use Espo\Tools\UserSecurity\Password\Checker as PasswordChecker;
@@ -251,7 +252,7 @@ class User extends Record implements LogAware
->withDeleted()
->build()
)
->where(['id' => $id])
->where([Attribute::ID => $id])
->findOne();
if ($entity) {
application/Espo/Tools/AdminNotifications/Jobs/CheckNewExtensionVersion.php
+2 -1
View File
@@ -35,6 +35,7 @@ use Espo\Core\Utils\Config;
use Espo\Core\Utils\Config\ConfigWriter;
use Espo\Entities\Extension;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\AdminNotifications\LatestReleaseDataRequester;
/**
@@ -62,7 +63,7 @@ class CheckNewExtensionVersion implements JobDataLess
->getQueryBuilder()
->select()
->from(Extension::ENTITY_TYPE)
->select(['id', 'name', 'version', 'checkVersionUrl'])
->select([Attribute::ID, 'name', 'version', 'checkVersionUrl'])
->where([
'deleted' => false,
'isInstalled' => true,
application/Espo/Tools/App/AppService.php
+2 -1
View File
@@ -38,6 +38,7 @@ use Espo\Entities\EmailAccount as EmailAccountEntity;
use Espo\Entities\EmailAddress;
use Espo\Entities\InboundEmail as InboundEmailEntity;
use Espo\Entities\Settings;
use Espo\ORM\Name\Attribute;
use Espo\Tools\App\SettingsService as SettingsService;
use Espo\Core\Acl;
@@ -314,7 +315,7 @@ class AppService
{
$emailAccountCollection = $this->entityManager
->getRDBRepositoryByClass(EmailAccountEntity::class)
->select(['id', 'emailAddress'])
->select([Attribute::ID, 'emailAddress'])
->where([
'assignedUserId' => $user->getId(),
'useSmtp' => true,
application/Espo/Tools/Email/Api/PostUsers.php
+2 -1
View File
@@ -44,6 +44,7 @@ use Espo\Entities\Email;
use Espo\Entities\Notification;
use Espo\Entities\User;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use RuntimeException;
/**
@@ -125,7 +126,7 @@ class PostUsers implements Action
/** @var iterable<User> $users */
$users = $this->entityManager
->getRDBRepositoryByClass(User::class)
->where(['id' => $foreignIds])
->where([Attribute::ID => $foreignIds])
->find();
if (is_countable($users) && count($users) !== count($foreignIds)) {
application/Espo/Tools/Email/InboxService.php
+3 -2
View File
@@ -47,6 +47,7 @@ use Espo\Entities\Notification;
use Espo\Entities\Team;
use Espo\Entities\User;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Part\Condition;
use Espo\ORM\Query\Part\Expression;
use Espo\ORM\Query\SelectBuilder;
@@ -700,14 +701,14 @@ class InboxService
$users = $this->entityManager
->getRDBRepositoryByClass(User::class)
->select(['id'])
->select([Attribute::ID])
->where([
'type' => [User::TYPE_REGULAR, User::TYPE_ADMIN],
'isActive' => true,
])
->where(
Condition::in(
Expression::column('id'),
Expression::column(Attribute::ID),
SelectBuilder::create()
->from(Team::RELATIONSHIP_TEAM_USER)
->select('userId')
application/Espo/Tools/Email/SendService.php
+3 -2
View File
@@ -65,6 +65,7 @@ use Espo\Modules\Crm\Entities\CaseObj;
use Espo\ORM\Collection;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\UserData as UserDataRepository;
use Espo\Tools\Stream\Service as StreamService;
use Exception;
@@ -675,8 +676,8 @@ class SendService
return $this->entityManager
->getRDBRepositoryByClass(Email::class)
->select(['id', 'groupFolderId', 'messageId'])
->where(['id' => $email->getReplied()->getId()])
->select([Attribute::ID, 'groupFolderId', 'messageId'])
->where([Attribute::ID => $email->getReplied()->getId()])
->findOne();
}
}
application/Espo/Tools/GlobalSearch/Service.php
+4 -3
View File
@@ -36,6 +36,7 @@ use Espo\Core\Utils\Metadata;
use Espo\ORM\Entity;
use Espo\ORM\EntityCollection;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\Select;
use Espo\ORM\Query\Part\Order;
use Espo\ORM\Query\Part\Expression as Expr;
@@ -116,8 +117,8 @@ class Service
while ($row = $sth->fetch()) {
$entity = $this->entityManager
->getRDBRepository($row['entityType'])
->select(['id', 'name'])
->where(['id' => $row['id']])
->select([Attribute::ID, 'name'])
->where([Attribute::ID => $row[Attribute::ID]])
->findOne();
if (!$entity) {
@@ -159,7 +160,7 @@ class Service
'name' : 'id';
$selectList = [
'id',
Attribute::ID,
$nameAttribute,
['VALUE:' . $entityType, 'entityType'],
[(string) $i, 'order'],
application/Espo/Tools/Import/Import.php
+2 -1
View File
@@ -35,6 +35,7 @@ use Espo\Core\FieldValidation\Exceptions\ValidationError;
use Espo\Core\Job\JobSchedulerFactory;
use Espo\Entities\Attachment;
use Espo\Entities\ImportError;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Import\Jobs\RunIdle;
use Espo\ORM\Entity;
use Espo\Core\ORM\Entity as CoreEntity;
@@ -684,7 +685,7 @@ class Import
$found = $this->entityManager
->getRDBRepository($foreignEntityType)
->select(['id', $foreignAttribute])
->select([Attribute::ID, $foreignAttribute])
->where($where)
->findOne();
application/Espo/Tools/Import/Service.php
+5 -4
View File
@@ -30,6 +30,7 @@
namespace Espo\Tools\Import;
use Espo\Core\Name\Field;
use Espo\ORM\Name\Attribute;
use Exception;
use GuzzleHttp\Psr7\Utils as Psr7Utils;
@@ -260,8 +261,8 @@ class Service
$entity = $this->entityManager
->getRDBRepository($entityType)
->select(['id'])
->where(['id' => $entityId])
->select([Attribute::ID])
->where([Attribute::ID => $entityId])
->findOne();
if (!$entity) {
@@ -391,8 +392,8 @@ class Service
$entity = $this->entityManager
->getRDBRepository($entityType)
->select(['id'])
->where(['id' => $entityId])
->select([Attribute::ID])
->where([Attribute::ID => $entityId])
->findOne();
if (!$entity) {
application/Espo/Tools/Kanban/OrdererProcessor.php
+2 -2
View File
@@ -33,7 +33,7 @@ use Espo\Core\Utils\Id\RecordIdGenerator;
use Espo\Entities\KanbanOrder;
use Espo\Core\ORM\EntityManager;
use Espo\Core\Utils\Metadata;
use Espo\ORM\Name\Attribute;
use LogicException;
class OrdererProcessor
@@ -121,7 +121,7 @@ class OrdererProcessor
$first = $this->entityManager
->getRDBRepository(KanbanOrder::ENTITY_TYPE)
->select(['id', 'order'])
->select([Attribute::ID, 'order'])
->where([
'entityType' => $this->entityType,
'userId' => $this->userId,
application/Espo/Tools/Layout/Service.php
+3 -2
View File
@@ -43,6 +43,7 @@ use Espo\Entities\Portal;
use Espo\Entities\Team;
use Espo\Entities\User;
use Espo\Entities\LayoutRecord;
use Espo\ORM\Name\Attribute;
use Espo\Tools\LayoutManager\LayoutManager;
use stdClass;
@@ -341,7 +342,7 @@ class Service
$portal = $this->entityManager
->getRDBRepositoryByClass(Portal::class)
->select(['layoutSetId'])
->where(['id' => $portalId])
->where([Attribute::ID => $portalId])
->findOne();
if (!$portal) {
@@ -364,7 +365,7 @@ class Service
$team = $this->entityManager
->getRDBRepositoryByClass(Team::class)
->select(['layoutSetId'])
->where(['id' => $teamId])
->where([Attribute::ID => $teamId])
->findOne();
if (!$team) {
application/Espo/Tools/Notification/NoteHookProcessor.php
+5 -4
View File
@@ -33,6 +33,7 @@ use Espo\Core\AclManager as InternalAclManager;
use Espo\Core\Acl\Table;
use Espo\Core\Name\Field;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Stream\Service as StreamService;
use Espo\ORM\EntityManager;
@@ -220,7 +221,7 @@ class NoteHookProcessor
$existing = $this->entityManager
->getRDBRepository(Notification::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'type' => Notification::TYPE_NOTE,
'relatedType' => Note::ENTITY_TYPE,
@@ -288,7 +289,7 @@ class NoteHookProcessor
->where([
'isActive' => true,
])
->select('id')
->select(Attribute::ID)
->find();
foreach ($targetUserList as $user) {
@@ -326,7 +327,7 @@ class NoteHookProcessor
->where([
'isActive' => true,
])
->select(['id'])
->select([Attribute::ID])
->find();
foreach ($targetUserList as $user) {
@@ -349,7 +350,7 @@ class NoteHookProcessor
'isActive' => true,
'type' => ['regular', 'admin'],
])
->select('id')
->select(Attribute::ID)
->find();
$notifyUserIdList = [];
application/Espo/Tools/Notification/RecordService.php
+2 -1
View File
@@ -43,6 +43,7 @@ use Espo\Entities\Notification;
use Espo\Entities\User;
use Espo\ORM\EntityCollection;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Stream\NoteAccessControl;
class RecordService
@@ -143,7 +144,7 @@ class RecordService
->update()
->in(Notification::ENTITY_TYPE)
->set(['read' => true])
->where(['id' => $ids])
->where([Attribute::ID => $ids])
->build();
$this->entityManager->getQueryExecutor()->execute($query);
application/Espo/Tools/Notification/Service.php
+6 -5
View File
@@ -43,6 +43,7 @@ use Espo\Core\Utils\DateTime as DateTimeUtil;
use Espo\Modules\Crm\Entities\CaseObj;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
class Service
{
@@ -77,8 +78,8 @@ class Service
if ($note->getRelatedType() === Email::ENTITY_TYPE) {
$related = $this->entityManager
->getRDBRepository(Email::ENTITY_TYPE)
->select(['id', 'sentById', 'createdById'])
->where(['id' => $note->getRelatedId()])
->select([Attribute::ID, 'sentById', 'createdById'])
->where([Attribute::ID => $note->getRelatedId()])
->findOne();
}
@@ -90,10 +91,10 @@ class Service
$userList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id', 'type'])
->select([Attribute::ID, 'type'])
->where([
'isActive' => true,
'id' => $userIdList,
Attribute::ID => $userIdList,
])
->find();
@@ -123,7 +124,7 @@ class Service
$notification = $this->entityManager->getNewEntity(Notification::ENTITY_TYPE);
$notification->set([
'id' => $this->idGenerator->generate(),
Attribute::ID => $this->idGenerator->generate(),
'data' => [
'noteId' => $note->getId(),
],
application/Espo/Tools/Pdf/MassService.php
+2 -1
View File
@@ -46,6 +46,7 @@ use Espo\Core\Utils\Util;
use Espo\Entities\Attachment;
use Espo\Entities\Template as TemplateEntity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Pdf\Data\DataLoaderManager;
use Espo\Tools\Pdf\Jobs\RemoveMassFile;
@@ -146,7 +147,7 @@ class MassService
->getRDBRepository($entityType)
->clone($selectBuilder->build())
->where([
'id' => $idList,
Attribute::ID => $idList,
])
->find();
application/Espo/Tools/Stars/StarService.php
+2 -1
View File
@@ -39,6 +39,7 @@ use Espo\Entities\StarSubscription;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use PDOException;
class StarService
@@ -53,7 +54,7 @@ class StarService
{
return (bool) $this->entityManager
->getRDBRepository(StarSubscription::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'userId' => $user->getId(),
'entityType' => $entity->getEntityType(),
application/Espo/Tools/Stream/Jobs/ControlFollowers.php
+2 -1
View File
@@ -37,6 +37,7 @@ use Espo\Core\Acl\Exceptions\NotImplemented as AclNotImplemented;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\Tools\Stream\Service as Service;
use Espo\Entities\User;
@@ -71,7 +72,7 @@ class ControlFollowers implements Job
$userList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->where(['id' => $idList])
->where([Attribute::ID => $idList])
->find();
foreach ($userList as $user) {
application/Espo/Tools/Stream/RecordService/NoteHelper.php
+3 -2
View File
@@ -33,6 +33,7 @@ use Espo\Core\ORM\Type\FieldType;
use Espo\Core\Utils\FieldUtil;
use Espo\Entities\Note;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use stdClass;
class NoteHelper
@@ -124,8 +125,8 @@ class NoteHelper
$collection = $this->entityManager
->getRDBRepository($foreignEntityType)
->select(['id', 'name'])
->where(['id' => $ids])
->select([Attribute::ID, 'name'])
->where([Attribute::ID => $ids])
->find();
foreach ($collection as $entity) {
application/Espo/Tools/Stream/Service.php
+14 -13
View File
@@ -36,6 +36,7 @@ use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\ORM\Type\FieldType;
use Espo\Entities\StreamSubscription;
use Espo\Modules\Crm\Entities\Account;
use Espo\ORM\Name\Attribute;
use Espo\Repositories\EmailAddress as EmailAddressRepository;
use Espo\ORM\Query\Part\Expression as Expr;
@@ -170,7 +171,7 @@ class Service
return (bool) $this->entityManager
->getRDBRepository(StreamSubscription::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'userId' => $userId,
'entityType' => $entity->getEntityType(),
@@ -207,12 +208,12 @@ class Service
$user = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select([
'id',
Attribute::ID,
'type',
'isActive',
])
->where([
'id' => $userId,
Attribute::ID => $userId,
'isActive' => true,
])
->findOne();
@@ -284,7 +285,7 @@ class Service
$user = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->where([
'id' => $userId,
Attribute::ID => $userId,
'isActive' => true,
])
->findOne();
@@ -362,7 +363,7 @@ class Service
->getRDBRepositoryByClass(User::class)
->select(['name'])
->where([
'id' => $entity->get('assignedUserId'),
Attribute::ID => $entity->get('assignedUserId'),
])
->findOne();
@@ -624,7 +625,7 @@ class Service
$data['assignedUsers'] = array_map(function ($it) {
return [
'id' => $it->getId(),
Attribute::ID => $it->getId(),
'name' => $it->getName(),
];
}, $users->getList());
@@ -719,7 +720,7 @@ class Service
$existing = $this->entityManager
->getRDBRepository(Note::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'type' => Note::TYPE_RELATE,
'parentId' => $parentId,
@@ -759,7 +760,7 @@ class Service
$existing = $this->entityManager
->getRDBRepository(Note::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->where([
'type' => Note::TYPE_UNRELATE,
'parentId' => $parentId,
@@ -1006,7 +1007,7 @@ class Service
{
$userList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id'])
->select([Attribute::ID])
->join(
StreamSubscription::ENTITY_TYPE,
'subscription',
@@ -1045,7 +1046,7 @@ class Service
if (!$searchParams->getOrderBy()) {
$builder->order([]);
$builder->order(
Order::createByPositionInList(Expr::column('id'), [$this->user->getId()])
Order::createByPositionInList(Expr::column(Attribute::ID), [$this->user->getId()])
);
$builder->order('name');
}
@@ -1097,7 +1098,7 @@ class Service
$userList = $this->entityManager
->getRDBRepository(User::ENTITY_TYPE)
->select(['id', 'name'])
->select([Attribute::ID, 'name'])
->join(
StreamSubscription::ENTITY_TYPE,
'subscription',
@@ -1112,7 +1113,7 @@ class Service
'isActive' => true,
])
->order(
Order::createByPositionInList(Expr::column('id'), [$this->user->getId()])
Order::createByPositionInList(Expr::column(Attribute::ID), [$this->user->getId()])
)
->order('name')
->find();
@@ -1179,7 +1180,7 @@ class Service
'isActive' => true,
'id=s' => $subQuery,
])
->select(['id', 'type'])
->select([Attribute::ID, 'type'])
->find();
}
application/Espo/Tools/UserReaction/ReactionStreamService.php
+2 -1
View File
@@ -40,6 +40,7 @@ use Espo\Entities\Note;
use Espo\Entities\User;
use Espo\Entities\UserReaction;
use Espo\ORM\EntityManager;
use Espo\ORM\Name\Attribute;
use Espo\ORM\Query\SelectBuilder;
use Espo\Tools\Stream\UserRecordService;
use stdClass;
@@ -102,7 +103,7 @@ class ReactionStreamService
}
$searchParams = SearchParams::create()
->withSelect(['id', 'reactionCounts', 'myReactions'])
->withSelect([Attribute::ID, 'reactionCounts', 'myReactions'])
->withWhereAdded(
Item::createBuilder()
->setType(Item\Type::IN)