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

Merge pull request #774 from nextcloud/bugfix/771/rest-types

Browse Source 
Fix numeric types and missing card id in card detail results
This commit is contained in:
Julius Härtl
2018-12-20 08:45:44 +01:00
committed by GitHub
parent 082346b9e9 af57c3bf4f
commit 02c3131f18
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Controller/BoardApiController.php
View File

@@ -24,12 +24,14 @@
namespace OCA\Deck\Controller;
use OCA\Deck\StatusException;
use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest;
use OCA\Deck\Service\BoardService;
use Sabre\HTTP\Util;
/**
* Class BoardApiController
@@ -61,10 +63,14 @@ class BoardApiController extends ApiController {
*/
public function index() {
$modified = $this->request->getHeader('If-Modified-Since');
if ($modified === '') {
if ($modified === null || $modified === '') {
$boards = $this->service->findAll();
} else {
$boards = $this->service->findAll(strtotime($modified));
$date = Util::parseHTTPDate($modified);
if (!$date) {
throw new StatusException('Invalid If-Modified-Since header provided.');
}
$boards = $this->service->findAll($date->getTimestamp());
}
return new DataResponse($boards, HTTP::STATUS_OK);
}

10
lib/Controller/StackApiController.php
View File

@@ -24,12 +24,14 @@
namespace OCA\Deck\Controller;
use OCA\Deck\StatusException;
use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest;
use OCA\Deck\Service\StackService;
use OCA\Deck\Service\BoardService;
use Sabre\HTTP\Util;
/**
* Class StackApiController
@@ -62,8 +64,12 @@ class StackApiController extends ApiController {
public function index() {
$since = 0;
$modified = $this->request->getHeader('If-Modified-Since');
if ($modified !== '') {
$since = strtotime($modified);
if ($modified !== null && $modified !== '') {
$date = Util::parseHTTPDate($modified);
if (!$date) {
throw new StatusException('Invalid If-Modified-Since header provided.');
}
$since = $date->getTimestamp();
}
$stacks = $this->stackService->findAll($this->request->getParam('boardId'), $since);
return new DataResponse($stacks, HTTP::STATUS_OK);

4
lib/Db/AssignedUsers.php
View File

@@ -33,8 +33,8 @@ class AssignedUsers extends RelationalEntity implements JsonSerializable {
public function __construct() {
$this->addType('id', 'integer');
$this->addType('card_id', 'integer');
$this->addType('cardId', 'integer');
$this->addResolvable('participant');
}
}
}

14
lib/Db/Label.php
View File

@@ -5,20 +5,20 @@
* @author Julius Härtl <jus@bitgrid.net>
*
* @license GNU AGPL version 3 or any later version
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*
*/
namespace OCA\Deck\Db;
@@ -29,8 +29,10 @@ class Label extends RelationalEntity {
protected $color;
protected $boardId;
protected $cardId;
public function __construct() {
$this->addType('id', 'integer');
$this->addType('boardId', 'integer');
$this->addType('cardId', 'integer');
}
}
}

2
lib/Db/LabelMapper.php
View File

@@ -45,7 +45,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
}
public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
$sql = 'SELECT l.* FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
$sql = 'SELECT l.*,card_id FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
return $this->findEntities($sql, [$cardId], $limit, $offset);
}
public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {