EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
optimization
Yurii032708f623a2
diff --git a/application/Espo/Tools/Notification/GroupAllService.php b/application/Espo/Tools/Notification/GroupAllService.phpindex 4319236c65..9ff5892cd8 100644--- a/application/Espo/Tools/Notification/GroupAllService.php+++ b/application/Espo/Tools/Notification/GroupAllService.php@@ -66,11 +66,13 @@ class GroupAllService{$searchParams = $this->amendMaxSize($type, $groupId, $searchParams);- $collection = $this->getInternal($type, $groupId, $searchParams);+ $recordCollection = $this->getInternal($type, $groupId, $searchParams);- $this->markAsRead($collection);+ $recordCollection = $this->prepareRecordCollection($recordCollection);- return $collection;+ $this->markAsRead($recordCollection);++ return $recordCollection;}/**@@ -127,8 +129,6 @@ class GroupAllService[$collection, $total] = $this->runQuery($query);- $collection = $this->recordService->prepareCollection($collection, $this->user);-return RecordCollection::create($collection, $total);}@@ -149,8 +149,6 @@ class GroupAllService[$collection, $total] = $this->runQuery($query);- $collection = $this->recordService->prepareCollection($collection, $this->user);-return RecordCollection::create($collection, $total);}@@ -416,4 +414,16 @@ class GroupAllServicereturn $searchParams;}++ /**+ * @param RecordCollection<Notification> $recordCollection+ * @return RecordCollection<Notification>+ */+ private function prepareRecordCollection(RecordCollection $recordCollection): RecordCollection+ {+ $collection = $recordCollection->getCollection();+ $collection = $this->recordService->prepareCollection($collection, $this->user);++ return new RecordCollection($collection, $recordCollection->getTotal());+ }}