diff options
author | Sean Molenaar <sean@seanmolenaar.eu> | 2020-12-26 13:09:41 +0100 |
---|---|---|
committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2020-12-30 11:21:44 +0100 |
commit | 05377d023ef4d43818a4b42039c8143cb0f907e4 (patch) | |
tree | c01fc681c42671dad774de7dc7c46524eb9ae015 /lib/Controller/FeedApiController.php | |
parent | 27bd54058050a70bd1c9ec8cfcdf42d38541f1b0 (diff) |
Remove PHPunit integration tests
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib/Controller/FeedApiController.php')
-rw-r--r-- | lib/Controller/FeedApiController.php | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/lib/Controller/FeedApiController.php b/lib/Controller/FeedApiController.php index eb6edcad2..af552f411 100644 --- a/lib/Controller/FeedApiController.php +++ b/lib/Controller/FeedApiController.php @@ -25,10 +25,8 @@ use \OCP\IRequest; use \OCP\IUserSession; use \OCP\AppFramework\Http; -use \OCA\News\Service\FeedService; use \OCA\News\Service\ItemService; use Psr\Log\LoggerInterface; -use function GuzzleHttp\Psr7\uri_for; class FeedApiController extends ApiController { @@ -46,12 +44,6 @@ class FeedApiController extends ApiController private $feedService; /** - * TODO: Remove - * @var FeedService - */ - private $oldFeedService; - - /** * @var LoggerInterface */ private $logger; @@ -64,14 +56,12 @@ class FeedApiController extends ApiController public function __construct( IRequest $request, ?IUserSession $userSession, - FeedService $oldFeedService, FeedServiceV2 $feedService, ItemService $oldItemService, LoggerInterface $logger ) { parent::__construct($request, $userSession); $this->feedService = $feedService; - $this->oldFeedService = $oldFeedService; $this->oldItemService = $oldItemService; $this->logger = $logger; } @@ -189,11 +179,9 @@ class FeedApiController extends ApiController } try { - $this->oldFeedService->patch( - $feedId, - $this->getUserId(), - ['folderId' => $folderId] - ); + $feed = $this->feedService->find($this->getUserId(), $feedId); + $feed->setFolderId($folderId); + $this->feedService->update($this->getUserId(), $feed); } catch (ServiceNotFoundException $ex) { return $this->error($ex, Http::STATUS_NOT_FOUND); } @@ -215,11 +203,9 @@ class FeedApiController extends ApiController public function rename(int $feedId, string $feedTitle) { try { - $this->oldFeedService->patch( - $feedId, - $this->getUserId(), - ['title' => $feedTitle] - ); + $feed = $this->feedService->find($this->getUserId(), $feedId); + $feed->setTitle($feedTitle); + $this->feedService->update($this->getUserId(), $feed); } catch (ServiceNotFoundException $ex) { return $this->error($ex, Http::STATUS_NOT_FOUND); } |