add folder api v2

Signed-off-by: Paul Tirk <paultirk@paultirk.com>

3 files changed, 162 insertions, 0 deletions

diff --git a/lib/Controller/FolderApiV2Controller.php b/lib/Controller/FolderApiV2Controller.php
new file mode 100644
index 000000000..ea788c686
--- /dev/null
+++ b/lib/Controller/FolderApiV2Controller.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Nextcloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author    Paul Tirk <paultirk@paultirk.com>
+ * @copyright 2020 Paul Tirk
+ */
+
+namespace OCA\News\Controller;
+
+use \OCP\IRequest;
+use \OCP\IUserSession;
+use \OCP\AppFramework\Http;
+
+use \OCA\News\Service\FolderServiceV2;
+use \OCA\News\Service\ItemServiceV2;
+use \OCA\News\Service\Exceptions\ServiceNotFoundException;
+use \OCA\News\Service\Exceptions\ServiceConflictException;
+use \OCA\News\Service\Exceptions\ServiceValidationException;
+
+class FolderApiV2Controller extends ApiController
+{
+    use ApiV2ResponseTrait;
+
+    private $folderService;
+    private $itemService;
+
+    public function __construct(
+        IRequest $request,
+        IUserSession $userSession,
+        FolderServiceV2 $folderService,
+        ItemServiceV2 $itemService
+    ) {
+        parent::__construct($request, $userSession);
+
+        $this->folderService = $folderService;
+        $this->itemService = $itemService;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @CORS
+     *
+     * @param string $name
+     * @return array|mixed|\OCP\AppFramework\Http\JSONResponse
+     */
+    public function createFolder($name)
+    {
+        try {
+            $this->folderService->purgeDeleted($this->getUserId(), false);
+            $responseData = $this->serialize(
+                $this->folderService->create($this->getUserId(), $name)
+            );
+            return $this->response([
+                'folder' => $responseData
+            ]);
+        } catch (ServiceValidationException $ex) {
+            return $this->errorResponse($ex, Http::STATUS_BAD_REQUEST);
+        } catch (ServiceConflictException $ex) {
+            $responseData = $this->serialize(
+                $this->folderService->findByName($this->getUserId(), $name)
+            );
+            return $this->response([
+                'folder' => $responseData
+            ], Http::STATUS_CONFLICT);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @CORS
+     * @param int    $folderId
+     * @param string $name
+     * @return array|\OCP\AppFramework\Http\JSONResponse
+     */
+    public function updateFolder($folderId, $name)
+    {
+        $response = null;
+        try {
+            $response = $this->folderService->rename($this->getUserId(), $folderId, $name);
+        } catch (ServiceValidationException $ex) {
+            return $this->errorResponse($ex, Http::STATUS_UNPROCESSABLE_ENTITY);
+        } catch (ServiceConflictException $ex) {
+            $responseData = $this->serialize(
+                $this->folderService->findByName($this->getUserId(), $name)
+            );
+            return $this->response(
+                [
+                    'folder' => $responseData
+                ],
+                Http::STATUS_CONFLICT
+            );
+        } catch (ServiceNotFoundException $ex) {
+            return $this->errorResponse($ex, Http::STATUS_NOT_FOUND);
+        }
+
+        return $this->response([
+            'folder' => $response
+        ]);
+    }
+
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @CORS
+     *
+     * @param int $folderId
+     * @return array|\OCP\AppFramework\Http\JSONResponse
+     */
+    public function deleteFolder($folderId)
+    {
+        try {
+            $responseData = $this->serialize(
+                $this->folderService->delete($this->getUserId(), $folderId)
+            );
+            return $this->response([
+                'folder' => $responseData
+            ]);
+        } catch (ServiceNotFoundException $ex) {
+            return $this->errorResponse($ex, Http::STATUS_NOT_FOUND);
+        }
+    }
+
+}
diff --git a/lib/Db/FolderMapperV2.php b/lib/Db/FolderMapperV2.php
index d0d0cbec1..3b71460e4 100644
--- a/lib/Db/FolderMapperV2.php
+++ b/lib/Db/FolderMapperV2.php
@@ -40,6 +40,27 @@ class FolderMapperV2 extends NewsMapperV2
     }
 
     /**
+     * Find feed by name
+     *
+     * @param string $userId The user identifier
+     * @param string $folderName The folder name
+     *
+     * @return Folder
+     */
+    public function findByName(string $userId, string $folderName): Folder
+    {
+        $builder = $this->db->getQueryBuilder();
+        $builder->select('*')
+                ->from($this->tableName)
+                ->where('name = :folder_name')
+                ->andWhere('user_id = :user_id')
+                ->setParameter(':folder_name', $folderName)
+                ->setParameter(':user_id', $userId);
+
+        return $this->findEntity($builder);
+    }
+
+    /**
      * Find all feeds for a user.
      *
      * @param string $userId The user identifier
diff --git a/lib/Service/FolderServiceV2.php b/lib/Service/FolderServiceV2.php
index 17d955876..827ca4bfb 100644
--- a/lib/Service/FolderServiceV2.php
+++ b/lib/Service/FolderServiceV2.php
@@ -49,6 +49,17 @@ class FolderServiceV2 extends Service
     }
 
     /**
+     * @param $userId
+     * @param $folderName
+     *
+     * @return Folder
+     */
+    public function findByName($userId, $folderName)
+    {
+        return $this->mapper->findByName($userId, $folderName);
+    }
+
+    /**
      * Finds all folders of a user
      *
      * @param string $userId The name/ID of the user