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

Remove unused variables

Browse Source
This commit is contained in:
Julius Haertl
2016-10-28 22:04:56 +02:00
parent 86e628ab69
commit c1bbe62cfa
11 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Controller/BoardController.php
View File

@@ -75,7 +75,7 @@ class BoardController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function read($boardId) { public function read($boardId) {
return $this->boardService->find($this->userId, $boardId); return $this->boardService->find($boardId);
} }
/** /**
@@ -98,7 +98,7 @@ class BoardController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function update($id, $title, $color) { public function update($id, $title, $color) {
return $this->boardService->update($id, $title, $this->userId, $color); return $this->boardService->update($id, $title, $color);
} }
/** /**
@@ -108,7 +108,7 @@ class BoardController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function delete($boardId) { public function delete($boardId) {
return $this->boardService->delete($this->userId, $boardId); return $this->boardService->delete($boardId);
} }
/** /**

8
lib/Controller/CardController.php
View File

@@ -47,7 +47,7 @@ class CardController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function read($cardId) { public function read($cardId) {
return $this->cardService->find($this->userId, $cardId); return $this->cardService->find($cardId);
} }
/** /**
@@ -108,7 +108,7 @@ class CardController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function delete($cardId) { public function delete($cardId) {
return $this->cardService->delete($this->userId, $cardId); return $this->cardService->delete($cardId);
} }
/** /**
@@ -138,7 +138,7 @@ class CardController extends Controller {
* @param $labelId * @param $labelId
*/ */
public function assignLabel($cardId, $labelId) { public function assignLabel($cardId, $labelId) {
return $this->cardService->assignLabel($this->userId, $cardId, $labelId); return $this->cardService->assignLabel($cardId, $labelId);
} }
/** /**
@@ -148,7 +148,7 @@ class CardController extends Controller {
* @param $labelId * @param $labelId
*/ */
public function removeLabel($cardId, $labelId) { public function removeLabel($cardId, $labelId) {
return $this->cardService->removeLabel($this->userId, $cardId, $labelId); return $this->cardService->removeLabel($cardId, $labelId);
} }
} }

6
lib/Controller/LabelController.php
View File

@@ -51,7 +51,7 @@ class LabelController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function create($title, $color, $boardId) { public function create($title, $color, $boardId) {
return $this->labelService->create($title, $this->userId, $color, $boardId); return $this->labelService->create($title, $color, $boardId);
} }
/** /**
@@ -63,7 +63,7 @@ class LabelController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function update($id, $title, $color) { public function update($id, $title, $color) {
return $this->labelService->update($id, $title, $this->userId, $color); return $this->labelService->update($id, $title, $color);
} }
/** /**
@@ -73,7 +73,7 @@ class LabelController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function delete($labelId) { public function delete($labelId) {
return $this->labelService->delete($this->userId, $labelId); return $this->labelService->delete($labelId);
} }
} }

2
lib/Controller/StackController.php
View File

@@ -104,6 +104,6 @@ class StackController extends Controller {
* @return \OCP\AppFramework\Db\Entity * @return \OCP\AppFramework\Db\Entity
*/ */
public function delete($stackId) { public function delete($stackId) {
return $this->stackService->delete($this->userId, $stackId); return $this->stackService->delete($stackId);
} }
} }

1
lib/Db/BoardMapper.php
View File

@@ -96,6 +96,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
$sql = 'SELECT boards.id, title, owner, color, archived, 2 as shared FROM oc_deck_boards as boards ' . $sql = 'SELECT boards.id, title, owner, color, archived, 2 as shared FROM oc_deck_boards as boards ' .
'INNER JOIN oc_deck_board_acl as acl ON boards.id=acl.board_id WHERE owner != ? AND type=\'group\' AND ('; 'INNER JOIN oc_deck_board_acl as acl ON boards.id=acl.board_id WHERE owner != ? AND type=\'group\' AND (';
$countGroups = 0; $countGroups = 0;
// FIXME: group unused?
foreach ($groups as $group) { foreach ($groups as $group) {
$sql .= 'acl.participant = ? '; $sql .= 'acl.participant = ? ';
if(count($groups)>1 && $countGroups++<count($groups)-1) if(count($groups)>1 && $countGroups++<count($groups)-1)

1
lib/Db/DeckMapper.php
View File

@@ -50,6 +50,7 @@ abstract class DeckMapper extends Mapper {
} }
protected function execute($sql, array $params = [], $limit = null, $offset = null) { protected function execute($sql, array $params = [], $limit = null, $offset = null) {
// FIXME: remove on release
\OCP\Util::writeLog('deck', "DeckMapper SQL: " . $sql, \OCP\Util::DEBUG); \OCP\Util::writeLog('deck', "DeckMapper SQL: " . $sql, \OCP\Util::DEBUG);
return parent::execute($sql, $params, $limit, $offset); return parent::execute($sql, $params, $limit, $offset);
} }

4
lib/Db/LabelMapper.php
View File

@@ -68,14 +68,14 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
return $result; return $result;
} }
public function deleteLabelAssignments($labelId, $limit=null, $offset=null) { public function deleteLabelAssignments($labelId) {
$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?'; $sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
$stmt = $this->db->prepare($sql); $stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $labelId, \PDO::PARAM_INT); $stmt->bindParam(1, $labelId, \PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
} }
public function deleteLabelAssignmentsForCard($cardId, $limit=null, $offset=null) { public function deleteLabelAssignmentsForCard($cardId) {
$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?'; $sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
$stmt = $this->db->prepare($sql); $stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $cardId, \PDO::PARAM_INT); $stmt->bindParam(1, $cardId, \PDO::PARAM_INT);

10
lib/Service/BoardService.php
View File

@@ -61,7 +61,7 @@ class BoardService {
return array_merge($userBoards, $groupBoards); return array_merge($userBoards, $groupBoards);
} }
public function find($userId, $boardId) { public function find($boardId) {
$board = $this->boardMapper->find($boardId); $board = $this->boardMapper->find($boardId);
return $board; return $board;
} }
@@ -92,12 +92,12 @@ class BoardService {
} }
public function delete($userId, $id) { public function delete($id) {
return $this->boardMapper->delete($this->find($userId, $id)); return $this->boardMapper->delete($this->find($id));
} }
public function update($id, $title, $userId, $color) { public function update($id, $title, $color) {
$board = $this->find($userId, $id); $board = $this->find($id);
$board->setTitle($title); $board->setTitle($title);
$board->setColor($color); $board->setColor($color);
return $this->boardMapper->update($board); return $this->boardMapper->update($board);

12
lib/Service/CardService.php
View File

@@ -23,9 +23,6 @@
namespace OCA\Deck\Service; namespace OCA\Deck\Service;
use \OCA\Deck\Db\Card; use \OCA\Deck\Db\Card;
use \OCA\Deck\Db\CardMapper; use \OCA\Deck\Db\CardMapper;
use \OCA\Deck\CardArchivedException; use \OCA\Deck\CardArchivedException;
@@ -35,12 +32,11 @@ class CardService {
private $cardMapper; private $cardMapper;
public function __construct(CardMapper $cardMapper) { public function __construct(CardMapper $cardMapper) {
$this->cardMapper = $cardMapper; $this->cardMapper = $cardMapper;
} }
public function find($userId, $cardId) { public function find($cardId) {
return $this->cardMapper->find($cardId); return $this->cardMapper->find($cardId);
} }
public function create($title, $stackId, $type, $order, $owner) { public function create($title, $stackId, $type, $order, $owner) {
@@ -54,7 +50,7 @@ class CardService {
} }
public function delete($userId, $id) { public function delete($id) {
return $this->cardMapper->delete($this->cardMapper->find($id)); return $this->cardMapper->delete($this->cardMapper->find($id));
} }
@@ -117,7 +113,7 @@ class CardService {
return $this->cardMapper->update($card); return $this->cardMapper->update($card);
} }
public function assignLabel($userId, $cardId, $labelId) { public function assignLabel($cardId, $labelId) {
$card = $this->cardMapper->find($cardId); $card = $this->cardMapper->find($cardId);
if($card->getArchived()) { if($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();
@@ -125,7 +121,7 @@ class CardService {
$this->cardMapper->assignLabel($cardId, $labelId); $this->cardMapper->assignLabel($cardId, $labelId);
} }
public function removeLabel($userId, $cardId, $labelId) { public function removeLabel($cardId, $labelId) {
$card = $this->cardMapper->find($cardId); $card = $this->cardMapper->find($cardId);
if($card->getArchived()) { if($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();

12
lib/Service/LabelService.php
View File

@@ -43,12 +43,12 @@ class LabelService {
$this->logger = $logger; $this->logger = $logger;
} }
public function find($userId, $labelId) { public function find($labelId) {
$label = $this->labelMapper->find($labelId); $label = $this->labelMapper->find($labelId);
return $label; return $label;
} }
public function create($title, $userId, $color, $boardId) { public function create($title, $color, $boardId) {
$label = new Label(); $label = new Label();
$label->setTitle($title); $label->setTitle($title);
$label->setColor($color); $label->setColor($color);
@@ -56,12 +56,12 @@ class LabelService {
return $this->labelMapper->insert($label); return $this->labelMapper->insert($label);
} }
public function delete($userId, $id) { public function delete($id) {
return $this->labelMapper->delete($this->find($userId, $id)); return $this->labelMapper->delete($this->find($id));
} }
public function update($id, $title, $userId, $color) { public function update($id, $title, $color) {
$label = $this->find($userId, $id); $label = $this->find($id);
$label->setTitle($title); $label->setTitle($title);
$label->setColor($color); $label->setColor($color);
return $this->labelMapper->update($label); return $this->labelMapper->update($label);

2
lib/Service/StackService.php
View File

@@ -90,7 +90,7 @@ class StackService {
} }
public function delete($userId, $id) { public function delete($id) {
return $this->stackMapper->delete($this->stackMapper->find($id)); return $this->stackMapper->delete($this->stackMapper->find($id));
} }