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

Refactor class names to Assignment

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-11-04 19:39:38 +01:00
parent 082b7c1983
commit 67fe250248
18 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Activity/ActivityManager.php
View File

@@ -28,7 +28,7 @@ namespace OCA\Deck\Activity;
use InvalidArgumentException; use InvalidArgumentException;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\Attachment; use OCA\Deck\Db\Attachment;
use OCA\Deck\Db\AttachmentMapper; use OCA\Deck\Db\AttachmentMapper;
use OCA\Deck\Db\Board; use OCA\Deck\Db\Board;
@@ -471,7 +471,7 @@ class ActivityManager {
break; break;
case Attachment::class: case Attachment::class:
case Label::class: case Label::class:
case AssignedUsers::class: case Assignment::class:
$objectId = $entity->getCardId(); $objectId = $entity->getCardId();
break; break;
case IComment::class: case IComment::class:

4
lib/AppInfo/Application20.php
View File

@@ -33,7 +33,7 @@ use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
use OCA\Deck\Dashboard\DeckWidget; use OCA\Deck\Dashboard\DeckWidget;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Listeners\BeforeTemplateRenderedListener; use OCA\Deck\Listeners\BeforeTemplateRenderedListener;
@@ -132,7 +132,7 @@ class Application20 extends App implements IBootstrap {
$aclMapper->delete($acl); $aclMapper->delete($acl);
} }
// delete existing user assignments // delete existing user assignments
$assignmentMapper = $container->query(AssignedUsersMapper::class); $assignmentMapper = $container->query(AssignmentMapper::class);
$assignments = $assignmentMapper->findByUserId($user->getUID()); $assignments = $assignmentMapper->findByUserId($user->getUID());
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
$assignmentMapper->delete($assignment); $assignmentMapper->delete($assignment);

4
lib/AppInfo/ApplicationLegacy.php
View File

@@ -30,7 +30,7 @@ use OCA\Deck\Collaboration\Resources\ResourceProvider;
use OCA\Deck\Collaboration\Resources\ResourceProviderCard; use OCA\Deck\Collaboration\Resources\ResourceProviderCard;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Middleware\DefaultBoardMiddleware; use OCA\Deck\Middleware\DefaultBoardMiddleware;
@@ -113,7 +113,7 @@ class ApplicationLegacy extends App {
$aclMapper->delete($acl); $aclMapper->delete($acl);
} }
// delete existing user assignments // delete existing user assignments
$assignmentMapper = $container->query(AssignedUsersMapper::class); $assignmentMapper = $container->query(AssignmentMapper::class);
$assignments = $assignmentMapper->findByUserId($user->getUID()); $assignments = $assignmentMapper->findByUserId($user->getUID());
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
$assignmentMapper->delete($assignment); $assignmentMapper->delete($assignment);

4
lib/Command/UserExport.php
View File

@@ -23,7 +23,7 @@
namespace OCA\Deck\Command; namespace OCA\Deck\Command;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\StackMapper; use OCA\Deck\Db\StackMapper;
@@ -48,7 +48,7 @@ class UserExport extends Command {
BoardService $boardService, BoardService $boardService,
StackMapper $stackMapper, StackMapper $stackMapper,
CardMapper $cardMapper, CardMapper $cardMapper,
AssignedUsersMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
IUserManager $userManager, IUserManager $userManager,
IGroupManager $groupManager) { IGroupManager $groupManager) {
parent::__construct(); parent::__construct();

2
lib/Db/AssignedUsers.php → lib/Db/Assignment.php
View File

@@ -25,7 +25,7 @@ namespace OCA\Deck\Db;
use JsonSerializable; use JsonSerializable;
class AssignedUsers extends RelationalEntity implements JsonSerializable { class Assignment extends RelationalEntity implements JsonSerializable {
public $id; public $id;
protected $participant; protected $participant;
protected $cardId; protected $cardId;

23
lib/Db/AssignedUsersMapper.php → lib/Db/AssignmentMapper.php
View File

@@ -33,7 +33,7 @@ use OCP\IDBConnection;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IUserManager; use OCP\IUserManager;
class AssignedUsersMapper extends QBMapper implements IPermissionMapper { class AssignmentMapper extends QBMapper implements IPermissionMapper {
/** @var CardMapper */ /** @var CardMapper */
private $cardMapper; private $cardMapper;
@@ -45,7 +45,8 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper {
private $circleService; private $circleService;
public function __construct(IDBConnection $db, CardMapper $cardMapper, IUserManager $userManager, IGroupManager $groupManager, CirclesService $circleService) { public function __construct(IDBConnection $db, CardMapper $cardMapper, IUserManager $userManager, IGroupManager $groupManager, CirclesService $circleService) {
parent::__construct($db, 'deck_assigned_users', AssignedUsers::class); parent::__construct($db, 'deck_assigned_users', Assignment::class);
$this->cardMapper = $cardMapper; $this->cardMapper = $cardMapper;
$this->userManager = $userManager; $this->userManager = $userManager;
$this->groupManager = $groupManager; $this->groupManager = $groupManager;
@@ -63,7 +64,7 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper {
$qb->select('*') $qb->select('*')
->from('deck_assigned_users') ->from('deck_assigned_users')
->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId))); ->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId)));
/** @var AssignedUsers[] $users */ /** @var Assignment[] $users */
$users = $this->findEntities($qb); $users = $this->findEntities($qb);
foreach ($users as &$user) { foreach ($users as &$user) {
$this->mapParticipant($user); $this->mapParticipant($user);
@@ -76,7 +77,7 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper {
$qb->select('*') $qb->select('*')
->from('deck_assigned_users') ->from('deck_assigned_users')
->where($qb->expr()->eq('participant', $qb->createNamedParameter($uid))); ->where($qb->expr()->eq('participant', $qb->createNamedParameter($uid)));
/** @var AssignedUsers[] $users */ /** @var Assignment[] $users */
return $this->findEntities($qb); return $this->findEntities($qb);
} }
@@ -94,19 +95,21 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper {
* *
* @param Entity $entity * @param Entity $entity
* @return null|Entity * @return null|Entity
* @throws NotFoundException
*/ */
public function insert(Entity $entity): Entity { public function insert(Entity $entity): Entity {
$origin = $this->getOrigin($entity); $origin = $this->getOrigin($entity);
if ($origin === null) { if ($origin === null) {
throw new NotFoundException('No origin found for assignment'); throw new NotFoundException('No origin found for assignment');
} }
/** @var AssignedUsers $assignment */
/** @var Assignment $assignment */
$assignment = parent::insert($entity); $assignment = parent::insert($entity);
$this->mapParticipant($assignment); $this->mapParticipant($assignment);
return $assignment; return $assignment;
} }
public function mapParticipant(AssignedUsers $assignment): void { public function mapParticipant(Assignment $assignment): void {
$self = $this; $self = $this;
$assignment->resolveRelation('participant', function () use (&$self, &$assignment) { $assignment->resolveRelation('participant', function () use (&$self, &$assignment) {
return $self->getOrigin($assignment); return $self->getOrigin($assignment);
@@ -115,7 +118,7 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper {
public function isUserAssigned($cardId, $userId): bool { public function isUserAssigned($cardId, $userId): bool {
$assignments = $this->find($cardId); $assignments = $this->find($cardId);
/** @var AssignedUsers $assignment */ /** @var Assignment $assignment */
foreach ($assignments as $assignment) { foreach ($assignments as $assignment) {
$origin = $this->getOrigin($assignment); $origin = $this->getOrigin($assignment);
if ($origin instanceof User && $assignment->getParticipant() === $userId) { if ($origin instanceof User && $assignment->getParticipant() === $userId) {
@@ -132,12 +135,12 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper {
return false; return false;
} }
private function getOrigin(AssignedUsers $assignment) { private function getOrigin(Assignment $assignment) {
if ($assignment->getType() === AssignedUsers::TYPE_USER) { if ($assignment->getType() === Assignment::TYPE_USER) {
$origin = $this->userManager->get($assignment->getParticipant()); $origin = $this->userManager->get($assignment->getParticipant());
return $origin ? new User($origin) : null; return $origin ? new User($origin) : null;
} }
if ($assignment->getType() === AssignedUsers::TYPE_GROUP) { if ($assignment->getType() === Assignment::TYPE_GROUP) {
$origin = $this->groupManager->get($assignment->getParticipant()); $origin = $this->groupManager->get($assignment->getParticipant());
return $origin ? new Group($origin) : null; return $origin ? new Group($origin) : null;
} }

14
lib/Service/AssignmentService.php
View File

@@ -27,8 +27,8 @@ use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\BadRequestException; use OCA\Deck\BadRequestException;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
use OCA\Deck\Event\FTSEvent; use OCA\Deck\Event\FTSEvent;
@@ -51,7 +51,7 @@ class AssignmentService {
*/ */
private $cardMapper; private $cardMapper;
/** /**
* @var AssignedUsersMapper * @var AssignmentMapper
*/ */
private $assignedUsersMapper; private $assignedUsersMapper;
/** /**
@@ -78,7 +78,7 @@ class AssignmentService {
public function __construct( public function __construct(
PermissionService $permissionService, PermissionService $permissionService,
CardMapper $cardMapper, CardMapper $cardMapper,
AssignedUsersMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
AclMapper $aclMapper, AclMapper $aclMapper,
NotificationHelper $notificationHelper, NotificationHelper $notificationHelper,
ActivityManager $activityManager, ActivityManager $activityManager,
@@ -106,7 +106,7 @@ class AssignmentService {
* @throws MultipleObjectsReturnedException * @throws MultipleObjectsReturnedException
* @throws DoesNotExistException * @throws DoesNotExistException
*/ */
public function assignUser($cardId, $userId, int $type = AssignedUsers::TYPE_USER) { public function assignUser($cardId, $userId, int $type = Assignment::TYPE_USER) {
if (is_numeric($cardId) === false) { if (is_numeric($cardId) === false) {
throw new BadRequestException('card id must be a number'); throw new BadRequestException('card id must be a number');
} }
@@ -115,7 +115,7 @@ class AssignmentService {
throw new BadRequestException('user id must be provided'); throw new BadRequestException('user id must be provided');
} }
if ($type !== AssignedUsers::TYPE_USER && $type !== AssignedUsers::TYPE_GROUP) { if ($type !== Assignment::TYPE_USER && $type !== Assignment::TYPE_GROUP) {
throw new BadRequestException('Invalid type provided for assignemnt'); throw new BadRequestException('Invalid type provided for assignemnt');
} }
@@ -143,7 +143,7 @@ class AssignmentService {
$this->notificationHelper->sendCardAssigned($card, $userId); $this->notificationHelper->sendCardAssigned($card, $userId);
} }
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId($cardId); $assignment->setCardId($cardId);
$assignment->setParticipant($userId); $assignment->setParticipant($userId);
$assignment->setType($type); $assignment->setType($type);

4
lib/Service/BoardService.php
View File

@@ -29,7 +29,7 @@ use OCA\Deck\Activity\ChangeSet;
use OCA\Deck\AppInfo\Application; use OCA\Deck\AppInfo\Application;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
use OCA\Deck\Db\IPermissionMapper; use OCA\Deck\Db\IPermissionMapper;
use OCA\Deck\Db\Label; use OCA\Deck\Db\Label;
@@ -80,7 +80,7 @@ class BoardService {
AclMapper $aclMapper, AclMapper $aclMapper,
PermissionService $permissionService, PermissionService $permissionService,
NotificationHelper $notificationHelper, NotificationHelper $notificationHelper,
AssignedUsersMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
IUserManager $userManager, IUserManager $userManager,
IGroupManager $groupManager, IGroupManager $groupManager,
ActivityManager $activityManager, ActivityManager $activityManager,

8
lib/Service/CardService.php
View File

@@ -28,7 +28,7 @@ namespace OCA\Deck\Service;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Activity\ChangeSet; use OCA\Deck\Activity\ChangeSet;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
@@ -69,7 +69,7 @@ class CardService {
PermissionService $permissionService, PermissionService $permissionService,
BoardService $boardService, BoardService $boardService,
NotificationHelper $notificationHelper, NotificationHelper $notificationHelper,
AssignedUsersMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
AttachmentService $attachmentService, AttachmentService $attachmentService,
ActivityManager $activityManager, ActivityManager $activityManager,
ICommentsManager $commentsManager, ICommentsManager $commentsManager,
@@ -590,7 +590,7 @@ class CardService {
*/ */
public function findAllWithDue($userId) { public function findAllWithDue($userId) {
$cards = $this->cardMapper->findAllWithDue($userId); $cards = $this->cardMapper->findAllWithDue($userId);
return $cards; return $cards;
} }
@@ -602,7 +602,7 @@ class CardService {
*/ */
public function findAssignedCards($userId) { public function findAssignedCards($userId) {
$cards = $this->cardMapper->findAssignedCards($userId); $cards = $this->cardMapper->findAssignedCards($userId);
return $cards; return $cards;
} }
} }

6
lib/Service/OverviewService.php
View File

@@ -27,7 +27,7 @@ declare(strict_types=1);
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCP\Comments\ICommentsManager; use OCP\Comments\ICommentsManager;
@@ -45,7 +45,7 @@ class OverviewService {
private $labelMapper; private $labelMapper;
/** @var CardMapper */ /** @var CardMapper */
private $cardMapper; private $cardMapper;
/** @var AssignedUsersMapper */ /** @var AssignmentMapper */
private $assignedUsersMapper; private $assignedUsersMapper;
/** @var IUserManager */ /** @var IUserManager */
private $userManager; private $userManager;
@@ -60,7 +60,7 @@ class OverviewService {
BoardMapper $boardMapper, BoardMapper $boardMapper,
LabelMapper $labelMapper, LabelMapper $labelMapper,
CardMapper $cardMapper, CardMapper $cardMapper,
AssignedUsersMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
IUserManager $userManager, IUserManager $userManager,
IGroupManager $groupManager, IGroupManager $groupManager,
ICommentsManager $commentsManager, ICommentsManager $commentsManager,

4
lib/Service/StackService.php
View File

@@ -28,7 +28,7 @@ use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Activity\ChangeSet; use OCA\Deck\Activity\ChangeSet;
use OCA\Deck\BadRequestException; use OCA\Deck\BadRequestException;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
@@ -62,7 +62,7 @@ class StackService {
PermissionService $permissionService, PermissionService $permissionService,
BoardService $boardService, BoardService $boardService,
CardService $cardService, CardService $cardService,
AssignedUsersMapper $assignedUsersMapper, AssignmentMapper $assignedUsersMapper,
AttachmentService $attachmentService, AttachmentService $attachmentService,
ActivityManager $activityManager, ActivityManager $activityManager,
EventDispatcherInterface $eventDispatcher, EventDispatcherInterface $eventDispatcher,

22
tests/integration/database/AssignedUsersMapperTest.php → tests/integration/database/AssignmentMapperTest.php
View File

@@ -31,9 +31,9 @@ use OCA\Deck\Service\CardService;
/** /**
* @group DB * @group DB
* @coversDefaultClass OCA\Deck\Db\AssignedUsersMapper * @coversDefaultClass \OCA\Deck\Db\AssignmentMapper
*/ */
class AssignedUsersMapperTest extends \Test\TestCase { class AssignmentMapperTest extends \Test\TestCase {
private const TEST_USER1 = 'test-share-user1'; private const TEST_USER1 = 'test-share-user1';
private const TEST_USER3 = 'test-share-user3'; private const TEST_USER3 = 'test-share-user3';
private const TEST_USER2 = 'test-share-user2'; private const TEST_USER2 = 'test-share-user2';
@@ -46,7 +46,7 @@ class AssignedUsersMapperTest extends \Test\TestCase {
protected $cardService; protected $cardService;
/** @var StackService */ /** @var StackService */
protected $stackService; protected $stackService;
/** @var AssignedUsersMapper */ /** @var AssignmentMapper */
protected $assignedUsersMapper; protected $assignedUsersMapper;
/** @var AssignmentService */ /** @var AssignmentService */
private $assignmentService; private $assignmentService;
@@ -85,7 +85,7 @@ class AssignedUsersMapperTest extends \Test\TestCase {
$this->stackService = \OC::$server->query(StackService::class); $this->stackService = \OC::$server->query(StackService::class);
$this->cardService = \OC::$server->query(CardService::class); $this->cardService = \OC::$server->query(CardService::class);
$this->assignmentService = \OC::$server->query(AssignmentService::class); $this->assignmentService = \OC::$server->query(AssignmentService::class);
$this->assignedUsersMapper = \OC::$server->query(AssignedUsersMapper::class); $this->assignedUsersMapper = \OC::$server->query(AssignmentMapper::class);
$this->createBoardWithExampleData(); $this->createBoardWithExampleData();
} }
@@ -146,10 +146,10 @@ class AssignedUsersMapperTest extends \Test\TestCase {
* @covers ::insert * @covers ::insert
*/ */
public function testInsert() { public function testInsert() {
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId($this->cards[1]->getId()); $assignment->setCardId($this->cards[1]->getId());
$assignment->setParticipant(self::TEST_USER4); $assignment->setParticipant(self::TEST_USER4);
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$this->assignedUsersMapper->insert($assignment); $this->assignedUsersMapper->insert($assignment);
$actual = $this->assignedUsersMapper->find($this->cards[1]->getId()); $actual = $this->assignedUsersMapper->find($this->cards[1]->getId());
@@ -162,7 +162,7 @@ class AssignedUsersMapperTest extends \Test\TestCase {
* @covers ::insert * @covers ::insert
*/ */
public function testInsertInvalidUser() { public function testInsertInvalidUser() {
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId($this->cards[1]->getId()); $assignment->setCardId($this->cards[1]->getId());
$assignment->setParticipant('invalid-username'); $assignment->setParticipant('invalid-username');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(AssignedUsers::TYPE_USER);
@@ -174,17 +174,17 @@ class AssignedUsersMapperTest extends \Test\TestCase {
* @covers ::mapParticipant * @covers ::mapParticipant
*/ */
public function testMapParticipant() { public function testMapParticipant() {
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId($this->cards[1]->getId()); $assignment->setCardId($this->cards[1]->getId());
$assignment->setParticipant(self::TEST_USER4); $assignment->setParticipant(self::TEST_USER4);
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$this->assignedUsersMapper->mapParticipant($assignment); $this->assignedUsersMapper->mapParticipant($assignment);
$this->assertInstanceOf(User::class, $assignment->resolveParticipant()); $this->assertInstanceOf(User::class, $assignment->resolveParticipant());
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId($this->cards[1]->getId()); $assignment->setCardId($this->cards[1]->getId());
$assignment->setParticipant('invalid-username'); $assignment->setParticipant('invalid-username');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$this->assignedUsersMapper->mapParticipant($assignment); $this->assignedUsersMapper->mapParticipant($assignment);
$this->assertEquals('invalid-username', $assignment->resolveParticipant()); $this->assertEquals('invalid-username', $assignment->resolveParticipant());
} }

4
tests/unit/Activity/ActivityManagerTest.php
View File

@@ -24,7 +24,7 @@
namespace OCA\Deck\Activity; namespace OCA\Deck\Activity;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\Attachment; use OCA\Deck\Db\Attachment;
use OCA\Deck\Db\AttachmentMapper; use OCA\Deck\Db\AttachmentMapper;
use OCA\Deck\Db\Board; use OCA\Deck\Db\Board;
@@ -210,7 +210,7 @@ class ActivityManagerTest extends TestCase {
$label = new Label(); $label = new Label();
$label->setCardId(3); $label->setCardId(3);
$label->setBoardId(1); $label->setBoardId(1);
$assignedUser = new AssignedUsers(); $assignedUser = new Assignment();
$assignedUser->setCardId(3); $assignedUser->setCardId(3);
return [ return [

4
tests/unit/Command/UserExportTest.php
View File

@@ -23,7 +23,7 @@
namespace OCA\Deck\Command; namespace OCA\Deck\Command;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Board; use OCA\Deck\Db\Board;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
@@ -53,7 +53,7 @@ class UserExportTest extends \Test\TestCase {
$this->boardService= $this->createMock(BoardService::class); $this->boardService= $this->createMock(BoardService::class);
$this->stackMapper= $this->createMock(StackMapper::class); $this->stackMapper= $this->createMock(StackMapper::class);
$this->cardMapper= $this->createMock(CardMapper::class); $this->cardMapper= $this->createMock(CardMapper::class);
$this->assignedUserMapper= $this->createMock(AssignedUsersMapper::class); $this->assignedUserMapper= $this->createMock(AssignmentMapper::class);
$this->userManager = $this->createMock(IUserManager::class); $this->userManager = $this->createMock(IUserManager::class);
$this->groupManager = $this->createMock(IGroupManager::class); $this->groupManager = $this->createMock(IGroupManager::class);
$this->userExport = new UserExport($this->boardMapper, $this->boardService, $this->stackMapper, $this->cardMapper, $this->assignedUserMapper, $this->userManager, $this->groupManager); $this->userExport = new UserExport($this->boardMapper, $this->boardService, $this->stackMapper, $this->cardMapper, $this->assignedUserMapper, $this->userManager, $this->groupManager);

28
tests/unit/Service/AssignmentServiceTest.php
View File

@@ -26,8 +26,8 @@ namespace OCA\Deck\Service;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\BadRequestException; use OCA\Deck\BadRequestException;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
use OCA\Deck\NotFoundException; use OCA\Deck\NotFoundException;
@@ -49,7 +49,7 @@ class AssignmentServiceTest extends TestCase {
*/ */
private $cardMapper; private $cardMapper;
/** /**
* @var MockObject|AssignedUsersMapper * @var MockObject|AssignmentMapper
*/ */
private $assignedUsersMapper; private $assignedUsersMapper;
/** /**
@@ -83,7 +83,7 @@ class AssignmentServiceTest extends TestCase {
$this->permissionService = $this->createMock(PermissionService::class); $this->permissionService = $this->createMock(PermissionService::class);
$this->cardMapper = $this->createMock(CardMapper::class); $this->cardMapper = $this->createMock(CardMapper::class);
$this->notificationHelper = $this->createMock(NotificationHelper::class); $this->notificationHelper = $this->createMock(NotificationHelper::class);
$this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class); $this->assignedUsersMapper = $this->createMock(AssignmentMapper::class);
$this->activityManager = $this->createMock(ActivityManager::class); $this->activityManager = $this->createMock(ActivityManager::class);
$this->eventDispatcher = $this->createMock(IEventDispatcher::class); $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
$this->changeHelper = $this->createMock(ChangeHelper::class); $this->changeHelper = $this->createMock(ChangeHelper::class);
@@ -118,10 +118,10 @@ class AssignmentServiceTest extends TestCase {
->method('find') ->method('find')
->with(123) ->with(123)
->willReturn($assignments); ->willReturn($assignments);
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId(123); $assignment->setCardId(123);
$assignment->setParticipant('admin'); $assignment->setParticipant('admin');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$this->cardMapper->expects($this->once()) $this->cardMapper->expects($this->once())
->method('findBoardId') ->method('findBoardId')
->willReturn(1); ->willReturn(1);
@@ -148,10 +148,10 @@ class AssignmentServiceTest extends TestCase {
->method('find') ->method('find')
->with(123) ->with(123)
->willReturn($assignments); ->willReturn($assignments);
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId(123); $assignment->setCardId(123);
$assignment->setParticipant('admin'); $assignment->setParticipant('admin');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$this->cardMapper->expects($this->once()) $this->cardMapper->expects($this->once())
->method('findBoardId') ->method('findBoardId')
->willReturn(1); ->willReturn(1);
@@ -168,10 +168,10 @@ class AssignmentServiceTest extends TestCase {
public function testAssignUserExisting() { public function testAssignUserExisting() {
$this->expectException(BadRequestException::class); $this->expectException(BadRequestException::class);
$this->expectExceptionMessage('The user is already assigned to the card'); $this->expectExceptionMessage('The user is already assigned to the card');
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId(123); $assignment->setCardId(123);
$assignment->setParticipant('admin'); $assignment->setParticipant('admin');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$assignments = [ $assignments = [
$assignment $assignment
]; ];
@@ -184,10 +184,10 @@ class AssignmentServiceTest extends TestCase {
} }
public function testUnassignUserExisting() { public function testUnassignUserExisting() {
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId(123); $assignment->setCardId(123);
$assignment->setParticipant('admin'); $assignment->setParticipant('admin');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$assignments = [ $assignments = [
$assignment $assignment
]; ];
@@ -205,10 +205,10 @@ class AssignmentServiceTest extends TestCase {
public function testUnassignUserNotExisting() { public function testUnassignUserNotExisting() {
$this->expectException(NotFoundException::class); $this->expectException(NotFoundException::class);
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setCardId(123); $assignment->setCardId(123);
$assignment->setParticipant('admin'); $assignment->setParticipant('admin');
$assignment->setType(AssignedUsers::TYPE_USER); $assignment->setType(Assignment::TYPE_USER);
$assignments = [ $assignments = [
$assignment $assignment
]; ];

10
tests/unit/Service/BoardServiceTest.php
View File

@@ -27,8 +27,8 @@ use OC\L10N\L10N;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Db\Acl; use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper; use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\AssignedUsers; use OCA\Deck\Db\Assignment;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Board; use OCA\Deck\Db\Board;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
@@ -61,7 +61,7 @@ class BoardServiceTest extends TestCase {
private $permissionService; private $permissionService;
/** @var NotificationHelper */ /** @var NotificationHelper */
private $notificationHelper; private $notificationHelper;
/** @var AssignedUsersMapper */ /** @var AssignmentMapper */
private $assignedUsersMapper; private $assignedUsersMapper;
/** @var IUserManager */ /** @var IUserManager */
private $userManager; private $userManager;
@@ -85,7 +85,7 @@ class BoardServiceTest extends TestCase {
$this->labelMapper = $this->createMock(LabelMapper::class); $this->labelMapper = $this->createMock(LabelMapper::class);
$this->permissionService = $this->createMock(PermissionService::class); $this->permissionService = $this->createMock(PermissionService::class);
$this->notificationHelper = $this->createMock(NotificationHelper::class); $this->notificationHelper = $this->createMock(NotificationHelper::class);
$this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class); $this->assignedUsersMapper = $this->createMock(AssignmentMapper::class);
$this->userManager = $this->createMock(IUserManager::class); $this->userManager = $this->createMock(IUserManager::class);
$this->groupManager = $this->createMock(IGroupManager::class); $this->groupManager = $this->createMock(IGroupManager::class);
$this->activityManager = $this->createMock(ActivityManager::class); $this->activityManager = $this->createMock(ActivityManager::class);
@@ -390,7 +390,7 @@ class BoardServiceTest extends TestCase {
->method('find') ->method('find')
->with(123) ->with(123)
->willReturn($acl); ->willReturn($acl);
$assignment = new AssignedUsers(); $assignment = new Assignment();
$assignment->setParticipant('admin'); $assignment->setParticipant('admin');
$this->assignedUsersMapper->expects($this->once()) $this->assignedUsersMapper->expects($this->once())
->method('findByUserId') ->method('findByUserId')

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

@@ -24,7 +24,7 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\ChangeHelper;
@@ -54,7 +54,7 @@ class CardServiceTest extends TestCase {
private $permissionService; private $permissionService;
/** @var NotificationHelper */ /** @var NotificationHelper */
private $notificationHelper; private $notificationHelper;
/** @var AssignedUsersMapper|MockObject */ /** @var AssignmentMapper|MockObject */
private $assignedUsersMapper; private $assignedUsersMapper;
/** @var BoardService|MockObject */ /** @var BoardService|MockObject */
private $boardService; private $boardService;
@@ -83,7 +83,7 @@ class CardServiceTest extends TestCase {
$this->permissionService = $this->createMock(PermissionService::class); $this->permissionService = $this->createMock(PermissionService::class);
$this->boardService = $this->createMock(BoardService::class); $this->boardService = $this->createMock(BoardService::class);
$this->notificationHelper = $this->createMock(NotificationHelper::class); $this->notificationHelper = $this->createMock(NotificationHelper::class);
$this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class); $this->assignedUsersMapper = $this->createMock(AssignmentMapper::class);
$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);

6
tests/unit/Service/StackServiceTest.php
View File

@@ -24,7 +24,7 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ActivityManager;
use OCA\Deck\Db\AssignedUsersMapper; use OCA\Deck\Db\AssignmentMapper;
use OCA\Deck\Db\Card; use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\BoardMapper;
@@ -56,7 +56,7 @@ class StackServiceTest extends TestCase {
private $labelMapper; private $labelMapper;
/** @var \PHPUnit\Framework\MockObject\MockObject|PermissionService */ /** @var \PHPUnit\Framework\MockObject\MockObject|PermissionService */
private $permissionService; private $permissionService;
/** @var AssignedUsersMapper|\PHPUnit\Framework\MockObject\MockObject */ /** @var AssignmentMapper|\PHPUnit\Framework\MockObject\MockObject */
private $assignedUsersMapper; private $assignedUsersMapper;
/** @var AttachmentService|\PHPUnit\Framework\MockObject\MockObject */ /** @var AttachmentService|\PHPUnit\Framework\MockObject\MockObject */
private $attachmentService; private $attachmentService;
@@ -79,7 +79,7 @@ class StackServiceTest extends TestCase {
$this->permissionService = $this->createMock(PermissionService::class); $this->permissionService = $this->createMock(PermissionService::class);
$this->boardService = $this->createMock(BoardService::class); $this->boardService = $this->createMock(BoardService::class);
$this->cardService = $this->createMock(CardService::class); $this->cardService = $this->createMock(CardService::class);
$this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class); $this->assignedUsersMapper = $this->createMock(AssignmentMapper::class);
$this->attachmentService = $this->createMock(AttachmentService::class); $this->attachmentService = $this->createMock(AttachmentService::class);
$this->labelMapper = $this->createMock(LabelMapper::class); $this->labelMapper = $this->createMock(LabelMapper::class);
$this->activityManager = $this->createMock(ActivityManager::class); $this->activityManager = $this->createMock(ActivityManager::class);