From 10e8c28feaf6d858948285a291231f651ef74728 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <sean@seanmolenaar.eu>
Date: Sun, 4 Oct 2020 20:45:33 +0200
Subject: Add migration with foreign keys

Closes #829

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
---
 lib/Command/Config/FeedAdd.php      | 24 ++++++++++++++++++++++--
 lib/Command/Config/FolderAdd.php    | 10 +++++++---
 lib/Command/Config/FolderDelete.php |  4 ++--
 3 files changed, 31 insertions(+), 7 deletions(-)

(limited to 'lib/Command')

diff --git a/lib/Command/Config/FeedAdd.php b/lib/Command/Config/FeedAdd.php
index 3c4820437..86121ad06 100644
--- a/lib/Command/Config/FeedAdd.php
+++ b/lib/Command/Config/FeedAdd.php
@@ -2,6 +2,8 @@
 declare(strict_types=1);
 namespace OCA\News\Command\Config;
 
+use OCA\News\Service\Exceptions\ServiceConflictException;
+use OCA\News\Service\Exceptions\ServiceNotFoundException;
 use OCA\News\Service\FeedServiceV2;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -56,13 +58,31 @@ class FeedAdd extends Command
     {
         $user      = $input->getArgument('user-id');
         $url       = $input->getArgument('feed');
-        $folder    = (int) $input->getOption('folder') ?? 0;
+        $folder    = $input->getOption('folder');
         $title     = $input->getOption('title');
         $full_text = (bool) $input->getOption('full-text');
         $username  = $input->getOption('username');
         $password  = $input->getOption('password');
 
-        $feed = $this->feedService->create($user, $url, $folder, $full_text, $title, $username, $password);
+        if ($folder !== null) {
+            $folder = intval($folder);
+        }
+
+        try {
+            $feed = $this->feedService->create(
+                $user,
+                $url,
+                $folder,
+                $full_text,
+                $title,
+                $username,
+                $password
+            );
+        } catch (ServiceNotFoundException|ServiceConflictException $e) {
+            $output->write($e->getMessage());
+            return 1;
+        }
+
         $this->feedService->fetch($feed);
 
         $output->writeln(json_encode($feed->toAPI(), JSON_PRETTY_PRINT));
diff --git a/lib/Command/Config/FolderAdd.php b/lib/Command/Config/FolderAdd.php
index 257cf2dd6..03ad72535 100644
--- a/lib/Command/Config/FolderAdd.php
+++ b/lib/Command/Config/FolderAdd.php
@@ -47,9 +47,13 @@ class FolderAdd extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $user = $input->getArgument('user-id');
-        $name = $input->getArgument('name');
-        $parent = (int) $input->getOption('parent') ?? 0;
+        $user   = $input->getArgument('user-id');
+        $name   = $input->getArgument('name');
+        $parent = $input->getOption('parent');
+
+        if ($parent !== null) {
+            $parent = intval($parent);
+        }
 
         $this->folderService->create($user, $name, $parent);
 
diff --git a/lib/Command/Config/FolderDelete.php b/lib/Command/Config/FolderDelete.php
index bf7608b02..397eda999 100644
--- a/lib/Command/Config/FolderDelete.php
+++ b/lib/Command/Config/FolderDelete.php
@@ -50,11 +50,11 @@ class FolderDelete extends Command
         $user = $input->getArgument('user-id');
         $id = $input->getArgument('folder-id');
 
-        if ($id === '0') {
+        if ($id === null) {
             throw new ServiceException('Can not remove root folder!');
         }
 
-        $this->folderService->delete($user, $id);
+        $this->folderService->delete($user, intval($id));
 
         return 0;
     }
-- 
cgit v1.2.3