Backend: assign/remove user impelementation

Signed-off-by: Julius Härtl <jus@bitgrid.net>

appinfo/routes.php

@@ -57,7 +57,7 @@ return [
 		['name' => 'card#assignLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
 		['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
 		['name' => 'card#assignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'POST'],
-		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'DELETE'],
+		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/assign/{userId}', 'verb' => 'DELETE'],
 
 		// labels
 		['name' => 'label#create', 'url' => '/labels', 'verb' => 'POST'],

lib/Controller/CardController.php

@@ -144,14 +144,14 @@ class CardController extends Controller {
 	 * @NoAdminRequired
 	 */
 	public function assignUser($cardId, $userId) {
-		//$this->cardService->removeLabel($cardId, $labelId);
+		return $this->cardService->assignUser($cardId, $userId);
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
 	public function unassignUser($cardId, $userId) {
-		//$this->cardService->removeLabel($cardId, $labelId);
+		return $this->cardService->unassignUser($cardId, $userId);
 	}
 
 

lib/Db/AssignedUsersMapper.php

@@ -25,7 +25,6 @@
 namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\Entity;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 
@@ -58,7 +57,24 @@ class AssignedUsersMapper extends DeckMapper implements IPermissionMapper {
 
 	public function findBoardId($cardId) {
 		return $this->cardMapper->findBoardId($cardId);
+	}
 
+	/**
+	 * Check if user exists before assigning it to a card
+	 *
+	 * @param Entity $entity
+	 * @return null|Entity
+	 */
+	public function insert(Entity $entity) {
+		$user = $this->userManager->get($entity->getParticipant());
+		if ($user !== null) {
+			/** @var AssignedUsers $assignment */
+			$assignment = parent::insert($entity);
+			$this->mapParticipant($assignment);
+			return $assignment;
+		} else {
+			return null;
+		}
 	}
 
 	public function mapParticipant(AssignedUsers &$assignment) {

lib/Db/Card.php

@@ -34,6 +34,7 @@ class Card extends RelationalEntity {
 	protected $lastModified;
 	protected $createdAt;
 	protected $labels;
+	protected $assignedUsers;
 	protected $owner;
 	protected $order;
 	protected $archived = false;
@@ -56,6 +57,7 @@ class Card extends RelationalEntity {
 		$this->addType('archived', 'boolean');
 		$this->addType('notified', 'boolean');
 		$this->addRelation('labels');
+		$this->addRelation('assignedUsers');
 		$this->addRelation('participants');
 		$this->addResolvable('owner');
 	}

lib/Db/CardMapper.php

@@ -24,7 +24,6 @@
 namespace OCA\Deck\Db;
 
 use OCP\AppFramework\Db\Entity;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
@@ -104,7 +103,6 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
 		$card = $this->findEntity($sql, [$id]);
 		$labels = $this->labelMapper->findAssignedLabelsForCard($card->id);
 		$card->setLabels($labels);
-
 		$this->mapOwner($card);
 		return $card;
 	}

lib/Service/CardService.php

@@ -23,10 +23,13 @@
 
 namespace OCA\Deck\Service;
 
+use OCA\Deck\Db\AssignedUsers;
+use OCA\Deck\Db\AssignedUsersMapper;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\StackMapper;
+use OCA\Deck\NotFoundException;
 use OCA\Deck\StatusException;
 
 
@@ -36,17 +39,22 @@ class CardService {
 	private $stackMapper;
 	private $permissionService;
 	private $boardService;
+	private $assignedUsersMapper;
 
-	public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService, BoardService $boardService) {
+	public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService, BoardService $boardService, AssignedUsersMapper $assignedUsersMapper) {
 		$this->cardMapper = $cardMapper;
 		$this->stackMapper = $stackMapper;
 		$this->permissionService = $permissionService;
 		$this->boardService = $boardService;
+		$this->assignedUsersMapper = $assignedUsersMapper;
 	}
 
 	public function find($cardId) {
 		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
-		return $this->cardMapper->find($cardId);
+		$card = $this->cardMapper->find($cardId);
+		$assignedUsers = $this->assignedUsersMapper->find($card->getId());
+		$card->setAssignedUsers($assignedUsers);
+		return $card;
 	}
 
 	public function create($title, $stackId, $type, $order, $owner) {
@@ -178,4 +186,27 @@ class CardService {
 		}
 		$this->cardMapper->removeLabel($cardId, $labelId);
 	}
-}
+
+	public function assignUser($cardId, $userId) {
+		$assignments = $this->assignedUsersMapper->find($cardId);
+		foreach ($assignments as $assignment) {
+			if ($assignment->getParticipant() === $userId) {
+				return false;
+			}
+		}
+		$assignment  = new AssignedUsers();
+		$assignment->setCardId($cardId);
+		$assignment->setParticipant($userId);
+		return $this->assignedUsersMapper->insert($assignment);
+	}
+
+	public function unassignUser($cardId, $userId) {
+		$assignments = $this->assignedUsersMapper->find($cardId);
+		foreach ($assignments as $assignment) {
+			if ($assignment->getParticipant() === $userId) {
+				return $this->assignedUsersMapper->delete($assignment);
+			}
+		}
+		throw new NotFoundException('No assignment for ' . $userId . 'found.');
+	}
+}