changes

service/cardservice.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace OCA\Deck\Service;
+
+use OCP\ILogger;
+use OCP\IL10N;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Utility\ITimeFactory;
+
+use \OCA\Deck\Db\Card;
+use \OCA\Deck\Db\CardMapper;
+
+
+class CardService  {
+
+    private $cardMapper;
+    private $logger;
+
+
+    public function __construct(CardMapper $cardMapper) {
+        $this->cardMapper = $cardMapper;
+    }
+
+    public function find($userId, $cardId) {
+        return $this->cardMapper->find($cardId);
+    }
+    public function create($title, $stackId, $type, $order, $owner) {
+        $card = new Card();
+        $card->setTitle($title);
+        $card->setStackId($stackId);
+        $card->setType($type);
+        $card->setOrder($order);
+        $card->setOwner($owner);
+        return $this->cardMapper->insert($card);
+
+    }
+
+    public function delete($userId, $id) {
+        return $this->cardMapper->delete($this->cardMapper->find($id));
+    }
+
+    public function update($id, $title, $stackId, $type, $order, $owner) {
+        $card = $this->cardMapper->find($id);
+        $card->setTitle($title);
+        $card->setStackId($stackId);
+        $card->setType($type);
+        $card->setOrder($order);
+        $card->setOwner($owner);
+        return $this->cardMapper->update($card);
+    }
+
+    public function reorder($id, $stackId, $order) {
+        $cards = $this->cardMapper->findAll($stackId);
+        $i = 0;
+        foreach ($cards as $card) {
+            if($card->id == $id) {
+                $card->setOrder($order);
+            }
+
+            if($i == $order)
+                $i++;
+
+            if($card->id !== $id) {
+                $card->setOrder($i++);
+            }
+
+            $this->cardMapper->update($card);
+        }
+        // FIXME: return reordered cards without an additional db query
+        $cards = $this->cardMapper->findAll($stackId);
+        return $cards;
+    }
+}

service/stackservice.php

@@ -2,6 +2,7 @@
 
 namespace OCA\Deck\Service;
 
+use OCA\Deck\Db\CardMapper;
 use OCP\ILogger;
 use OCP\IL10N;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -14,19 +15,25 @@ use \OCA\Deck\Db\StackMapper;
 class StackService  {
 
     private $stackMapper;
+    private $cardMapper;
     private $logger;
     private $l10n;
     private $timeFactory;
 
-    public function __construct(StackMapper $stackMapper, ILogger $logger,
+    public function __construct(StackMapper $stackMapper, CardMapper $cardMapper,ILogger $logger,
                                 IL10N $l10n,
                                 ITimeFactory $timeFactory) {
         $this->stackMapper = $stackMapper;
+        $this->cardMapper = $cardMapper;
         $this->logger = $logger;
     }
 
     public function findAll($boardId) {
-        return $this->stackMapper->findAll($boardId);
+        $stacks = $this->stackMapper->findAll($boardId);
+        foreach ($stacks as $idx => $s) {
+            $stacks[$idx]->setCards($this->cardMapper->findAll($s->id));
+        }
+        return $stacks;
     }
 
     public function create($title, $boardId, $order) {