Add 1.1 api version to handle other attachment types properly

Signed-off-by: Julius Härtl <jus@bitgrid.net>

lib/Controller/AttachmentApiController.php

@@ -42,8 +42,13 @@ class AttachmentApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 */
-	public function getAll() {
+	public function getAll($apiVersion) {
 		$attachment = $this->attachmentService->findAll($this->request->getParam('cardId'), true);
+		if ($apiVersion === '1.0') {
+			$attachment = array_filter($attachment, function ($attachment) {
+				return $attachment->getType() === 'deck_file';
+			});
+		}
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
 
@@ -53,8 +58,8 @@ class AttachmentApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 */
-	public function display() {
-		return $this->attachmentService->display($this->request->getParam('attachmentId'));
+	public function display($cardId, $attachmentId, $type = 'deck_file') {
+		return $this->attachmentService->display($cardId, $attachmentId, $type);
 	}
 
 	/**
@@ -63,8 +68,8 @@ class AttachmentApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 */
-	public function create($type, $data) {
-		$attachment = $this->attachmentService->create($this->request->getParam('cardId'), $type, $data);
+	public function create($cardId, $type, $data) {
+		$attachment = $this->attachmentService->create($cardId, $type, $data);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
 
@@ -74,8 +79,8 @@ class AttachmentApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 */
-	public function update($data) {
-		$attachment = $this->attachmentService->update($this->request->getParam('attachmentId'), $data);
+	public function update($cardId, $attachmentId, $data, $type = 'deck_file') {
+		$attachment = $this->attachmentService->update($cardId, $attachmentId, $data, $type);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
 
@@ -85,8 +90,8 @@ class AttachmentApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 */
-	public function delete() {
-		$attachment = $this->attachmentService->delete($this->request->getParam('attachmentId'));
+	public function delete($cardId, $attachmentId, $type = 'deck_file') {
+		$attachment = $this->attachmentService->delete($cardId, $attachmentId, $type);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
 
@@ -96,8 +101,8 @@ class AttachmentApiController extends ApiController {
 	 * @NoCSRFRequired
 	 *
 	 */
-	public function restore() {
-		$attachment = $this->attachmentService->restore($this->request->getParam('attachmentId'));
+	public function restore($cardId, $attachmentId, $type = 'deck_file') {
+		$attachment = $this->attachmentService->restore($cardId, $attachmentId, $type);
 		return new DataResponse($attachment, HTTP::STATUS_OK);
 	}
 }

lib/Controller/AttachmentApiV11Controller.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ *
+ * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ *
+ * @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\Controller;
+
+class AttachmentApiV11Controller extends AttachmentApiController {
+}

lib/Controller/AttachmentController.php

@@ -52,8 +52,13 @@ class AttachmentController extends Controller {
 	 * @return \OCP\AppFramework\Http\Response
 	 * @throws \OCA\Deck\NotFoundException
 	 */
-	public function display($attachmentId) {
-		return $this->attachmentService->display($attachmentId);
+	public function display($cardId, $attachmentId) {
+		if (strpos($attachmentId, ':') === false) {
+			$type = 'deck_file';
+		} else {
+			[$type, $attachmentId] = explode(':', $attachmentId);
+		}
+		return $this->attachmentService->display($cardId, $attachmentId, $type);
 	}
 
 	/**
@@ -70,21 +75,36 @@ class AttachmentController extends Controller {
 	/**
 	 * @NoAdminRequired
 	 */
-	public function update($attachmentId) {
-		return $this->attachmentService->update($attachmentId, $this->request->getParam('data'));
+	public function update($cardId, $attachmentId) {
+		if (strpos($attachmentId, ':') === false) {
+			$type = 'deck_file';
+		} else {
+			[$type, $attachmentId] = explode(':', $attachmentId);
+		}
+		return $this->attachmentService->update($cardId, $attachmentId, $this->request->getParam('data'), $type);
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function delete($attachmentId) {
-		return $this->attachmentService->delete($attachmentId);
+	public function delete($cardId, $attachmentId) {
+		if (strpos($attachmentId, ':') === false) {
+			$type = 'deck_file';
+		} else {
+			[$type, $attachmentId] = explode(':', $attachmentId);
+		}
+		return $this->attachmentService->delete($cardId, $attachmentId, $type);
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function restore($attachmentId) {
-		return $this->attachmentService->restore($attachmentId);
+	public function restore($cardId, $attachmentId) {
+		if (strpos($attachmentId, ':') === false) {
+			$type = 'deck_file';
+		} else {
+			[$type, $attachmentId] = explode(':', $attachmentId);
+		}
+		return $this->attachmentService->restore($cardId, $attachmentId, $type);
 	}
 }