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

Fix label assignment insertion and enrich result of clone

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-06-18 10:48:33 +02:00
committed by Jakob Röhrl
parent e763ce1fb7
commit c39fd43b6c
5 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
appinfo/routes.php
View File

@@ -101,6 +101,7 @@ return [
['name' => 'stack_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'POST'], ['name' => 'stack_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'POST'],
['name' => 'stack_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'PUT'], ['name' => 'stack_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'PUT'],
['name' => 'stack_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'DELETE'], ['name' => 'stack_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'DELETE'],
['name' => 'stack_api#clone', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/clone', 'verb' => 'POST'],
['name' => 'card_api#get', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'GET'], ['name' => 'card_api#get', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'GET'],
['name' => 'card_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards', 'verb' => 'POST'], ['name' => 'card_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards', 'verb' => 'POST'],

5
lib/Db/AssignedLabels.php
View File

@@ -27,12 +27,13 @@ use JsonSerializable;
class AssignedLabels extends RelationalEntity implements JsonSerializable { class AssignedLabels extends RelationalEntity implements JsonSerializable {
public $id; public $id;
protected $label; protected $labelId;
protected $cardId; protected $cardId;
public function __construct() { public function __construct() {
$this->addType('id', 'integer'); $this->addType('id', 'integer');
$this->addType('cardId', 'integer'); $this->addType('cardId', 'integer');
$this->addResolvable('label'); $this->addType('labelId', 'integer');
} }
} }

6
lib/Db/AssignedLabelsMapper.php
View File

@@ -38,7 +38,7 @@ class AssignedLabelsMapper extends DeckMapper {
private $groupManager; private $groupManager;
public function __construct(IDBConnection $db, CardMapper $cardMapper, IUserManager $userManager, IGroupManager $groupManager) { public function __construct(IDBConnection $db, CardMapper $cardMapper, IUserManager $userManager, IGroupManager $groupManager) {
parent::__construct($db, 'deck_assigned_labels', Labels::class); parent::__construct($db, 'deck_assigned_labels', AssignedLabels::class);
$this->cardMapper = $cardMapper; $this->cardMapper = $cardMapper;
$this->userManager = $userManager; $this->userManager = $userManager;
$this->groupManager = $groupManager; $this->groupManager = $groupManager;
@@ -50,9 +50,7 @@ class AssignedLabelsMapper extends DeckMapper {
* @return array|Entity * @return array|Entity
*/ */
public function find($cardId) { public function find($cardId) {
$sql = 'SELECT l.*,card_id FROM `*PREFIX*deck_assigned_labels` as al ' . $sql = 'SELECT * from `*PREFIX*deck_assigned_labels` where `card_id` = ?';
'INNER JOIN `*PREFIX*deck_labels` as l ON l.id = al.label_id ' .
'WHERE `card_id` = ?';
$labels = $this->findEntities($sql, [$cardId]); $labels = $this->findEntities($sql, [$cardId]);
return $labels; return $labels;

27
lib/Service/StackService.php
View File

@@ -407,7 +407,7 @@ class StackService {
$newStack = new Stack(); $newStack = new Stack();
$newStack->setTitle($stack->getTitle() . ' (' . $this->l10n->t('copy') . ')'); $newStack->setTitle($stack->getTitle() . ' (' . $this->l10n->t('copy') . ')');
$newStack->setBoardId($boardId); $newStack->setBoardId($boardId);
$newStack->setOrder($stack->getOrder() +1); $newStack->setOrder(999);
$newStack = $this->stackMapper->insert($newStack); $newStack = $this->stackMapper->insert($newStack);
$this->activityManager->triggerEvent( $this->activityManager->triggerEvent(
@@ -421,7 +421,7 @@ class StackService {
); );
$cards = $this->cardMapper->findAll($id); $cards = $this->cardMapper->findAll($id);
$c = []; $newCardArray = [];
foreach ($cards as $card) { foreach ($cards as $card) {
$newCard = new Card(); $newCard = new Card();
@@ -446,40 +446,37 @@ class StackService {
if ($boardId === $stack->getBoardId()) { if ($boardId === $stack->getBoardId()) {
$assignedLabels = $this->assignedLabelsMapper->find($card->getId()); $assignedLabels = $this->assignedLabelsMapper->find($card->getId());
$l = []; $newLabelArray = [];
foreach ($assignedLabels as $assignedLabel) { foreach ($assignedLabels as $assignedLabel) {
$assignment = $assignedLabel; $assignment = new AssignedLabels();
$assignment->setCardId($newCard->getId()); $assignment->setCardId($newCard->getId());
$assignment->setLabelId($assignedLabel->getLabelId());
$assignment = $this->assignedLabelsMapper->insert($assignment); $assignment = $this->assignedLabelsMapper->insert($assignment);
// $assignment = new AssignedLabels(); $newLabelArray[] = $assignment;
// $assignment->setCardId($newCard->getId());
// $assignment->setLabel($assignedLabel);
// $assignment = $this->assignedLabelsMapper->insert($assignment);
$l[] = $assignment;
} }
$newCard->setLabels($l); $newCard->setLabels($newLabelArray);
$assignedUsers = $this->assignedUsersMapper->find($card->getId()); $assignedUsers = $this->assignedUsersMapper->find($card->getId());
$u = []; $newUserArray = [];
foreach ($assignedUsers as $assignedUser) { foreach ($assignedUsers as $assignedUser) {
$assignment = new AssignedUsers(); $assignment = new AssignedUsers();
$assignment->setCardId($newCard->getId()); $assignment->setCardId($newCard->getId());
$assignment->setParticipant($assignedUser->getParticipant()); $assignment->setParticipant($assignedUser->getParticipant());
$assignment->setType($assignedUser->getType()); $assignment->setType($assignedUser->getType());
$assignment = $this->assignedUsersMapper->insert($assignment); $assignment = $this->assignedUsersMapper->insert($assignment);
$u[] = $assignment; $newUserArray[] = $assignment;
} }
$newCard->setAssignedUsers($u); $newCard->setAssignedUsers($newUserArray);
$c[] = $newCard; $newCardArray[] = $newCard;
} }
} }
$newStack->setCards($c); $this->enrichStackWithCards($newStack);
return $newStack; return $newStack;
} }
} }

3
src/store/stack.js
View File

@@ -58,9 +58,6 @@ export default {
state.stacks.splice(existingIndex, 1) state.stacks.splice(existingIndex, 1)
} }
}, },
/* cloneStack(state, stack) {
this.commit('addStack', stack)
}, */
updateStack(state, stack) { updateStack(state, stack) {
const existingIndex = state.stacks.findIndex(_stack => _stack.id === stack.id) const existingIndex = state.stacks.findIndex(_stack => _stack.id === stack.id)
if (existingIndex !== -1) { if (existingIndex !== -1) {