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

Properly handle if the related board cannot be found in mappers

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-11-13 12:03:05 +01:00
parent 4549a2b0ee
commit 2de43a6725
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Db/AclMapper.php
View File

@@ -23,6 +23,8 @@
namespace OCA\Deck\Db; namespace OCA\Deck\Db;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\IDBConnection; use OCP\IDBConnection;
class AclMapper extends DeckMapper implements IPermissionMapper { class AclMapper extends DeckMapper implements IPermissionMapper {
@@ -43,8 +45,12 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
} }
public function findBoardId($aclId): ?int { public function findBoardId($aclId): ?int {
try {
$entity = $this->find($aclId); $entity = $this->find($aclId);
return $entity->getBoardId(); return $entity->getBoardId();
} catch (DoesNotExistException | MultipleObjectsReturnedException $e) {
}
return null;
} }
public function findByParticipant($type, $participant): array { public function findByParticipant($type, $participant): array {

3
lib/Db/CardMapper.php
View File

@@ -322,8 +322,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
$stmt = $this->db->prepare($sql); $stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $cardId, \PDO::PARAM_INT); $stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
$row = $stmt->fetch(); return $stmt->fetchColumn() ?? null;
return $row['id'];
} }
public function mapOwner(Card &$card) { public function mapOwner(Card &$card) {

7
lib/Db/LabelMapper.php
View File

@@ -23,7 +23,9 @@
namespace OCA\Deck\Db; namespace OCA\Deck\Db;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity; use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\IDBConnection; use OCP\IDBConnection;
class LabelMapper extends DeckMapper implements IPermissionMapper { class LabelMapper extends DeckMapper implements IPermissionMapper {
@@ -100,7 +102,12 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
} }
public function findBoardId($labelId): ?int { public function findBoardId($labelId): ?int {
try {
$entity = $this->find($labelId); $entity = $this->find($labelId);
return $entity->getBoardId(); return $entity->getBoardId();
} catch (DoesNotExistException $e) {
} catch (MultipleObjectsReturnedException $e) {
}
return null;
} }
} }

7
lib/Db/StackMapper.php
View File

@@ -23,7 +23,9 @@
namespace OCA\Deck\Db; namespace OCA\Deck\Db;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity; use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\IDBConnection; use OCP\IDBConnection;
class StackMapper extends DeckMapper implements IPermissionMapper { class StackMapper extends DeckMapper implements IPermissionMapper {
@@ -75,7 +77,12 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
} }
public function findBoardId($stackId): ?int { public function findBoardId($stackId): ?int {
try {
$entity = $this->find($stackId); $entity = $this->find($stackId);
return $entity->getBoardId(); return $entity->getBoardId();
} catch (DoesNotExistException $e) {
} catch (MultipleObjectsReturnedException $e) {
}
return null;
} }
} }