From ecd33b0f544f5dcc5071164342ddeb641a028114 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 29 Jun 2020 14:35:34 +0300
Subject: [PATCH] stream controller refactoring

---
 application/Espo/Controllers/Stream.php | 26 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/application/Espo/Controllers/Stream.php b/application/Espo/Controllers/Stream.php
index 4544b8b26a..ace547cd26 100644
--- a/application/Espo/Controllers/Stream.php
+++ b/application/Espo/Controllers/Stream.php
@@ -31,12 +31,24 @@ namespace Espo\Controllers;
 
 use Espo\Core\Exceptions\Error;
 
-class Stream extends \Espo\Core\Controllers\Base
+use Espo\Core\ServiceFactory;
+use Espo\Core\Utils\Config;
+
+class Stream
 {
     const MAX_SIZE_LIMIT = 200;
 
     public static $defaultAction = 'list';
 
+    protected $serviceFactory;
+    protected $config;
+
+    public function __construct(ServiceFactory $serviceFactory, Config $config)
+    {
+        $this->serviceFactory = $serviceFactory;
+        $this->config = $config;
+    }
+
     public function actionList($params, $data, $request)
     {
         $scope = $params['scope'];
@@ -48,9 +60,7 @@ class Stream extends \Espo\Core\Controllers\Base
         $filter = $request->get('filter');
         $skipOwn = $request->get('skipOwn') === 'true';
 
-        $service = $this->getService('Stream');
-
-        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        $maxSizeLimit = $this->config->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
         if (empty($maxSize)) {
             $maxSize = $maxSizeLimit;
         }
@@ -58,7 +68,7 @@ class Stream extends \Espo\Core\Controllers\Base
             throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
         }
 
-        $result = $service->find($scope, $id, [
+        $result = $this->serviceFactory->create('Stream')->find($scope, $id, [
             'offset' => $offset,
             'maxSize' => $maxSize,
             'after' => $after,
@@ -83,9 +93,7 @@ class Stream extends \Espo\Core\Controllers\Base
 
         $where = $request->get('where');
 
-        $service = $this->getService('Stream');
-
-        $maxSizeLimit = $this->getConfig()->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
+        $maxSizeLimit = $this->config->get('recordListMaxSizeLimit', self::MAX_SIZE_LIMIT);
         if (empty($maxSize)) {
             $maxSize = $maxSizeLimit;
         }
@@ -93,7 +101,7 @@ class Stream extends \Espo\Core\Controllers\Base
             throw new Forbidden("Max size should should not exceed " . $maxSizeLimit . ". Use offset and limit.");
         }
 
-        $result = $service->find($scope, $id, [
+        $result = $this->serviceFactory->create('Stream')->find($scope, $id, [
             'offset' => $offset,
             'maxSize' => $maxSize,
             'after' => $after,