diff options
-rw-r--r-- | lib/Db/ItemMapperV2.php | 38 | ||||
-rw-r--r-- | tests/Unit/Db/ItemMapperAfterTest.php | 4 | ||||
-rw-r--r-- | tests/Unit/Db/ItemMapperPaginatedTest.php | 4 | ||||
-rw-r--r-- | tests/Unit/Db/ItemMapperTest.php | 7 |
4 files changed, 2 insertions, 51 deletions
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 @@ -34,49 +33,14 @@ 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; } /** diff --git a/tests/Unit/Db/ItemMapperAfterTest.php b/tests/Unit/Db/ItemMapperAfterTest.php index 6e33465ba..eccebbcf5 100644 --- a/tests/Unit/Db/ItemMapperAfterTest.php +++ b/tests/Unit/Db/ItemMapperAfterTest.php @@ -28,8 +28,6 @@ class ItemMapperAfterTest extends MapperTestUtility /** @var ItemMapperV2 */ private $class; - /** @var IUserManager */ - private $userManager; /** * @covers \OCA\News\Db\ItemMapperV2::__construct @@ -39,8 +37,6 @@ class ItemMapperAfterTest extends MapperTestUtility parent::setUp(); $time = $this->getMockBuilder(Time::class) ->getMock(); - $this->userManager = $this->getMockBuilder(IUserManager::class) - ->getMock(); $this->class = new ItemMapperV2($this->db, $time); } diff --git a/tests/Unit/Db/ItemMapperPaginatedTest.php b/tests/Unit/Db/ItemMapperPaginatedTest.php index 1a53fe616..330eaff51 100644 --- a/tests/Unit/Db/ItemMapperPaginatedTest.php +++ b/tests/Unit/Db/ItemMapperPaginatedTest.php @@ -30,8 +30,6 @@ class ItemMapperPaginatedTest extends MapperTestUtility /** @var ItemMapperV2 */ private $class; - /** @var IUserManager */ - private $userManager; /** * @covers \OCA\News\Db\ItemMapperV2::__construct @@ -41,8 +39,6 @@ class ItemMapperPaginatedTest extends MapperTestUtility parent::setUp(); $time = $this->getMockBuilder(Time::class) ->getMock(); - $this->userManager = $this->getMockBuilder(IUserManager::class) - ->getMock(); $this->class = new ItemMapperV2($this->db, $time); } diff --git a/tests/Unit/Db/ItemMapperTest.php b/tests/Unit/Db/ItemMapperTest.php index a1b9a46ae..5cb42c3fa 100644 --- a/tests/Unit/Db/ItemMapperTest.php +++ b/tests/Unit/Db/ItemMapperTest.php @@ -32,7 +32,6 @@ use OCP\DB\QueryBuilder\IFunctionBuilder; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; use OCP\IDBConnection; -use OCP\IUserManager; use Test\TestCase; /** @@ -47,8 +46,6 @@ class ItemMapperTest extends MapperTestUtility private $time; /** @var ItemMapperV2 */ private $class; - /** @var IUserManager */ - private $userManager; /** * @covers \OCA\News\Db\ItemMapperV2::__construct @@ -58,10 +55,8 @@ class ItemMapperTest extends MapperTestUtility parent::setUp(); $this->time = $this->getMockBuilder(Time::class) ->getMock(); - $this->userManager = $this->getMockBuilder(IUserManager::class) - ->getMock(); - $this->class = new ItemMapperV2($this->db, $this->time, $this->userManager); + $this->class = new ItemMapperV2($this->db, $this->time); } /** |