From 8fa65bc965efbd957fd3d35ac20401cbd7bba8e6 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 21 Jan 2020 11:47:14 +0200
Subject: [PATCH] fix naming

---
 application/Espo/Services/Stream.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/Espo/Services/Stream.php b/application/Espo/Services/Stream.php
index 3b86c07942..e363374e58 100644
--- a/application/Espo/Services/Stream.php
+++ b/application/Espo/Services/Stream.php
@@ -186,7 +186,7 @@ class Stream extends \Espo\Core\Services\Base
         $sql = "
             SELECT id FROM subscription
             WHERE
-                entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityName()) . " AND
+                entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityType()) . " AND
                 user_id = " . $pdo->quote($userId) . "
         ";
 
@@ -272,7 +272,7 @@ class Stream extends \Espo\Core\Services\Base
         if ($userId == 'system') {
             return;
         }
-        if (!$this->getMetadata()->get('scopes.' . $entity->getEntityName() . '.stream')) {
+        if (!$this->getMetadata()->get('scopes.' . $entity->getEntityType() . '.stream')) {
             return false;
         }
 
@@ -295,7 +295,7 @@ class Stream extends \Espo\Core\Services\Base
                 INSERT INTO subscription
                 (entity_id, entity_type, user_id)
                 VALUES
-                (".$pdo->quote($entity->id) . ", " . $pdo->quote($entity->getEntityName()) . ", " . $pdo->quote($userId).")
+                (".$pdo->quote($entity->id) . ", " . $pdo->quote($entity->getEntityType()) . ", " . $pdo->quote($userId).")
             ";
             $sth = $pdo->prepare($sql)->execute();
         }
@@ -304,7 +304,7 @@ class Stream extends \Espo\Core\Services\Base
 
     public function unfollowEntity(Entity $entity, $userId)
     {
-        if (!$this->getMetadata()->get('scopes.' . $entity->getEntityName() . '.stream')) {
+        if (!$this->getMetadata()->get('scopes.' . $entity->getEntityType() . '.stream')) {
             return false;
         }
 
@@ -313,7 +313,7 @@ class Stream extends \Espo\Core\Services\Base
         $sql = "
             DELETE FROM subscription
             WHERE
-                entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityName()) . " AND
+                entity_id = " . $pdo->quote($entity->id) . " AND entity_type = " . $pdo->quote($entity->getEntityType()) . " AND
                 user_id = " . $pdo->quote($userId) . "
         ";
         $sth = $pdo->prepare($sql)->execute();
@@ -1157,7 +1157,7 @@ class Stream extends \Espo\Core\Services\Base
         if ($from) {
             $person = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddress($from);
             if ($person) {
-                $data['personEntityType'] = $person->getEntityName();
+                $data['personEntityType'] = $person->getEntityType();
                 $data['personEntityName'] = $person->get('name');
                 $data['personEntityId'] = $person->id;
             }
@@ -1214,7 +1214,7 @@ class Stream extends \Espo\Core\Services\Base
         }
 
         if ($person) {
-            $data['personEntityType'] = $person->getEntityName();
+            $data['personEntityType'] = $person->getEntityType();
             $data['personEntityName'] = $person->get('name');
             $data['personEntityId'] = $person->id;
         }