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

Update Card serialization (jsonSerialize usages) to use CardDetails model

Browse Source 
Signed-off-by: Raul <raul@nextcloud.com>
This commit is contained in:
Raul
2022-05-03 12:59:58 +02:00
committed by Julius Härtl
parent 4c729530ce
commit 6ae61368a7
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Service/OverviewService.php
View File

@@ -93,7 +93,7 @@ class OverviewService {
public function findUpcomingCards(string $userId): array { public function findUpcomingCards(string $userId): array {
$userBoards = $this->boardMapper->findAllForUser($userId); $userBoards = $this->boardMapper->findAllForUser($userId);
$foundCards = []; $overview = [];
foreach ($userBoards as $userBoard) { foreach ($userBoards as $userBoard) {
if (count($userBoard->getAcl()) === 0) { if (count($userBoard->getAcl()) === 0) {
// private board: get cards with due date // private board: get cards with due date
@@ -103,14 +103,27 @@ class OverviewService {
$cards = $this->cardMapper->findToMeOrNotAssignedCards($userBoard->getId(), $userId); $cards = $this->cardMapper->findToMeOrNotAssignedCards($userBoard->getId(), $userId);
} }
$foundCards[] = array_map( foreach ($cards as $card) {
function (Card $card) use ($userBoard, $userId) {
$this->enrich($card, $userId); $this->enrich($card, $userId);
return (new CardDetails($card, $userBoard))->jsonSerialize(); $diffDays = $card->getDaysUntilDue();
},
$cards $key = 'later';
); if ($card->getDuedate() === null) {
$key = 'nodue';
} elseif ($diffDays < 0) {
$key = 'overdue';
} elseif ($diffDays === 0) {
$key = 'today';
} elseif ($diffDays === 1) {
$key = 'tomorrow';
} elseif ($diffDays <= 7) {
$key = 'nextSevenDays';
} }
return array_merge(...$foundCards);
$card = (new CardDetails($card, $userBoard));
$overview[$key][] = $card->jsonSerialize();
}
}
return $overview;
} }
} }