diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php index 6ad70294b..9d282fdd6 100644 --- a/lib/Activity/ActivityManager.php +++ b/lib/Activity/ActivityManager.php @@ -28,7 +28,7 @@ namespace OCA\Deck\Activity; use InvalidArgumentException; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsers; +use OCA\Deck\Db\Assignment; use OCA\Deck\Db\Attachment; use OCA\Deck\Db\AttachmentMapper; use OCA\Deck\Db\Board; @@ -471,7 +471,7 @@ class ActivityManager { break; case Attachment::class: case Label::class: - case AssignedUsers::class: + case Assignment::class: $objectId = $entity->getCardId(); break; case IComment::class: diff --git a/lib/AppInfo/Application20.php b/lib/AppInfo/Application20.php index 19e5475ed..4e37e58ef 100644 --- a/lib/AppInfo/Application20.php +++ b/lib/AppInfo/Application20.php @@ -33,7 +33,7 @@ use OCA\Deck\Collaboration\Resources\ResourceProviderCard; use OCA\Deck\Dashboard\DeckWidget; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Listeners\BeforeTemplateRenderedListener; @@ -132,7 +132,7 @@ class Application20 extends App implements IBootstrap { $aclMapper->delete($acl); } // delete existing user assignments - $assignmentMapper = $container->query(AssignedUsersMapper::class); + $assignmentMapper = $container->query(AssignmentMapper::class); $assignments = $assignmentMapper->findByUserId($user->getUID()); foreach ($assignments as $assignment) { $assignmentMapper->delete($assignment); diff --git a/lib/AppInfo/ApplicationLegacy.php b/lib/AppInfo/ApplicationLegacy.php index eec44dd4b..7c12c4a78 100644 --- a/lib/AppInfo/ApplicationLegacy.php +++ b/lib/AppInfo/ApplicationLegacy.php @@ -30,7 +30,7 @@ use OCA\Deck\Collaboration\Resources\ResourceProvider; use OCA\Deck\Collaboration\Resources\ResourceProviderCard; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Middleware\DefaultBoardMiddleware; @@ -113,7 +113,7 @@ class ApplicationLegacy extends App { $aclMapper->delete($acl); } // delete existing user assignments - $assignmentMapper = $container->query(AssignedUsersMapper::class); + $assignmentMapper = $container->query(AssignmentMapper::class); $assignments = $assignmentMapper->findByUserId($user->getUID()); foreach ($assignments as $assignment) { $assignmentMapper->delete($assignment); diff --git a/lib/Command/UserExport.php b/lib/Command/UserExport.php index 61ec06396..b40659ad9 100644 --- a/lib/Command/UserExport.php +++ b/lib/Command/UserExport.php @@ -23,7 +23,7 @@ namespace OCA\Deck\Command; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\StackMapper; @@ -48,7 +48,7 @@ class UserExport extends Command { BoardService $boardService, StackMapper $stackMapper, CardMapper $cardMapper, - AssignedUsersMapper $assignedUsersMapper, + AssignmentMapper $assignedUsersMapper, IUserManager $userManager, IGroupManager $groupManager) { parent::__construct(); diff --git a/lib/Db/AssignedUsers.php b/lib/Db/Assignment.php similarity index 94% rename from lib/Db/AssignedUsers.php rename to lib/Db/Assignment.php index 319c3bd95..56207d36a 100644 --- a/lib/Db/AssignedUsers.php +++ b/lib/Db/Assignment.php @@ -25,7 +25,7 @@ namespace OCA\Deck\Db; use JsonSerializable; -class AssignedUsers extends RelationalEntity implements JsonSerializable { +class Assignment extends RelationalEntity implements JsonSerializable { public $id; protected $participant; protected $cardId; diff --git a/lib/Db/AssignedUsersMapper.php b/lib/Db/AssignmentMapper.php similarity index 88% rename from lib/Db/AssignedUsersMapper.php rename to lib/Db/AssignmentMapper.php index 025570055..61dd4a485 100644 --- a/lib/Db/AssignedUsersMapper.php +++ b/lib/Db/AssignmentMapper.php @@ -33,7 +33,7 @@ use OCP\IDBConnection; use OCP\IGroupManager; use OCP\IUserManager; -class AssignedUsersMapper extends QBMapper implements IPermissionMapper { +class AssignmentMapper extends QBMapper implements IPermissionMapper { /** @var CardMapper */ private $cardMapper; @@ -45,7 +45,8 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper { private $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->userManager = $userManager; $this->groupManager = $groupManager; @@ -63,7 +64,7 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper { $qb->select('*') ->from('deck_assigned_users') ->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId))); - /** @var AssignedUsers[] $users */ + /** @var Assignment[] $users */ $users = $this->findEntities($qb); foreach ($users as &$user) { $this->mapParticipant($user); @@ -76,7 +77,7 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper { $qb->select('*') ->from('deck_assigned_users') ->where($qb->expr()->eq('participant', $qb->createNamedParameter($uid))); - /** @var AssignedUsers[] $users */ + /** @var Assignment[] $users */ return $this->findEntities($qb); } @@ -94,19 +95,21 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper { * * @param Entity $entity * @return null|Entity + * @throws NotFoundException */ public function insert(Entity $entity): Entity { $origin = $this->getOrigin($entity); if ($origin === null) { throw new NotFoundException('No origin found for assignment'); } - /** @var AssignedUsers $assignment */ + + /** @var Assignment $assignment */ $assignment = parent::insert($entity); $this->mapParticipant($assignment); return $assignment; } - public function mapParticipant(AssignedUsers $assignment): void { + public function mapParticipant(Assignment $assignment): void { $self = $this; $assignment->resolveRelation('participant', function () use (&$self, &$assignment) { return $self->getOrigin($assignment); @@ -115,7 +118,7 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper { public function isUserAssigned($cardId, $userId): bool { $assignments = $this->find($cardId); - /** @var AssignedUsers $assignment */ + /** @var Assignment $assignment */ foreach ($assignments as $assignment) { $origin = $this->getOrigin($assignment); if ($origin instanceof User && $assignment->getParticipant() === $userId) { @@ -132,12 +135,12 @@ class AssignedUsersMapper extends QBMapper implements IPermissionMapper { return false; } - private function getOrigin(AssignedUsers $assignment) { - if ($assignment->getType() === AssignedUsers::TYPE_USER) { + private function getOrigin(Assignment $assignment) { + if ($assignment->getType() === Assignment::TYPE_USER) { $origin = $this->userManager->get($assignment->getParticipant()); return $origin ? new User($origin) : null; } - if ($assignment->getType() === AssignedUsers::TYPE_GROUP) { + if ($assignment->getType() === Assignment::TYPE_GROUP) { $origin = $this->groupManager->get($assignment->getParticipant()); return $origin ? new Group($origin) : null; } diff --git a/lib/Service/AssignmentService.php b/lib/Service/AssignmentService.php index b3210bc44..64c1266e3 100644 --- a/lib/Service/AssignmentService.php +++ b/lib/Service/AssignmentService.php @@ -27,8 +27,8 @@ use OCA\Deck\Activity\ActivityManager; use OCA\Deck\BadRequestException; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsers; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\Assignment; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Event\FTSEvent; @@ -51,7 +51,7 @@ class AssignmentService { */ private $cardMapper; /** - * @var AssignedUsersMapper + * @var AssignmentMapper */ private $assignedUsersMapper; /** @@ -78,7 +78,7 @@ class AssignmentService { public function __construct( PermissionService $permissionService, CardMapper $cardMapper, - AssignedUsersMapper $assignedUsersMapper, + AssignmentMapper $assignedUsersMapper, AclMapper $aclMapper, NotificationHelper $notificationHelper, ActivityManager $activityManager, @@ -106,7 +106,7 @@ class AssignmentService { * @throws MultipleObjectsReturnedException * @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) { throw new BadRequestException('card id must be a number'); } @@ -115,7 +115,7 @@ class AssignmentService { 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'); } @@ -143,7 +143,7 @@ class AssignmentService { $this->notificationHelper->sendCardAssigned($card, $userId); } - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId($cardId); $assignment->setParticipant($userId); $assignment->setType($type); diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index cdc348119..7ab87f9cb 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -29,7 +29,7 @@ use OCA\Deck\Activity\ChangeSet; use OCA\Deck\AppInfo\Application; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\Db\IPermissionMapper; use OCA\Deck\Db\Label; @@ -80,7 +80,7 @@ class BoardService { AclMapper $aclMapper, PermissionService $permissionService, NotificationHelper $notificationHelper, - AssignedUsersMapper $assignedUsersMapper, + AssignmentMapper $assignedUsersMapper, IUserManager $userManager, IGroupManager $groupManager, ActivityManager $activityManager, diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php index 030c10e5c..0e2d1ead7 100644 --- a/lib/Service/CardService.php +++ b/lib/Service/CardService.php @@ -28,7 +28,7 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ChangeSet; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Card; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\Acl; @@ -69,7 +69,7 @@ class CardService { PermissionService $permissionService, BoardService $boardService, NotificationHelper $notificationHelper, - AssignedUsersMapper $assignedUsersMapper, + AssignmentMapper $assignedUsersMapper, AttachmentService $attachmentService, ActivityManager $activityManager, ICommentsManager $commentsManager, @@ -590,7 +590,7 @@ class CardService { */ public function findAllWithDue($userId) { $cards = $this->cardMapper->findAllWithDue($userId); - + return $cards; } @@ -602,7 +602,7 @@ class CardService { */ public function findAssignedCards($userId) { $cards = $this->cardMapper->findAssignedCards($userId); - + return $cards; } } diff --git a/lib/Service/OverviewService.php b/lib/Service/OverviewService.php index 8099108e6..a5df16d69 100644 --- a/lib/Service/OverviewService.php +++ b/lib/Service/OverviewService.php @@ -27,7 +27,7 @@ declare(strict_types=1); namespace OCA\Deck\Service; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Card; use OCA\Deck\Db\CardMapper; use OCP\Comments\ICommentsManager; @@ -45,7 +45,7 @@ class OverviewService { private $labelMapper; /** @var CardMapper */ private $cardMapper; - /** @var AssignedUsersMapper */ + /** @var AssignmentMapper */ private $assignedUsersMapper; /** @var IUserManager */ private $userManager; @@ -60,7 +60,7 @@ class OverviewService { BoardMapper $boardMapper, LabelMapper $labelMapper, CardMapper $cardMapper, - AssignedUsersMapper $assignedUsersMapper, + AssignmentMapper $assignedUsersMapper, IUserManager $userManager, IGroupManager $groupManager, ICommentsManager $commentsManager, diff --git a/lib/Service/StackService.php b/lib/Service/StackService.php index a31d13854..8178d1423 100644 --- a/lib/Service/StackService.php +++ b/lib/Service/StackService.php @@ -28,7 +28,7 @@ use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Activity\ChangeSet; use OCA\Deck\BadRequestException; use OCA\Deck\Db\Acl; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\ChangeHelper; @@ -62,7 +62,7 @@ class StackService { PermissionService $permissionService, BoardService $boardService, CardService $cardService, - AssignedUsersMapper $assignedUsersMapper, + AssignmentMapper $assignedUsersMapper, AttachmentService $attachmentService, ActivityManager $activityManager, EventDispatcherInterface $eventDispatcher, diff --git a/tests/integration/database/AssignedUsersMapperTest.php b/tests/integration/database/AssignmentMapperTest.php similarity index 94% rename from tests/integration/database/AssignedUsersMapperTest.php rename to tests/integration/database/AssignmentMapperTest.php index 5a6a949ce..e593a5d6b 100644 --- a/tests/integration/database/AssignedUsersMapperTest.php +++ b/tests/integration/database/AssignmentMapperTest.php @@ -31,9 +31,9 @@ use OCA\Deck\Service\CardService; /** * @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_USER3 = 'test-share-user3'; private const TEST_USER2 = 'test-share-user2'; @@ -46,7 +46,7 @@ class AssignedUsersMapperTest extends \Test\TestCase { protected $cardService; /** @var StackService */ protected $stackService; - /** @var AssignedUsersMapper */ + /** @var AssignmentMapper */ protected $assignedUsersMapper; /** @var AssignmentService */ private $assignmentService; @@ -85,7 +85,7 @@ class AssignedUsersMapperTest extends \Test\TestCase { $this->stackService = \OC::$server->query(StackService::class); $this->cardService = \OC::$server->query(CardService::class); $this->assignmentService = \OC::$server->query(AssignmentService::class); - $this->assignedUsersMapper = \OC::$server->query(AssignedUsersMapper::class); + $this->assignedUsersMapper = \OC::$server->query(AssignmentMapper::class); $this->createBoardWithExampleData(); } @@ -146,10 +146,10 @@ class AssignedUsersMapperTest extends \Test\TestCase { * @covers ::insert */ public function testInsert() { - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId($this->cards[1]->getId()); $assignment->setParticipant(self::TEST_USER4); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $this->assignedUsersMapper->insert($assignment); $actual = $this->assignedUsersMapper->find($this->cards[1]->getId()); @@ -162,7 +162,7 @@ class AssignedUsersMapperTest extends \Test\TestCase { * @covers ::insert */ public function testInsertInvalidUser() { - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId($this->cards[1]->getId()); $assignment->setParticipant('invalid-username'); $assignment->setType(AssignedUsers::TYPE_USER); @@ -174,17 +174,17 @@ class AssignedUsersMapperTest extends \Test\TestCase { * @covers ::mapParticipant */ public function testMapParticipant() { - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId($this->cards[1]->getId()); $assignment->setParticipant(self::TEST_USER4); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $this->assignedUsersMapper->mapParticipant($assignment); $this->assertInstanceOf(User::class, $assignment->resolveParticipant()); - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId($this->cards[1]->getId()); $assignment->setParticipant('invalid-username'); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $this->assignedUsersMapper->mapParticipant($assignment); $this->assertEquals('invalid-username', $assignment->resolveParticipant()); } diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php index a93177e35..e91ca6cae 100644 --- a/tests/unit/Activity/ActivityManagerTest.php +++ b/tests/unit/Activity/ActivityManagerTest.php @@ -24,7 +24,7 @@ namespace OCA\Deck\Activity; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsers; +use OCA\Deck\Db\Assignment; use OCA\Deck\Db\Attachment; use OCA\Deck\Db\AttachmentMapper; use OCA\Deck\Db\Board; @@ -210,7 +210,7 @@ class ActivityManagerTest extends TestCase { $label = new Label(); $label->setCardId(3); $label->setBoardId(1); - $assignedUser = new AssignedUsers(); + $assignedUser = new Assignment(); $assignedUser->setCardId(3); return [ diff --git a/tests/unit/Command/UserExportTest.php b/tests/unit/Command/UserExportTest.php index 5527dba84..e8eb39527 100644 --- a/tests/unit/Command/UserExportTest.php +++ b/tests/unit/Command/UserExportTest.php @@ -23,7 +23,7 @@ namespace OCA\Deck\Command; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Board; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\Card; @@ -53,7 +53,7 @@ class UserExportTest extends \Test\TestCase { $this->boardService= $this->createMock(BoardService::class); $this->stackMapper= $this->createMock(StackMapper::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->groupManager = $this->createMock(IGroupManager::class); $this->userExport = new UserExport($this->boardMapper, $this->boardService, $this->stackMapper, $this->cardMapper, $this->assignedUserMapper, $this->userManager, $this->groupManager); diff --git a/tests/unit/Service/AssignmentServiceTest.php b/tests/unit/Service/AssignmentServiceTest.php index 257f3706a..e12f3398e 100644 --- a/tests/unit/Service/AssignmentServiceTest.php +++ b/tests/unit/Service/AssignmentServiceTest.php @@ -26,8 +26,8 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\BadRequestException; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsers; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\Assignment; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\ChangeHelper; use OCA\Deck\NotFoundException; @@ -49,7 +49,7 @@ class AssignmentServiceTest extends TestCase { */ private $cardMapper; /** - * @var MockObject|AssignedUsersMapper + * @var MockObject|AssignmentMapper */ private $assignedUsersMapper; /** @@ -83,7 +83,7 @@ class AssignmentServiceTest extends TestCase { $this->permissionService = $this->createMock(PermissionService::class); $this->cardMapper = $this->createMock(CardMapper::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->eventDispatcher = $this->createMock(IEventDispatcher::class); $this->changeHelper = $this->createMock(ChangeHelper::class); @@ -118,10 +118,10 @@ class AssignmentServiceTest extends TestCase { ->method('find') ->with(123) ->willReturn($assignments); - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId(123); $assignment->setParticipant('admin'); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $this->cardMapper->expects($this->once()) ->method('findBoardId') ->willReturn(1); @@ -148,10 +148,10 @@ class AssignmentServiceTest extends TestCase { ->method('find') ->with(123) ->willReturn($assignments); - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId(123); $assignment->setParticipant('admin'); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $this->cardMapper->expects($this->once()) ->method('findBoardId') ->willReturn(1); @@ -168,10 +168,10 @@ class AssignmentServiceTest extends TestCase { public function testAssignUserExisting() { $this->expectException(BadRequestException::class); $this->expectExceptionMessage('The user is already assigned to the card'); - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId(123); $assignment->setParticipant('admin'); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $assignments = [ $assignment ]; @@ -184,10 +184,10 @@ class AssignmentServiceTest extends TestCase { } public function testUnassignUserExisting() { - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId(123); $assignment->setParticipant('admin'); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $assignments = [ $assignment ]; @@ -205,10 +205,10 @@ class AssignmentServiceTest extends TestCase { public function testUnassignUserNotExisting() { $this->expectException(NotFoundException::class); - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setCardId(123); $assignment->setParticipant('admin'); - $assignment->setType(AssignedUsers::TYPE_USER); + $assignment->setType(Assignment::TYPE_USER); $assignments = [ $assignment ]; diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php index ec4920c10..909eb5c21 100644 --- a/tests/unit/Service/BoardServiceTest.php +++ b/tests/unit/Service/BoardServiceTest.php @@ -27,8 +27,8 @@ use OC\L10N\L10N; use OCA\Deck\Activity\ActivityManager; use OCA\Deck\Db\Acl; use OCA\Deck\Db\AclMapper; -use OCA\Deck\Db\AssignedUsers; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\Assignment; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Board; use OCA\Deck\Db\BoardMapper; use OCA\Deck\Db\ChangeHelper; @@ -61,7 +61,7 @@ class BoardServiceTest extends TestCase { private $permissionService; /** @var NotificationHelper */ private $notificationHelper; - /** @var AssignedUsersMapper */ + /** @var AssignmentMapper */ private $assignedUsersMapper; /** @var IUserManager */ private $userManager; @@ -85,7 +85,7 @@ class BoardServiceTest extends TestCase { $this->labelMapper = $this->createMock(LabelMapper::class); $this->permissionService = $this->createMock(PermissionService::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->groupManager = $this->createMock(IGroupManager::class); $this->activityManager = $this->createMock(ActivityManager::class); @@ -390,7 +390,7 @@ class BoardServiceTest extends TestCase { ->method('find') ->with(123) ->willReturn($acl); - $assignment = new AssignedUsers(); + $assignment = new Assignment(); $assignment->setParticipant('admin'); $this->assignedUsersMapper->expects($this->once()) ->method('findByUserId') diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php index bf6368299..1d9b17c21 100644 --- a/tests/unit/Service/CardServiceTest.php +++ b/tests/unit/Service/CardServiceTest.php @@ -24,7 +24,7 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Card; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\ChangeHelper; @@ -54,7 +54,7 @@ class CardServiceTest extends TestCase { private $permissionService; /** @var NotificationHelper */ private $notificationHelper; - /** @var AssignedUsersMapper|MockObject */ + /** @var AssignmentMapper|MockObject */ private $assignedUsersMapper; /** @var BoardService|MockObject */ private $boardService; @@ -83,7 +83,7 @@ class CardServiceTest extends TestCase { $this->permissionService = $this->createMock(PermissionService::class); $this->boardService = $this->createMock(BoardService::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->activityManager = $this->createMock(ActivityManager::class); $this->commentsManager = $this->createMock(ICommentsManager::class); diff --git a/tests/unit/Service/StackServiceTest.php b/tests/unit/Service/StackServiceTest.php index 0ec5567ca..2c4d9686f 100644 --- a/tests/unit/Service/StackServiceTest.php +++ b/tests/unit/Service/StackServiceTest.php @@ -24,7 +24,7 @@ namespace OCA\Deck\Service; use OCA\Deck\Activity\ActivityManager; -use OCA\Deck\Db\AssignedUsersMapper; +use OCA\Deck\Db\AssignmentMapper; use OCA\Deck\Db\Card; use OCA\Deck\Db\CardMapper; use OCA\Deck\Db\BoardMapper; @@ -56,7 +56,7 @@ class StackServiceTest extends TestCase { private $labelMapper; /** @var \PHPUnit\Framework\MockObject\MockObject|PermissionService */ private $permissionService; - /** @var AssignedUsersMapper|\PHPUnit\Framework\MockObject\MockObject */ + /** @var AssignmentMapper|\PHPUnit\Framework\MockObject\MockObject */ private $assignedUsersMapper; /** @var AttachmentService|\PHPUnit\Framework\MockObject\MockObject */ private $attachmentService; @@ -79,7 +79,7 @@ class StackServiceTest extends TestCase { $this->permissionService = $this->createMock(PermissionService::class); $this->boardService = $this->createMock(BoardService::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->labelMapper = $this->createMock(LabelMapper::class); $this->activityManager = $this->createMock(ActivityManager::class);