From 29bee428ed75e4053c86b77a869f51ddd69b126c Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 11 Nov 2024 16:14:06 +0200 Subject: [PATCH] field const usage --- .../Classes/DefaultLayouts/DefaultSidePanelType.php | 4 ++-- .../Espo/Classes/JobPreparators/CheckEmailAccounts.php | 3 ++- application/Espo/Entities/Attachment.php | 2 +- application/Espo/Entities/Email.php | 10 +++++----- application/Espo/Entities/EmailAccount.php | 3 ++- application/Espo/Entities/Export.php | 2 +- application/Espo/Entities/Note.php | 10 +++++----- application/Espo/Entities/UserReaction.php | 5 +++-- .../Espo/Modules/Crm/Business/Event/Invitations.php | 3 ++- application/Espo/Modules/Crm/Entities/Account.php | 9 +++++---- application/Espo/Modules/Crm/Entities/Call.php | 8 ++++---- application/Espo/Modules/Crm/Entities/Campaign.php | 4 ++-- .../Espo/Modules/Crm/Entities/CampaignLogRecord.php | 3 ++- application/Espo/Modules/Crm/Entities/CaseObj.php | 6 +++--- application/Espo/Modules/Crm/Entities/Contact.php | 9 +++++---- application/Espo/Modules/Crm/Entities/Document.php | 4 ++-- .../Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php | 6 +++--- application/Espo/Modules/Crm/Entities/Lead.php | 4 ++-- application/Espo/Modules/Crm/Entities/Meeting.php | 8 ++++---- application/Espo/Modules/Crm/Entities/Opportunity.php | 4 ++-- application/Espo/Modules/Crm/Entities/TargetList.php | 9 +++++---- application/Espo/Modules/Crm/Entities/Task.php | 4 ++-- .../Modules/Crm/Tools/Activities/UpcomingService.php | 5 +++-- .../Modules/Crm/Tools/MassEmail/SendingProcessor.php | 3 ++- .../Tools/EntityManager/Hook/Hooks/PlusCreateHook.php | 7 ++++--- .../Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php | 5 +++-- application/Espo/Tools/Stream/UserRecordService.php | 2 +- 27 files changed, 77 insertions(+), 65 deletions(-) diff --git a/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php b/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php index 9af1b4b6a5..5789908110 100644 --- a/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php +++ b/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php @@ -49,8 +49,8 @@ class DefaultSidePanelType $list = []; if ( - $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === FieldType::LINK && - $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === User::ENTITY_TYPE + $this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USER, 'type']) === FieldType::LINK && + $this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USER, 'entity']) === User::ENTITY_TYPE || $this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USERS, 'type']) === FieldType::LINK_MULTIPLE && $this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USERS, 'entity']) === User::ENTITY_TYPE diff --git a/application/Espo/Classes/JobPreparators/CheckEmailAccounts.php b/application/Espo/Classes/JobPreparators/CheckEmailAccounts.php index a81868e971..a6ecf6a053 100644 --- a/application/Espo/Classes/JobPreparators/CheckEmailAccounts.php +++ b/application/Espo/Classes/JobPreparators/CheckEmailAccounts.php @@ -31,6 +31,7 @@ namespace Espo\Classes\JobPreparators; use Espo\Core\Job\Preparator; use Espo\Core\Job\Preparator\Data; +use Espo\Core\Name\Field; use Espo\ORM\EntityManager; use Espo\Entities\EmailAccount; use Espo\Core\Job\Preparator\CollectionHelper; @@ -51,7 +52,7 @@ class CheckEmailAccounts implements Preparator { $collection = $this->entityManager ->getRDBRepositoryByClass(EmailAccount::class) - ->join('assignedUser', 'assignedUserAdditional') + ->join(Field::ASSIGNED_USER, 'assignedUserAdditional') ->where([ 'status' => EmailAccount::STATUS_ACTIVE, 'useImap' => true, diff --git a/application/Espo/Entities/Attachment.php b/application/Espo/Entities/Attachment.php index bbd69ce8b1..989b4d1a5b 100644 --- a/application/Espo/Entities/Attachment.php +++ b/application/Espo/Entities/Attachment.php @@ -99,7 +99,7 @@ class Attachment extends Entity public function getParent(): ?LinkParent { /** @var ?LinkParent */ - return $this->getValueObject('parent'); + return $this->getValueObject(Field::PARENT); } public function getRelated(): ?LinkParent diff --git a/application/Espo/Entities/Email.php b/application/Espo/Entities/Email.php index c6395edaf1..84d28e4009 100644 --- a/application/Espo/Entities/Email.php +++ b/application/Espo/Entities/Email.php @@ -648,7 +648,7 @@ class Email extends Entity public function getParent(): ?LinkParent { /** @var ?LinkParent */ - return $this->getValueObject('parent'); + return $this->getValueObject(Field::PARENT); } public function setAccount(?Link $account): self @@ -661,12 +661,12 @@ class Email extends Entity public function setParent(LinkParent|Entity|null $parent): self { if ($parent instanceof LinkParent) { - $this->setValueObject('parent', $parent); + $this->setValueObject(Field::PARENT, $parent); return $this; } - $this->relations->set('parent', $parent); + $this->relations->set(Field::PARENT, $parent); return $this; } @@ -703,13 +703,13 @@ class Email extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getCreatedBy(): ?Link { /** @var ?Link */ - return $this->getValueObject('createdBy'); + return $this->getValueObject(Field::CREATED_BY); } public function getSentBy(): ?Link diff --git a/application/Espo/Entities/EmailAccount.php b/application/Espo/Entities/EmailAccount.php index 17e0c705aa..61422b17c2 100644 --- a/application/Espo/Entities/EmailAccount.php +++ b/application/Espo/Entities/EmailAccount.php @@ -29,6 +29,7 @@ namespace Espo\Entities; +use Espo\Core\Name\Field; use Espo\Core\ORM\Entity; use Espo\Core\Field\Date; @@ -66,7 +67,7 @@ class EmailAccount extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple diff --git a/application/Espo/Entities/Export.php b/application/Espo/Entities/Export.php index 7247d2c794..fad764faa4 100644 --- a/application/Espo/Entities/Export.php +++ b/application/Espo/Entities/Export.php @@ -99,7 +99,7 @@ class Export extends Entity public function getCreatedBy(): Link { - $value = $this->getValueObject('createdBy'); + $value = $this->getValueObject(Field::CREATED_BY); if (!$value instanceof Link) { throw new RuntimeException("No 'createdBy'."); diff --git a/application/Espo/Entities/Note.php b/application/Espo/Entities/Note.php index 6e4c2bde5d..b7eef4d279 100644 --- a/application/Espo/Entities/Note.php +++ b/application/Espo/Entities/Note.php @@ -228,12 +228,12 @@ class Note extends Entity public function setParent(LinkParent|Entity $parent): self { if ($parent instanceof LinkParent) { - $this->setValueObject('parent', $parent); + $this->setValueObject(Field::PARENT, $parent); return $this; } - $this->relations->set('parent', $parent); + $this->relations->set(Field::PARENT, $parent); return $this; } @@ -291,7 +291,7 @@ class Note extends Entity } if ($this->getParentId() && $this->getParentType()) { - $this->loadParentNameField('parent'); + $this->loadParentNameField(Field::PARENT); } if ($this->getRelatedId() && $this->getRelatedType()) { @@ -318,7 +318,7 @@ class Note extends Entity $targetType !== self::TARGET_SELF ) { if (!$targetType || $targetType === self::TARGET_TEAMS) { - $this->loadLinkMultipleField('teams'); + $this->loadLinkMultipleField(Field::TEAMS); } else if ($targetType === self::TARGET_PORTALS) { $this->loadLinkMultipleField('portals'); } @@ -356,7 +356,7 @@ class Note extends Entity public function getParent(): ?OrmEntity { - return $this->relations->getOne('parent'); + return $this->relations->getOne(Field::PARENT); } /** diff --git a/application/Espo/Entities/UserReaction.php b/application/Espo/Entities/UserReaction.php index 44a64c8b21..fe916e8d7b 100644 --- a/application/Espo/Entities/UserReaction.php +++ b/application/Espo/Entities/UserReaction.php @@ -30,6 +30,7 @@ namespace Espo\Entities; use Espo\Core\Field\LinkParent; +use Espo\Core\Name\Field; use Espo\Core\ORM\Entity; class UserReaction extends Entity @@ -44,7 +45,7 @@ class UserReaction extends Entity public function getParent(): LinkParent { /** @var LinkParent */ - return $this->getValueObject('parent'); + return $this->getValueObject(Field::PARENT); } public function setType(string $type): self @@ -56,7 +57,7 @@ class UserReaction extends Entity public function setParent(Note $note): self { - $this->relations->set('parent', $note); + $this->relations->set(Field::PARENT, $note); return $this; } diff --git a/application/Espo/Modules/Crm/Business/Event/Invitations.php b/application/Espo/Modules/Crm/Business/Event/Invitations.php index 46322bcbe4..f49901df19 100644 --- a/application/Espo/Modules/Crm/Business/Event/Invitations.php +++ b/application/Espo/Modules/Crm/Business/Event/Invitations.php @@ -32,6 +32,7 @@ namespace Espo\Modules\Crm\Business\Event; use Espo\Core\Field\DateTime as DateTimeField; use Espo\Core\Field\LinkParent; use Espo\Core\Mail\Exceptions\SendingError; +use Espo\Core\Name\Field; use Espo\Entities\Attachment; use Espo\Entities\Email; use Espo\Entities\UniqueId; @@ -198,7 +199,7 @@ class Invitations { /** @var ?User $user */ $user = $this->entityManager - ->getRelation($entity, 'assignedUser') + ->getRelation($entity, Field::ASSIGNED_USER) ->findOne(); $addressList = []; diff --git a/application/Espo/Modules/Crm/Entities/Account.php b/application/Espo/Modules/Crm/Entities/Account.php index fea2dfef0e..fa37767f55 100644 --- a/application/Espo/Modules/Crm/Entities/Account.php +++ b/application/Espo/Modules/Crm/Entities/Account.php @@ -34,6 +34,7 @@ use Espo\Core\Field\EmailAddressGroup; use Espo\Core\Field\Link; use Espo\Core\Field\LinkMultiple; use Espo\Core\Field\PhoneNumberGroup; +use Espo\Core\Name\Field; use Espo\Core\ORM\Entity; use Espo\Entities\User; @@ -117,23 +118,23 @@ class Account extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple { /** @var LinkMultiple */ - return $this->getValueObject('teams'); + return $this->getValueObject(Field::TEAMS); } public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self { - $this->setValueObject('teams', $teams); + $this->setValueObject(Field::TEAMS, $teams); return $this; } diff --git a/application/Espo/Modules/Crm/Entities/Call.php b/application/Espo/Modules/Crm/Entities/Call.php index dc89be4d5b..ef333658be 100644 --- a/application/Espo/Modules/Crm/Entities/Call.php +++ b/application/Espo/Modules/Crm/Entities/Call.php @@ -133,24 +133,24 @@ class Call extends Entity public function setParent(Entity|LinkParent|null $parent): self { if ($parent instanceof LinkParent) { - $this->setValueObject('parent', $parent); + $this->setValueObject(Field::PARENT, $parent); return $this; } - $this->relations->set('parent', $parent); + $this->relations->set(Field::PARENT, $parent); return $this; } public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self { - $this->setValueObject('teams', $teams); + $this->setValueObject(Field::TEAMS, $teams); return $this; } diff --git a/application/Espo/Modules/Crm/Entities/Campaign.php b/application/Espo/Modules/Crm/Entities/Campaign.php index dc8a3d301f..529c2abee3 100644 --- a/application/Espo/Modules/Crm/Entities/Campaign.php +++ b/application/Espo/Modules/Crm/Entities/Campaign.php @@ -70,7 +70,7 @@ class Campaign extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple @@ -81,7 +81,7 @@ class Campaign extends Entity public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self diff --git a/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php b/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php index f9e178394e..888031c503 100644 --- a/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php +++ b/application/Espo/Modules/Crm/Entities/CampaignLogRecord.php @@ -30,6 +30,7 @@ namespace Espo\Modules\Crm\Entities; use Espo\Core\Field\LinkParent; +use Espo\Core\Name\Field; use Espo\Core\ORM\Entity; class CampaignLogRecord extends Entity @@ -50,6 +51,6 @@ class CampaignLogRecord extends Entity public function getParent(): ?LinkParent { /** @var ?LinkParent */ - return $this->getValueObject('parent'); + return $this->getValueObject(Field::PARENT); } } diff --git a/application/Espo/Modules/Crm/Entities/CaseObj.php b/application/Espo/Modules/Crm/Entities/CaseObj.php index ea9e0c8aa0..0ccc37347b 100644 --- a/application/Espo/Modules/Crm/Entities/CaseObj.php +++ b/application/Espo/Modules/Crm/Entities/CaseObj.php @@ -94,13 +94,13 @@ class CaseObj extends \Espo\Core\ORM\Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple { /** @var LinkMultiple */ - return $this->getValueObject('teams'); + return $this->getValueObject(Field::TEAMS); } /** @@ -123,7 +123,7 @@ class CaseObj extends \Espo\Core\ORM\Entity public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self diff --git a/application/Espo/Modules/Crm/Entities/Contact.php b/application/Espo/Modules/Crm/Entities/Contact.php index 8b6bef4881..de9a7bfd1e 100644 --- a/application/Espo/Modules/Crm/Entities/Contact.php +++ b/application/Espo/Modules/Crm/Entities/Contact.php @@ -32,6 +32,7 @@ namespace Espo\Modules\Crm\Entities; use Espo\Core\Entities\Person; use Espo\Core\Field\Link; use Espo\Core\Field\LinkMultiple; +use Espo\Core\Name\Field; use Espo\Entities\User; class Contact extends Person @@ -44,7 +45,7 @@ class Contact extends Person public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } /** @@ -71,7 +72,7 @@ class Contact extends Person public function getTeams(): LinkMultiple { /** @var LinkMultiple */ - return $this->getValueObject('teams'); + return $this->getValueObject(Field::TEAMS); } /** @@ -84,12 +85,12 @@ class Contact extends Person public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self { - $this->setValueObject('teams', $teams); + $this->setValueObject(Field::TEAMS, $teams); return $this; } diff --git a/application/Espo/Modules/Crm/Entities/Document.php b/application/Espo/Modules/Crm/Entities/Document.php index a5ee4dbde6..1e5c4b1c1a 100644 --- a/application/Espo/Modules/Crm/Entities/Document.php +++ b/application/Espo/Modules/Crm/Entities/Document.php @@ -75,7 +75,7 @@ class Document extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple @@ -86,7 +86,7 @@ class Document extends Entity public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self diff --git a/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php b/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php index 83dd437cbc..ad2b7de422 100644 --- a/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php +++ b/application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php @@ -57,7 +57,7 @@ class KnowledgeBaseArticle extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple @@ -86,12 +86,12 @@ class KnowledgeBaseArticle extends Entity public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self { - $this->setValueObject('teams', $teams); + $this->setValueObject(Field::TEAMS, $teams); return $this; } diff --git a/application/Espo/Modules/Crm/Entities/Lead.php b/application/Espo/Modules/Crm/Entities/Lead.php index 47f32b05e7..cd64ea8dfe 100644 --- a/application/Espo/Modules/Crm/Entities/Lead.php +++ b/application/Espo/Modules/Crm/Entities/Lead.php @@ -106,7 +106,7 @@ class Lead extends \Espo\Core\Entities\Person public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple @@ -155,7 +155,7 @@ class Lead extends \Espo\Core\Entities\Person public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self diff --git a/application/Espo/Modules/Crm/Entities/Meeting.php b/application/Espo/Modules/Crm/Entities/Meeting.php index bbacb3e247..77c7245b5c 100644 --- a/application/Espo/Modules/Crm/Entities/Meeting.php +++ b/application/Espo/Modules/Crm/Entities/Meeting.php @@ -108,7 +108,7 @@ class Meeting extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple @@ -138,19 +138,19 @@ class Meeting extends Entity public function setParent(Entity|LinkParent|null $parent): self { if ($parent instanceof LinkParent) { - $this->setValueObject('parent', $parent); + $this->setValueObject(Field::PARENT, $parent); return $this; } - $this->relations->set('parent', $parent); + $this->relations->set(Field::PARENT, $parent); return $this; } public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self diff --git a/application/Espo/Modules/Crm/Entities/Opportunity.php b/application/Espo/Modules/Crm/Entities/Opportunity.php index 7da670c06f..b875b1690a 100644 --- a/application/Espo/Modules/Crm/Entities/Opportunity.php +++ b/application/Espo/Modules/Crm/Entities/Opportunity.php @@ -131,7 +131,7 @@ class Opportunity extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple @@ -147,7 +147,7 @@ class Opportunity extends Entity public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self diff --git a/application/Espo/Modules/Crm/Entities/TargetList.php b/application/Espo/Modules/Crm/Entities/TargetList.php index 072047da9d..461b3db1c7 100644 --- a/application/Espo/Modules/Crm/Entities/TargetList.php +++ b/application/Espo/Modules/Crm/Entities/TargetList.php @@ -31,6 +31,7 @@ namespace Espo\Modules\Crm\Entities; use Espo\Core\Field\Link; use Espo\Core\Field\LinkMultiple; +use Espo\Core\Name\Field; use Espo\Core\ORM\Entity; use Espo\Entities\User; @@ -41,23 +42,23 @@ class TargetList extends Entity public function getAssignedUser(): ?Link { /** @var ?Link */ - return $this->getValueObject('assignedUser'); + return $this->getValueObject(Field::ASSIGNED_USER); } public function getTeams(): LinkMultiple { /** @var LinkMultiple */ - return $this->getValueObject('teams'); + return $this->getValueObject(Field::TEAMS); } public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self { - $this->setValueObject('teams', $teams); + $this->setValueObject(Field::TEAMS, $teams); return $this; } diff --git a/application/Espo/Modules/Crm/Entities/Task.php b/application/Espo/Modules/Crm/Entities/Task.php index 716883c317..3ed950d40d 100644 --- a/application/Espo/Modules/Crm/Entities/Task.php +++ b/application/Espo/Modules/Crm/Entities/Task.php @@ -121,12 +121,12 @@ class Task extends Entity public function setAssignedUser(Link|User|null $assignedUser): self { - return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser); + return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser); } public function setTeams(LinkMultiple $teams): self { - $this->setValueObject('teams', $teams); + $this->setValueObject(Field::TEAMS, $teams); return $this; } diff --git a/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php b/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php index 358d52afb2..0657fac501 100644 --- a/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php +++ b/application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php @@ -33,6 +33,7 @@ use Espo\Core\Acl; use Espo\Core\Exceptions\BadRequest; use Espo\Core\Exceptions\NotFound; use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Name\Field; use Espo\Core\ORM\Entity as CoreEntity; use Espo\Core\Record\ServiceContainer; use Espo\Core\Select\Bool\Filters\OnlyMy; @@ -180,9 +181,9 @@ class UpcomingService if ( $entity instanceof CoreEntity && - $entity->hasLinkParentField('parent') + $entity->hasLinkParentField(Field::PARENT) ) { - $entity->loadParentNameField('parent'); + $entity->loadParentNameField(Field::PARENT); } $this->serviceContainer->get($itemEntityType)->prepareEntityForOutput($entity); diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php index 900deaee84..01ad2e9915 100644 --- a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php +++ b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php @@ -29,6 +29,7 @@ namespace Espo\Modules\Crm\Tools\MassEmail; +use Espo\Core\Name\Field; use Espo\Tools\EmailTemplate\Result; use Laminas\Mail\Message; @@ -556,7 +557,7 @@ class SendingProcessor } if ($campaign) { - $email->setLinkMultipleIdList('teams', $campaign->getLinkMultipleIdList('teams')); + $email->setLinkMultipleIdList(Field::TEAMS, $campaign->getLinkMultipleIdList(Field::TEAMS)); } $senderParams = $senderParams->withFromAddress( diff --git a/application/Espo/Tools/EntityManager/Hook/Hooks/PlusCreateHook.php b/application/Espo/Tools/EntityManager/Hook/Hooks/PlusCreateHook.php index 65f6f6c178..61c750fa41 100644 --- a/application/Espo/Tools/EntityManager/Hook/Hooks/PlusCreateHook.php +++ b/application/Espo/Tools/EntityManager/Hook/Hooks/PlusCreateHook.php @@ -29,6 +29,7 @@ namespace Espo\Tools\EntityManager\Hook\Hooks; +use Espo\Core\Name\Field; use Espo\Core\Templates\Entities\BasePlus; use Espo\Core\Templates\Entities\Company; use Espo\Core\Templates\Entities\Person; @@ -67,18 +68,18 @@ class PlusCreateHook implements CreateHook $entityTypeList = array_unique($entityTypeList); foreach ($entityTypeList as $entityType) { - if (!$this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'])) { + if (!$this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'])) { continue; } - $list = $this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'], []); + $list = $this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'], []); if (!in_array($name, $list)) { $list[] = $name; $data = [ 'fields' => [ - 'parent' => ['entityList' => $list] + Field::PARENT => ['entityList' => $list] ] ]; diff --git a/application/Espo/Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php b/application/Espo/Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php index 1212c4941b..00eb22fb4d 100644 --- a/application/Espo/Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php +++ b/application/Espo/Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php @@ -29,6 +29,7 @@ namespace Espo\Tools\EntityManager\Hook\Hooks; +use Espo\Core\Name\Field; use Espo\Core\Templates\Entities\BasePlus; use Espo\Core\Templates\Entities\Company; use Espo\Core\Templates\Entities\Person; @@ -67,11 +68,11 @@ class PlusDeleteHook implements CreateHook $entityTypeList = array_unique($entityTypeList); foreach ($entityTypeList as $entityType) { - if (!$this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'])) { + if (!$this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'])) { continue; } - $list = $this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'], []); + $list = $this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'], []); if (in_array($name, $list)) { $key = array_search($name, $list); diff --git a/application/Espo/Tools/Stream/UserRecordService.php b/application/Espo/Tools/Stream/UserRecordService.php index 115fdf705a..ec9d3a0c50 100644 --- a/application/Espo/Tools/Stream/UserRecordService.php +++ b/application/Espo/Tools/Stream/UserRecordService.php @@ -144,7 +144,7 @@ class UserRecordService $baseBuilder = $this->queryHelper->buildBaseQueryBuilder($searchParams) ->select($this->queryHelper->getUserQuerySelect()) - ->leftJoin('createdBy') + ->leftJoin(Field::CREATED_BY) ->order('number', Order::DESC) ->limit(0, $offset + $maxSize + 1);