ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Inject user manager

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-10-06 12:38:38 +02:00
parent 310af37d67
commit e0ac86ac1f
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Service/CardService.php
View File

@@ -38,6 +38,7 @@ use OCA\Deck\NotFoundException;
use OCA\Deck\StatusException; use OCA\Deck\StatusException;
use OCA\Deck\BadRequestException; use OCA\Deck\BadRequestException;
use OCP\Comments\ICommentsManager; use OCP\Comments\ICommentsManager;
use OCP\IUserManager;
class CardService { class CardService {
@@ -66,6 +67,7 @@ class CardService {
AttachmentService $attachmentService, AttachmentService $attachmentService,
ActivityManager $activityManager, ActivityManager $activityManager,
ICommentsManager $commentsManager, ICommentsManager $commentsManager,
IUserManager $userManager,
$userId $userId
) { ) {
$this->cardMapper = $cardMapper; $this->cardMapper = $cardMapper;
@@ -79,6 +81,7 @@ class CardService {
$this->attachmentService = $attachmentService; $this->attachmentService = $attachmentService;
$this->activityManager = $activityManager; $this->activityManager = $activityManager;
$this->commentsManager = $commentsManager; $this->commentsManager = $commentsManager;
$this->userManager = $userManager;
$this->currentUser = $userId; $this->currentUser = $userId;
} }
@@ -87,7 +90,8 @@ class CardService {
$card->setAssignedUsers($this->assignedUsersMapper->find($cardId)); $card->setAssignedUsers($this->assignedUsersMapper->find($cardId));
$card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId)); $card->setLabels($this->labelMapper->findAssignedLabelsForCard($cardId));
$card->setAttachmentCount($this->attachmentService->count($cardId)); $card->setAttachmentCount($this->attachmentService->count($cardId));
$lastRead = $this->commentsManager->getReadMark('deckCard', (string)$card->getId(), \OC::$server->getUserSession()->getUser()); $user = $this->userManager->get($this->currentUser);
$lastRead = $this->commentsManager->getReadMark('deckCard', (string)$card->getId(), $user);
$count = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId(), $lastRead); $count = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId(), $lastRead);
$card->setCommentsUnread($count); $card->setCommentsUnread($count);
} }

31
tests/unit/Service/CardServiceTest.php
View File

@@ -37,33 +37,38 @@ use OCA\Deck\Notification\NotificationHelper;
use OCA\Deck\StatusException; use OCA\Deck\StatusException;
use OCP\Activity\IEvent; use OCP\Activity\IEvent;
use OCP\Comments\ICommentsManager; use OCP\Comments\ICommentsManager;
use OCP\IUser;
use OCP\IUserManager;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase; use Test\TestCase;
class CardServiceTest extends TestCase { class CardServiceTest extends TestCase {
/** @var CardService|\PHPUnit\Framework\MockObject\MockObject */ /** @var CardService|MockObject */
private $cardService; private $cardService;
/** @var CardMapper|\PHPUnit\Framework\MockObject\MockObject */ /** @var CardMapper|MockObject */
private $cardMapper; private $cardMapper;
/** @var StackMapper|\PHPUnit\Framework\MockObject\MockObject */ /** @var StackMapper|MockObject */
private $stackMapper; private $stackMapper;
/** @var PermissionService|\PHPUnit\Framework\MockObject\MockObject */ /** @var PermissionService|MockObject */
private $permissionService; private $permissionService;
/** @var NotificationHelper */ /** @var NotificationHelper */
private $notificationHelper; private $notificationHelper;
/** @var AssignedUsersMapper|\PHPUnit\Framework\MockObject\MockObject */ /** @var AssignedUsersMapper|MockObject */
private $assignedUsersMapper; private $assignedUsersMapper;
/** @var BoardService|\PHPUnit\Framework\MockObject\MockObject */ /** @var BoardService|MockObject */
private $boardService; private $boardService;
/** @var LabelMapper|\PHPUnit\Framework\MockObject\MockObject */ /** @var LabelMapper|MockObject */
private $labelMapper; private $labelMapper;
private $boardMapper; private $boardMapper;
/** @var AttachmentService|\PHPUnit\Framework\MockObject\MockObject */ /** @var AttachmentService|MockObject */
private $attachmentService; private $attachmentService;
/** @var ActivityManager|\PHPUnit\Framework\MockObject\MockObject */ /** @var ActivityManager|MockObject */
private $activityManager; private $activityManager;
/** @var ICommentsManager|\PHPUnit\Framework\MockObject\MockObject */ /** @var ICommentsManager|MockObject */
private $commentsManager; private $commentsManager;
/** @var ICommentsManager|MockObject */
private $userManager;
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
@@ -78,6 +83,7 @@ class CardServiceTest extends TestCase {
$this->attachmentService = $this->createMock(AttachmentService::class); $this->attachmentService = $this->createMock(AttachmentService::class);
$this->activityManager = $this->createMock(ActivityManager::class); $this->activityManager = $this->createMock(ActivityManager::class);
$this->commentsManager = $this->createMock(ICommentsManager::class); $this->commentsManager = $this->createMock(ICommentsManager::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->cardService = new CardService( $this->cardService = new CardService(
$this->cardMapper, $this->cardMapper,
$this->stackMapper, $this->stackMapper,
@@ -90,6 +96,7 @@ class CardServiceTest extends TestCase {
$this->attachmentService, $this->attachmentService,
$this->activityManager, $this->activityManager,
$this->commentsManager, $this->commentsManager,
$this->userManager,
'user1' 'user1'
); );
} }
@@ -107,6 +114,10 @@ class CardServiceTest extends TestCase {
} }
public function testFind() { public function testFind() {
$user = $this->createMock(IUser::class);
$this->userManager->expects($this->once())
->method('get')
->willReturn($user);
$card = new Card(); $card = new Card();
$card->setId(1337); $card->setId(1337);
$this->cardMapper->expects($this->any()) $this->cardMapper->expects($this->any())