Refactor class names to Assignment

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

View File

@@ -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 [

View File

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

View File

@@ -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
];

View File

@@ -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')

View File

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

View File

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