From bbdd95c30d545cc7dd9719836a94c7b21b381c68 Mon Sep 17 00:00:00 2001
From: Marco Nassabain <marco.nassabain@hotmail.com>
Date: Fri, 19 Mar 2021 18:13:13 +0100
Subject: =?UTF-8?q?=F0=9F=94=A5=20Remove=20UserManager=20code=20from=20Ite?=
 =?UTF-8?q?mMapper=20&=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
---
 lib/Db/ItemMapperV2.php | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

(limited to 'lib')

diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php
index 3e0aa80b5..44d1740cd 100644
--- a/lib/Db/ItemMapperV2.php
+++ b/lib/Db/ItemMapperV2.php
@@ -22,7 +22,6 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\Exception as DBException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
-use OCP\IUserManager;
 
 /**
  * Class ItemMapper
@@ -33,50 +32,15 @@ class ItemMapperV2 extends NewsMapperV2
 {
     const TABLE_NAME = 'news_items';
 
-    /**
-     * @var IUserManager
-     */
-    private $userManager;
-
     /**
      * ItemMapper constructor.
      *
      * @param IDBConnection $db
      * @param Time          $time
      */
-    public function __construct(IDBConnection $db, Time $time, IUserManager $userManager)
+    public function __construct(IDBConnection $db, Time $time)
     {
         parent::__construct($db, $time, Item::class);
-        $this->userManager = $userManager;
-    }
-
-    /**
-     * Override parent constructor to insert sharer display names for shared items
-     *
-     * @param IQueryBuilder $query
-     * @return Entity[] all fetched entities
-     */
-    public function findEntities(IQueryBuilder $query): array
-    {
-        $entities = parent::findEntities($query);
-
-        foreach ($entities as $entity) {
-            $sharedBy = $entity->getSharedBy();
-            $sharedByDisplayName = null;
-
-            // Get user display name
-            if (!is_null($sharedBy)) {
-                $user = $this->userManager->get($sharedBy);
-                if (!is_null($user)) {
-                    $sharedByDisplayName = $user->getDisplayName();
-                }
-            }
-
-            // Set sharer display name
-            $entity->setSharedByDisplayName($sharedByDisplayName);
-        }
-
-        return $entities;
     }
 
     /**
-- 
cgit v1.2.3