chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-04-09 19:15:42 +02:00
Code

🔥 Remove UserManager code from ItemMapper & tests

Browse Source 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
This commit is contained in:
Marco Nassabain 2021-03-19 18:13:13 +01:00 committed by Sean Molenaar
parent 7f21574615
commit bbdd95c30d
4 changed files with 2 additions and 51 deletions

38
lib/Db/ItemMapperV2.php
View File

@ -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;
}
/**

4
tests/Unit/Db/ItemMapperAfterTest.php
View File

@ -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);
}

4
tests/Unit/Db/ItemMapperPaginatedTest.php
View File

@ -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);
}

7
tests/Unit/Db/ItemMapperTest.php
View File

@ -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);
}
/**