Added subscription to API

1 files changed, 8 insertions, 20 deletions

diff --git a/lib/Controller/SubscriptionController.php b/lib/Controller/SubscriptionController.php
index 8a5bf445..d201fa6e 100644
--- a/lib/Controller/SubscriptionController.php
+++ b/lib/Controller/SubscriptionController.php
@@ -25,7 +25,6 @@ namespace OCA\Polls\Controller;
 
 use Exception;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 
 use OCP\IRequest;
 use OCP\ILogger;
@@ -73,19 +72,13 @@ class SubscriptionController extends Controller {
 	 * @return DataResponse
 	 */
 	public function get($pollId) {
-
-		if (!\OC::$server->getUserSession()->isLoggedIn()) {
-			return new DataResponse(null, Http::STATUS_UNAUTHORIZED);
-		}
-
 		try {
-			$this->mapper->findByUserAndPoll($pollId, $this->userId);
-		} catch (MultipleObjectsReturnedException $e) {
-			// should not happen, but who knows
+			return new DataResponse($this->subscriptionService->get($pollId), Http::STATUS_OK);
+		} catch (NotAuthorizedException $e) {
+			return new DataResponse('Unauthorized', Http::STATUS_FORBIDDEN);
 		} catch (DoesNotExistException $e) {
-			return new DataResponse(null, Http::STATUS_NOT_FOUND);
+			return new DataResponse('Not subscribed', Http::STATUS_NOT_FOUND);
 		}
-		return new DataResponse(null, Http::STATUS_OK);
 	}
 
 	/**
@@ -94,15 +87,10 @@ class SubscriptionController extends Controller {
 	 * @param integer $pollId
 	 */
 	public function set($pollId, $subscribed) {
-		if ($subscribed) {
-			$subscription = new Subscription();
-			$subscription->setPollId($pollId);
-			$subscription->setUserId($this->userId);
-			$this->mapper->insert($subscription);
-			return true;
-		} else {
-			$this->mapper->unsubscribe($pollId, $this->userId);
-			return false;
+		try {
+			return new DataResponse($this->subscriptionService->set($pollId, $subscribed), Http::STATUS_OK);
+		} catch (NotAuthorizedException $e) {
+			return new DataResponse('Unauthorized', Http::STATUS_FORBIDDEN);
 		}
 	}
 }