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

Keep API results the same as before

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2021-11-24 10:08:41 +01:00
committed by backportbot[bot]
parent bc9fe51036
commit a8d41797ef
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/Board.php
View File

@@ -63,6 +63,10 @@ class Board extends RelationalEntity {
if ($this->shared === -1) { if ($this->shared === -1) {
unset($json['shared']); unset($json['shared']);
} }
// FIXME: Ideally the API responses should follow the internal data structure and return null if the labels/acls have not been fetched from the db
// however this would be a breaking change for consumers of the API
$json['acl'] = $this->acl ?? [];
$json['labels'] = $this->labels ?? [];
return $json; return $json;
} }

33
tests/unit/Db/BoardTest.php
View File

@@ -23,12 +23,35 @@ class BoardTest extends TestCase {
'title' => "My Board", 'title' => "My Board",
'owner' => "admin", 'owner' => "admin",
'color' => "000000", 'color' => "000000",
'labels' => null, 'labels' => [],
'permissions' => [], 'permissions' => [],
'stacks' => [], 'stacks' => [],
'deletedAt' => 0, 'deletedAt' => 0,
'lastModified' => 0, 'lastModified' => 0,
'acl' => null, 'acl' => [],
'archived' => false,
'users' => ['user1', 'user2'],
'settings' => [],
'ETag' => $board->getETag(),
], $board->jsonSerialize());
}
public function testUnfetchedValues() {
$board = $this->createBoard();
$board->setUsers(['user1', 'user2']);
self::assertNull($board->getAcl());
self::assertNull($board->getLabels());
$this->assertEquals([
'id' => 1,
'title' => "My Board",
'owner' => "admin",
'color' => "000000",
'labels' => [],
'permissions' => [],
'stacks' => [],
'deletedAt' => 0,
'lastModified' => 0,
'acl' => [],
'archived' => false, 'archived' => false,
'users' => ['user1', 'user2'], 'users' => ['user1', 'user2'],
'settings' => [], 'settings' => [],
@@ -49,7 +72,7 @@ class BoardTest extends TestCase {
'stacks' => [], 'stacks' => [],
'deletedAt' => 0, 'deletedAt' => 0,
'lastModified' => 0, 'lastModified' => 0,
'acl' => null, 'acl' => [],
'archived' => false, 'archived' => false,
'users' => [], 'users' => [],
'settings' => [], 'settings' => [],
@@ -72,12 +95,12 @@ class BoardTest extends TestCase {
'title' => "My Board", 'title' => "My Board",
'owner' => "admin", 'owner' => "admin",
'color' => "000000", 'color' => "000000",
'labels' => null, 'labels' => [],
'permissions' => [], 'permissions' => [],
'stacks' => [], 'stacks' => [],
'deletedAt' => 0, 'deletedAt' => 0,
'lastModified' => 0, 'lastModified' => 0,
'acl' => null, 'acl' => [],
'archived' => false, 'archived' => false,
'shared' => 1, 'shared' => 1,
'users' => [], 'users' => [],