From 6d1c4d2aa83b4ff2385dcf404da82c4c4e4fb9c8 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 11 Nov 2024 17:41:22 +0200 Subject: [PATCH] const ID usage --- .../WorkingTimeRange/AssignmentChecker.php | 3 ++- .../Classes/AssignmentNotificators/Email.php | 3 ++- .../FieldConverters/RelationshipRole.php | 5 ++-- .../Email/FolderDataLoader.php | 5 ++-- .../FieldProcessing/Email/IcsDataLoader.php | 9 ++++--- .../Email/StringDataLoader.php | 3 ++- .../FieldProcessing/User/LastAccessLoader.php | 5 ++-- application/Espo/Classes/Jobs/Cleanup.php | 9 ++++--- .../Classes/MassAction/Email/MoveToFolder.php | 5 ++-- .../Classes/MassAction/User/MassDelete.php | 3 ++- .../Classes/MassAction/User/MassUpdate.php | 3 ++- .../RecordHooks/Note/AssignmentCheck.php | 5 ++-- .../Email/AccessControlFilters/OnlyTeam.php | 5 ++-- .../Espo/Classes/Select/Email/TextFilter.php | 3 ++- .../ItemConverters/EmailAddressEquals.php | 5 ++-- .../Email/Where/ItemConverters/InFolder.php | 3 ++- .../Email/Where/ItemConverters/ToEquals.php | 5 ++-- .../AccessControlFilters/OnlyOwn.php | 3 ++- .../Select/EmailFilter/BoolFilters/OnlyMy.php | 3 ++- .../Select/User/BoolFilters/OnlyMe.php | 3 ++- .../Select/User/BoolFilters/OnlyMyTeam.php | 5 ++-- .../User/Where/ItemConverters/IsOfType.php | 3 ++- .../Hook/Hooks/FailedAttemptsLimit.php | 3 ++- .../Hook/Hooks/FailedCodeAttemptsLimit.php | 3 ++- .../Core/Console/Commands/AuthTokenCheck.php | 2 +- .../Espo/Core/Console/Commands/Extension.php | 3 ++- application/Espo/Core/Duplicate/Finder.php | 11 ++++---- .../Core/ExternalAccount/ClientManager.php | 5 ++-- .../Core/FieldProcessing/Relation/Saver.php | 7 ++--- .../Functions/EntityGroup/SumRelatedType.php | 3 ++- .../Functions/RecordGroup/FindManyType.php | 3 ++- .../RecordGroup/FindRelatedManyType.php | 3 ++- .../RecordGroup/FindRelatedOneType.php | 5 ++-- .../Core/Rebuild/Actions/AddSystemUser.php | 2 +- .../Filters/PortalOnlyContact.php | 2 +- .../Espo/Core/Select/Bool/Filters/Shared.php | 5 ++-- .../Select/Helpers/RelationQueryHelper.php | 5 ++-- .../Espo/Core/Select/Text/DefaultFilter.php | 3 ++- .../Espo/Core/Select/Where/Converter.php | 5 ++-- .../Upgrades/Actions/Extension/Install.php | 7 ++--- .../Core/Utils/Database/Orm/Converter.php | 4 +-- .../Database/Orm/LinkConverters/HasOne.php | 3 ++- application/Espo/Core/Utils/ScheduledJob.php | 5 ++-- application/Espo/Core/Webhook/Manager.php | 3 ++- application/Espo/Entities/Note.php | 5 ++-- .../Classes/Acl/Meeting/AssignmentChecker.php | 3 ++- .../Call/PhoneNumberMapLoader.php | 7 ++--- .../RecordHooks/TargetList/AfterCreate.php | 7 ++--- .../PortalOnlyAccount.php | 5 ++-- .../PortalOnlyContact.php | 6 ++--- .../Meeting/AccessControlFilters/OnlyOwn.php | 5 ++-- .../Meeting/AccessControlFilters/OnlyTeam.php | 5 ++-- .../Modules/Crm/Hooks/CaseObj/Contacts.php | 5 ++-- .../Modules/Crm/Hooks/Meeting/ParentLink.php | 7 ++--- .../Modules/Crm/Hooks/Task/ParentLink.php | 11 ++++---- .../Activities/PopupNotificationsProvider.php | 3 ++- .../Modules/Crm/Tools/Calendar/Service.php | 5 ++-- .../Modules/Crm/Tools/Lead/ConvertService.php | 9 ++++--- .../Crm/Tools/MassEmail/QueueCreator.php | 5 ++-- .../Modules/Crm/Tools/Meeting/Service.php | 3 ++- .../Crm/Tools/Opportunity/Report/Util.php | 3 ++- application/Espo/Repositories/ArrayValue.php | 5 ++-- .../Espo/Repositories/EmailAddress.php | 7 ++--- application/Espo/Repositories/Preferences.php | 9 ++++--- application/Espo/Services/RecordTree.php | 5 ++-- application/Espo/Services/User.php | 3 ++- .../Jobs/CheckNewExtensionVersion.php | 3 ++- application/Espo/Tools/App/AppService.php | 3 ++- .../Espo/Tools/Email/Api/PostUsers.php | 3 ++- application/Espo/Tools/Email/InboxService.php | 5 ++-- application/Espo/Tools/Email/SendService.php | 5 ++-- .../Espo/Tools/GlobalSearch/Service.php | 7 ++--- application/Espo/Tools/Import/Import.php | 3 ++- application/Espo/Tools/Import/Service.php | 9 ++++--- .../Espo/Tools/Kanban/OrdererProcessor.php | 4 +-- application/Espo/Tools/Layout/Service.php | 5 ++-- .../Tools/Notification/NoteHookProcessor.php | 9 ++++--- .../Espo/Tools/Notification/RecordService.php | 3 ++- .../Espo/Tools/Notification/Service.php | 11 ++++---- application/Espo/Tools/Pdf/MassService.php | 3 ++- application/Espo/Tools/Stars/StarService.php | 3 ++- .../Tools/Stream/Jobs/ControlFollowers.php | 3 ++- .../Tools/Stream/RecordService/NoteHelper.php | 5 ++-- application/Espo/Tools/Stream/Service.php | 27 ++++++++++--------- .../UserReaction/ReactionStreamService.php | 3 ++- 85 files changed, 252 insertions(+), 173 deletions(-) diff --git a/application/Espo/Classes/Acl/WorkingTimeRange/AssignmentChecker.php b/application/Espo/Classes/Acl/WorkingTimeRange/AssignmentChecker.php index 450fdc1dc4..5a105b1ed9 100644 --- a/application/Espo/Classes/Acl/WorkingTimeRange/AssignmentChecker.php +++ b/application/Espo/Classes/Acl/WorkingTimeRange/AssignmentChecker.php @@ -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 @@ -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) { diff --git a/application/Espo/Classes/AssignmentNotificators/Email.php b/application/Espo/Classes/AssignmentNotificators/Email.php index a668760feb..347b95f187 100644 --- a/application/Espo/Classes/AssignmentNotificators/Email.php +++ b/application/Espo/Classes/AssignmentNotificators/Email.php @@ -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) { diff --git a/application/Espo/Classes/FieldConverters/RelationshipRole.php b/application/Espo/Classes/FieldConverters/RelationshipRole.php index a26a819eed..d1832137a6 100644 --- a/application/Espo/Classes/FieldConverters/RelationshipRole.php +++ b/application/Espo/Classes/FieldConverters/RelationshipRole.php @@ -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, diff --git a/application/Espo/Classes/FieldProcessing/Email/FolderDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/FolderDataLoader.php index 7113388e98..1de63eec9b 100644 --- a/application/Espo/Classes/FieldProcessing/Email/FolderDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/FolderDataLoader.php @@ -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 @@ -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) { diff --git a/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php index 3180273b7c..7dd288a750 100644 --- a/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php @@ -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) { diff --git a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php index 26cf67f576..eca6c474f2 100644 --- a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php @@ -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) { diff --git a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php index 521ea83cc2..7fda7040af 100644 --- a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php +++ b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php @@ -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(); diff --git a/application/Espo/Classes/Jobs/Cleanup.php b/application/Espo/Classes/Jobs/Cleanup.php index 29bbdf6bfa..5243e1a178 100644 --- a/application/Espo/Classes/Jobs/Cleanup.php +++ b/application/Espo/Classes/Jobs/Cleanup.php @@ -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 $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 $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(); diff --git a/application/Espo/Classes/MassAction/Email/MoveToFolder.php b/application/Espo/Classes/MassAction/Email/MoveToFolder.php index 7b960e8c8b..7150f7f1a7 100644 --- a/application/Espo/Classes/MassAction/Email/MoveToFolder.php +++ b/application/Espo/Classes/MassAction/Email/MoveToFolder.php @@ -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; diff --git a/application/Espo/Classes/MassAction/User/MassDelete.php b/application/Espo/Classes/MassAction/User/MassDelete.php index 9ea10b30fe..1aa0cd860a 100644 --- a/application/Espo/Classes/MassAction/User/MassDelete.php +++ b/application/Espo/Classes/MassAction/User/MassDelete.php @@ -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) { diff --git a/application/Espo/Classes/MassAction/User/MassUpdate.php b/application/Espo/Classes/MassAction/User/MassUpdate.php index 7777b073d3..64c6d368db 100644 --- a/application/Espo/Classes/MassAction/User/MassUpdate.php +++ b/application/Espo/Classes/MassAction/User/MassUpdate.php @@ -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) { diff --git a/application/Espo/Classes/RecordHooks/Note/AssignmentCheck.php b/application/Espo/Classes/RecordHooks/Note/AssignmentCheck.php index 10015387b8..fd9e85b07f 100644 --- a/application/Espo/Classes/RecordHooks/Note/AssignmentCheck.php +++ b/application/Espo/Classes/RecordHooks/Note/AssignmentCheck.php @@ -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 $targetUserList */ $targetUserList = $this->entityManager ->getRDBRepository(User::ENTITY_TYPE) - ->select(['id', 'type']) - ->where(['id' => $userIdList]) + ->select([Attribute::ID, 'type']) + ->where([Attribute::ID => $userIdList]) ->find(); } diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php index e01418fd54..99ed5c01f6 100644 --- a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php +++ b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php @@ -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 ) ); diff --git a/application/Espo/Classes/Select/Email/TextFilter.php b/application/Espo/Classes/Select/Email/TextFilter.php index 1c71dff2ee..f067688bd2 100644 --- a/application/Espo/Classes/Select/Email/TextFilter.php +++ b/application/Espo/Classes/Select/Email/TextFilter.php @@ -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(); diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php index d3659534ea..09d4ffefe3 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php @@ -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( diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php index 91a5ecd135..1f0d19cbbd 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php @@ -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 = []; diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php index 454af3fe1e..c6106930c9 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php @@ -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( diff --git a/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php index a1e6b11625..89ae8df13d 100644 --- a/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php +++ b/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php @@ -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(), ]) diff --git a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php index f36b5396f6..5711c62695 100644 --- a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php @@ -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(), ]) diff --git a/application/Espo/Classes/Select/User/BoolFilters/OnlyMe.php b/application/Espo/Classes/Select/User/BoolFilters/OnlyMe.php index db1202c02f..274cac1196 100644 --- a/application/Espo/Classes/Select/User/BoolFilters/OnlyMe.php +++ b/application/Espo/Classes/Select/User/BoolFilters/OnlyMe.php @@ -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()]); } } diff --git a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php index ab114762cd..a9aaa8de8e 100644 --- a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php +++ b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php @@ -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') diff --git a/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php b/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php index f77e2fa2f9..deaf8648df 100644 --- a/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php +++ b/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php @@ -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]), }; } } diff --git a/application/Espo/Core/Authentication/Hook/Hooks/FailedAttemptsLimit.php b/application/Espo/Core/Authentication/Hook/Hooks/FailedAttemptsLimit.php index faf9c6147b..10f16f22c1 100644 --- a/application/Espo/Core/Authentication/Hook/Hooks/FailedAttemptsLimit.php +++ b/application/Espo/Core/Authentication/Hook/Hooks/FailedAttemptsLimit.php @@ -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(); diff --git a/application/Espo/Core/Authentication/Hook/Hooks/FailedCodeAttemptsLimit.php b/application/Espo/Core/Authentication/Hook/Hooks/FailedCodeAttemptsLimit.php index 68d6935ab1..fab4f93981 100644 --- a/application/Espo/Core/Authentication/Hook/Hooks/FailedCodeAttemptsLimit.php +++ b/application/Espo/Core/Authentication/Hook/Hooks/FailedCodeAttemptsLimit.php @@ -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(); diff --git a/application/Espo/Core/Console/Commands/AuthTokenCheck.php b/application/Espo/Core/Console/Commands/AuthTokenCheck.php index 3ddd462dbc..e990375d11 100644 --- a/application/Espo/Core/Console/Commands/AuthTokenCheck.php +++ b/application/Espo/Core/Console/Commands/AuthTokenCheck.php @@ -73,7 +73,7 @@ class AuthTokenCheck implements Command ->getRDBRepository(User::ENTITY_TYPE) ->select(Attribute::ID) ->where([ - 'id' => $userId, + Attribute::ID => $userId, 'isActive' => true, ]) ->findOne(); diff --git a/application/Espo/Core/Console/Commands/Extension.php b/application/Espo/Core/Console/Commands/Extension.php index 77ff8636a3..ded21e1f23 100644 --- a/application/Espo/Core/Console/Commands/Extension.php +++ b/application/Espo/Core/Console/Commands/Extension.php @@ -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(); diff --git a/application/Espo/Core/Duplicate/Finder.php b/application/Espo/Core/Duplicate/Finder.php index 3bd441970b..2a390ddbe5 100644 --- a/application/Espo/Core/Duplicate/Finder.php +++ b/application/Espo/Core/Duplicate/Finder.php @@ -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(); } diff --git a/application/Espo/Core/ExternalAccount/ClientManager.php b/application/Espo/Core/ExternalAccount/ClientManager.php index 94b329f352..94409d52d6 100644 --- a/application/Espo/Core/ExternalAccount/ClientManager.php +++ b/application/Espo/Core/ExternalAccount/ClientManager.php @@ -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) { diff --git a/application/Espo/Core/FieldProcessing/Relation/Saver.php b/application/Espo/Core/FieldProcessing/Relation/Saver.php index 9505b026a5..43ad46f98f 100644 --- a/application/Espo/Core/FieldProcessing/Relation/Saver.php +++ b/application/Espo/Core/FieldProcessing/Relation/Saver.php @@ -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(); diff --git a/application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php b/application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php index b03347ef3b..6d6f966aea 100644 --- a/application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php +++ b/application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php @@ -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(), diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php index b7a9eba11b..5b84c0e036 100644 --- a/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php +++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php @@ -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 diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php index 53608fdede..23642677c5 100644 --- a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php +++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php @@ -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 = []; diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php index b3f0065527..6bccdd50ae 100644 --- a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php +++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php @@ -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) { diff --git a/application/Espo/Core/Rebuild/Actions/AddSystemUser.php b/application/Espo/Core/Rebuild/Actions/AddSystemUser.php index 26d354acc5..e49ff6de83 100644 --- a/application/Espo/Core/Rebuild/Actions/AddSystemUser.php +++ b/application/Espo/Core/Rebuild/Actions/AddSystemUser.php @@ -64,7 +64,7 @@ class AddSystemUser implements RebuildAction ->getQueryBuilder() ->delete() ->from(User::ENTITY_TYPE) - ->where(['id' => $user->getId()]) + ->where([Attribute::ID => $user->getId()]) ->build() ); } diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php index afc0254f04..45ddba180e 100644 --- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php +++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php @@ -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()) diff --git a/application/Espo/Core/Select/Bool/Filters/Shared.php b/application/Espo/Core/Select/Bool/Filters/Shared.php index 0ed42cc7c0..4a1eb94a03 100644 --- a/application/Espo/Core/Select/Bool/Filters/Shared.php +++ b/application/Espo/Core/Select/Bool/Filters/Shared.php @@ -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()]) diff --git a/application/Espo/Core/Select/Helpers/RelationQueryHelper.php b/application/Espo/Core/Select/Helpers/RelationQueryHelper.php index be67e2886a..ca2b87ee47 100644 --- a/application/Espo/Core/Select/Helpers/RelationQueryHelper.php +++ b/application/Espo/Core/Select/Helpers/RelationQueryHelper.php @@ -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]) diff --git a/application/Espo/Core/Select/Text/DefaultFilter.php b/application/Espo/Core/Select/Text/DefaultFilter.php index 2e80485ca6..00b05ee9f1 100644 --- a/application/Espo/Core/Select/Text/DefaultFilter.php +++ b/application/Espo/Core/Select/Text/DefaultFilter.php @@ -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; } diff --git a/application/Espo/Core/Select/Where/Converter.php b/application/Espo/Core/Select/Where/Converter.php index 6b94015e26..645ad67207 100644 --- a/application/Espo/Core/Select/Where/Converter.php +++ b/application/Espo/Core/Select/Where/Converter.php @@ -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() ); } diff --git a/application/Espo/Core/Upgrades/Actions/Extension/Install.php b/application/Espo/Core/Upgrades/Actions/Extension/Install.php index 22222e0259..ac3d4c9d83 100644 --- a/application/Espo/Core/Upgrades/Actions/Extension/Install.php +++ b/application/Espo/Core/Upgrades/Actions/Extension/Install.php @@ -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(), ]); } diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php index e89de5f8fc..0f8707d323 100644 --- a/application/Espo/Core/Utils/Database/Orm/Converter.php +++ b/application/Espo/Core/Utils/Database/Orm/Converter.php @@ -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, ], ], diff --git a/application/Espo/Core/Utils/Database/Orm/LinkConverters/HasOne.php b/application/Espo/Core/Utils/Database/Orm/LinkConverters/HasOne.php index f55063d2ef..252589fb95 100644 --- a/application/Espo/Core/Utils/Database/Orm/LinkConverters/HasOne.php +++ b/application/Espo/Core/Utils/Database/Orm/LinkConverters/HasOne.php @@ -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 ? ( diff --git a/application/Espo/Core/Utils/ScheduledJob.php b/application/Espo/Core/Utils/ScheduledJob.php index a62e6483cf..beb69b7d90 100644 --- a/application/Espo/Core/Utils/ScheduledJob.php +++ b/application/Espo/Core/Utils/ScheduledJob.php @@ -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' => [ diff --git a/application/Espo/Core/Webhook/Manager.php b/application/Espo/Core/Webhook/Manager.php index 08078c419a..c2e50227e5 100644 --- a/application/Espo/Core/Webhook/Manager.php +++ b/application/Espo/Core/Webhook/Manager.php @@ -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, diff --git a/application/Espo/Entities/Note.php b/application/Espo/Entities/Note.php index b7eef4d279..6bd442fefa 100644 --- a/application/Espo/Entities/Note.php +++ b/application/Espo/Entities/Note.php @@ -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(); diff --git a/application/Espo/Modules/Crm/Classes/Acl/Meeting/AssignmentChecker.php b/application/Espo/Modules/Crm/Classes/Acl/Meeting/AssignmentChecker.php index 31daa23081..64e69b9983 100644 --- a/application/Espo/Modules/Crm/Classes/Acl/Meeting/AssignmentChecker.php +++ b/application/Espo/Modules/Crm/Classes/Acl/Meeting/AssignmentChecker.php @@ -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 @@ -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) { diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php index 3dd818d963..55023e5ff9 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php @@ -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; } diff --git a/application/Espo/Modules/Crm/Classes/RecordHooks/TargetList/AfterCreate.php b/application/Espo/Modules/Crm/Classes/RecordHooks/TargetList/AfterCreate.php index 0c7a44907f..15c1e0a6dd 100644 --- a/application/Espo/Modules/Crm/Classes/RecordHooks/TargetList/AfterCreate.php +++ b/application/Espo/Modules/Crm/Classes/RecordHooks/TargetList/AfterCreate.php @@ -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 @@ -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 $logRecords */ $logRecords = $this->entityManager diff --git a/application/Espo/Modules/Crm/Classes/Select/Account/AccessControlFilters/PortalOnlyAccount.php b/application/Espo/Modules/Crm/Classes/Select/Account/AccessControlFilters/PortalOnlyAccount.php index c56e4321ed..dc51a8d661 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Account/AccessControlFilters/PortalOnlyAccount.php +++ b/application/Espo/Modules/Crm/Classes/Select/Account/AccessControlFilters/PortalOnlyAccount.php @@ -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]); } } diff --git a/application/Espo/Modules/Crm/Classes/Select/Contact/AccessControlFilters/PortalOnlyContact.php b/application/Espo/Modules/Crm/Classes/Select/Contact/AccessControlFilters/PortalOnlyContact.php index 21ecfa492f..15eca3e85f 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Contact/AccessControlFilters/PortalOnlyContact.php +++ b/application/Espo/Modules/Crm/Classes/Select/Contact/AccessControlFilters/PortalOnlyContact.php @@ -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]); } } diff --git a/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyOwn.php b/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyOwn.php index 0aa7bce71c..7de86036c3 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyOwn.php +++ b/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyOwn.php @@ -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', diff --git a/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyTeam.php b/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyTeam.php index c5f30c7441..e4a55e75d9 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyTeam.php +++ b/application/Espo/Modules/Crm/Classes/Select/Meeting/AccessControlFilters/OnlyTeam.php @@ -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', diff --git a/application/Espo/Modules/Crm/Hooks/CaseObj/Contacts.php b/application/Espo/Modules/Crm/Hooks/CaseObj/Contacts.php index b8777653a5..39a8fb27b4 100644 --- a/application/Espo/Modules/Crm/Hooks/CaseObj/Contacts.php +++ b/application/Espo/Modules/Crm/Hooks/CaseObj/Contacts.php @@ -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, diff --git a/application/Espo/Modules/Crm/Hooks/Meeting/ParentLink.php b/application/Espo/Modules/Crm/Hooks/Meeting/ParentLink.php index 39aee26ed1..fdad9f437f 100644 --- a/application/Espo/Modules/Crm/Hooks/Meeting/ParentLink.php +++ b/application/Espo/Modules/Crm/Hooks/Meeting/ParentLink.php @@ -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) { diff --git a/application/Espo/Modules/Crm/Hooks/Task/ParentLink.php b/application/Espo/Modules/Crm/Hooks/Task/ParentLink.php index be27f9f8ec..a66d93f1ac 100644 --- a/application/Espo/Modules/Crm/Hooks/Task/ParentLink.php +++ b/application/Espo/Modules/Crm/Hooks/Task/ParentLink.php @@ -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) { diff --git a/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php b/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php index 66e01e41cc..eacbb8bbe9 100644 --- a/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php +++ b/application/Espo/Modules/Crm/Tools/Activities/PopupNotificationsProvider.php @@ -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); diff --git a/application/Espo/Modules/Crm/Tools/Calendar/Service.php b/application/Espo/Modules/Crm/Tools/Calendar/Service.php index c92b994913..864bb851d4 100644 --- a/application/Espo/Modules/Crm/Tools/Calendar/Service.php +++ b/application/Espo/Modules/Crm/Tools/Calendar/Service.php @@ -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() ); diff --git a/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php b/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php index 714a2bf011..1fe023c3e6 100644 --- a/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php +++ b/application/Espo/Modules/Crm/Tools/Lead/ConvertService.php @@ -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 $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 $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 $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 $documents */ $documents = $leadRepository ->getRelation($lead, 'documents') - ->select(['id']) + ->select([Attribute::ID]) ->find(); foreach ($documents as $document) { diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php b/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php index 252220cb16..630515b7b0 100644 --- a/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php +++ b/application/Espo/Modules/Crm/Tools/MassEmail/QueueCreator.php @@ -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(); diff --git a/application/Espo/Modules/Crm/Tools/Meeting/Service.php b/application/Espo/Modules/Crm/Tools/Meeting/Service.php index 1f05d32a31..abad4978b3 100644 --- a/application/Espo/Modules/Crm/Tools/Meeting/Service.php +++ b/application/Espo/Modules/Crm/Tools/Meeting/Service.php @@ -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(); diff --git a/application/Espo/Modules/Crm/Tools/Opportunity/Report/Util.php b/application/Espo/Modules/Crm/Tools/Opportunity/Report/Util.php index c970640971..98e974266a 100644 --- a/application/Espo/Modules/Crm/Tools/Opportunity/Report/Util.php +++ b/application/Espo/Modules/Crm/Tools/Opportunity/Report/Util.php @@ -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(); diff --git a/application/Espo/Repositories/ArrayValue.php b/application/Espo/Repositories/ArrayValue.php index 15e9d08913..1e5d2a20c9 100644 --- a/application/Espo/Repositories/ArrayValue.php +++ b/application/Espo/Repositories/ArrayValue.php @@ -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(), diff --git a/application/Espo/Repositories/EmailAddress.php b/application/Espo/Repositories/EmailAddress.php index 17bce62016..6415feae76 100644 --- a/application/Espo/Repositories/EmailAddress.php +++ b/application/Espo/Repositories/EmailAddress.php @@ -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); diff --git a/application/Espo/Repositories/Preferences.php b/application/Espo/Repositories/Preferences.php index 603cc79e5d..1667f1f595 100644 --- a/application/Espo/Repositories/Preferences.php +++ b/application/Espo/Repositories/Preferences.php @@ -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([ diff --git a/application/Espo/Services/RecordTree.php b/application/Espo/Services/RecordTree.php index 1d4bbc62de..baad3efddf 100644 --- a/application/Espo/Services/RecordTree.php +++ b/application/Espo/Services/RecordTree.php @@ -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) { diff --git a/application/Espo/Services/User.php b/application/Espo/Services/User.php index 6eda25cfe5..4378ba7193 100644 --- a/application/Espo/Services/User.php +++ b/application/Espo/Services/User.php @@ -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) { diff --git a/application/Espo/Tools/AdminNotifications/Jobs/CheckNewExtensionVersion.php b/application/Espo/Tools/AdminNotifications/Jobs/CheckNewExtensionVersion.php index b644e542d8..9cf899be79 100644 --- a/application/Espo/Tools/AdminNotifications/Jobs/CheckNewExtensionVersion.php +++ b/application/Espo/Tools/AdminNotifications/Jobs/CheckNewExtensionVersion.php @@ -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, diff --git a/application/Espo/Tools/App/AppService.php b/application/Espo/Tools/App/AppService.php index b38e583e0f..91e2967544 100644 --- a/application/Espo/Tools/App/AppService.php +++ b/application/Espo/Tools/App/AppService.php @@ -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, diff --git a/application/Espo/Tools/Email/Api/PostUsers.php b/application/Espo/Tools/Email/Api/PostUsers.php index 8c2eecf553..a92f95a8f7 100644 --- a/application/Espo/Tools/Email/Api/PostUsers.php +++ b/application/Espo/Tools/Email/Api/PostUsers.php @@ -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 $users */ $users = $this->entityManager ->getRDBRepositoryByClass(User::class) - ->where(['id' => $foreignIds]) + ->where([Attribute::ID => $foreignIds]) ->find(); if (is_countable($users) && count($users) !== count($foreignIds)) { diff --git a/application/Espo/Tools/Email/InboxService.php b/application/Espo/Tools/Email/InboxService.php index f6dc565cae..27f33eced1 100644 --- a/application/Espo/Tools/Email/InboxService.php +++ b/application/Espo/Tools/Email/InboxService.php @@ -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') diff --git a/application/Espo/Tools/Email/SendService.php b/application/Espo/Tools/Email/SendService.php index e9dd388504..8ecf286902 100644 --- a/application/Espo/Tools/Email/SendService.php +++ b/application/Espo/Tools/Email/SendService.php @@ -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(); } } diff --git a/application/Espo/Tools/GlobalSearch/Service.php b/application/Espo/Tools/GlobalSearch/Service.php index c1d1ff06ee..90e6af6caa 100644 --- a/application/Espo/Tools/GlobalSearch/Service.php +++ b/application/Espo/Tools/GlobalSearch/Service.php @@ -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'], diff --git a/application/Espo/Tools/Import/Import.php b/application/Espo/Tools/Import/Import.php index 98656ae2e1..047e496a1d 100644 --- a/application/Espo/Tools/Import/Import.php +++ b/application/Espo/Tools/Import/Import.php @@ -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(); diff --git a/application/Espo/Tools/Import/Service.php b/application/Espo/Tools/Import/Service.php index 84a212f18d..1d8a4d2cf7 100644 --- a/application/Espo/Tools/Import/Service.php +++ b/application/Espo/Tools/Import/Service.php @@ -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) { diff --git a/application/Espo/Tools/Kanban/OrdererProcessor.php b/application/Espo/Tools/Kanban/OrdererProcessor.php index 17bbe21db7..3ff3bf5ba0 100644 --- a/application/Espo/Tools/Kanban/OrdererProcessor.php +++ b/application/Espo/Tools/Kanban/OrdererProcessor.php @@ -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, diff --git a/application/Espo/Tools/Layout/Service.php b/application/Espo/Tools/Layout/Service.php index 20c3dada3a..0a78f828c9 100644 --- a/application/Espo/Tools/Layout/Service.php +++ b/application/Espo/Tools/Layout/Service.php @@ -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) { diff --git a/application/Espo/Tools/Notification/NoteHookProcessor.php b/application/Espo/Tools/Notification/NoteHookProcessor.php index 2ca600adcb..f63de15d0b 100644 --- a/application/Espo/Tools/Notification/NoteHookProcessor.php +++ b/application/Espo/Tools/Notification/NoteHookProcessor.php @@ -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 = []; diff --git a/application/Espo/Tools/Notification/RecordService.php b/application/Espo/Tools/Notification/RecordService.php index ce95c42f5e..893c765ac0 100644 --- a/application/Espo/Tools/Notification/RecordService.php +++ b/application/Espo/Tools/Notification/RecordService.php @@ -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); diff --git a/application/Espo/Tools/Notification/Service.php b/application/Espo/Tools/Notification/Service.php index b047cc4923..ef9367924c 100644 --- a/application/Espo/Tools/Notification/Service.php +++ b/application/Espo/Tools/Notification/Service.php @@ -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(), ], diff --git a/application/Espo/Tools/Pdf/MassService.php b/application/Espo/Tools/Pdf/MassService.php index a0339ab64c..0987120b90 100644 --- a/application/Espo/Tools/Pdf/MassService.php +++ b/application/Espo/Tools/Pdf/MassService.php @@ -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(); diff --git a/application/Espo/Tools/Stars/StarService.php b/application/Espo/Tools/Stars/StarService.php index cf5b7eb379..1fd4158e81 100644 --- a/application/Espo/Tools/Stars/StarService.php +++ b/application/Espo/Tools/Stars/StarService.php @@ -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(), diff --git a/application/Espo/Tools/Stream/Jobs/ControlFollowers.php b/application/Espo/Tools/Stream/Jobs/ControlFollowers.php index c01ecc5eac..320c96c6a2 100644 --- a/application/Espo/Tools/Stream/Jobs/ControlFollowers.php +++ b/application/Espo/Tools/Stream/Jobs/ControlFollowers.php @@ -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) { diff --git a/application/Espo/Tools/Stream/RecordService/NoteHelper.php b/application/Espo/Tools/Stream/RecordService/NoteHelper.php index 59b7c9d81c..4dee89e589 100644 --- a/application/Espo/Tools/Stream/RecordService/NoteHelper.php +++ b/application/Espo/Tools/Stream/RecordService/NoteHelper.php @@ -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) { diff --git a/application/Espo/Tools/Stream/Service.php b/application/Espo/Tools/Stream/Service.php index 0152e8359d..f78b9ee7fc 100644 --- a/application/Espo/Tools/Stream/Service.php +++ b/application/Espo/Tools/Stream/Service.php @@ -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(); } diff --git a/application/Espo/Tools/UserReaction/ReactionStreamService.php b/application/Espo/Tools/UserReaction/ReactionStreamService.php index d17e396832..fab24b4b27 100644 --- a/application/Espo/Tools/UserReaction/ReactionStreamService.php +++ b/application/Espo/Tools/UserReaction/ReactionStreamService.php @@ -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)