Merge pull request #261 from tobiasKaminsky/wip

wip

Author: tobiasKaminsky

lib/Controller/GroceryListController.php

@@ -79,7 +79,13 @@ public function showGroceryListSettings($id)
 	 */
 	public function lists()
 	{
-		return new DataResponse($this->groceryListMapper->findAll());
+		$lists = $this->groceryListMapper->findAll();
+
+        foreach ($lists as $list) {
+            $list->setUncheckedCount($this->itemMapper->findAllUnchecked($list->getId()));
+        }
+
+        return new DataResponse($lists);
 	}
 
 	/**
@@ -173,6 +179,16 @@ public function listItems(int $id)
 		return new DataResponse($this->itemMapper->findAll($id));
 	}
 
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @param int $id
+     */
+    public function countUnckedItems(int $id)
+    {
+        return new DataResponse($this->itemMapper->findAllUnchecked($id));
+    }
+
 	/**
 	 * @NoAdminRequired
 	 * @param int $id

lib/Db/GroceryList.php

@@ -28,10 +28,16 @@ class GroceryList extends Entity implements JsonSerializable {
 	 */
 	protected $showOnlyUnchecked;
 
+    /**
+     * @var int
+     */
+    protected $uncheckedCount;
+
 	public function __construct() {
 		$this->addType('title', 'string');
 		$this->addType('userId', 'string');
 		$this->addType('showOnlyUnchecked', 'int');
+        $this->addType('uncheckedCount', 'int');
 	}
 
 	public function getShowOnlyUnchecked(): bool {
@@ -42,12 +48,18 @@ public function setShowOnlyUnchecked(bool $showOnlyUnchecked): void {
 		$this->setter('showOnlyUnchecked', [$showOnlyUnchecked ? 1 : 0]);
 	}
 
+    public function setUncheckedCount(int $count): void {
+        $this->setter('uncheckedCount', [$count]);
+    }
+
+
 	public function jsonSerialize(): array {
 		return [
 			'id' => $this->getId(),
 			'title' => $this->getTitle(),
 			'userId' => $this->getUserId(),
 			'showOnlyUnchecked' => $this->getShowOnlyUnchecked(),
+            'uncheckedCount' => $this->uncheckedCount,
 		];
 	}
 }

lib/Db/GroceryListMapper.php

@@ -48,7 +48,10 @@ private function findById(int $id) {
 		return $this->findEntity($qb);
 	}
 
-	public function findAll() {
+    /**
+     * @return GroceryList[]
+     */
+	public function findAll() : array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('*')

lib/Db/ItemMapper.php

@@ -31,8 +31,9 @@ public function find(int $id): Item {
 	}
 
 	/**
-	 * @throws Exception
-	 */
+	 * @return GroceryList[]
+     * @throws Exception
+     */
 	public function findAll(int $id): array {
 		$qb = $this->db->getQueryBuilder();
 
@@ -44,6 +45,20 @@ public function findAll(int $id): array {
 		return $this->findEntities($qb);
 	}
 
+    /**
+     * @throws Exception
+     */
+    public function findAllUnchecked(int $id): int {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('list', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('checked', $qb->createNamedParameter(0)));
+
+        return sizeof($this->findEntities($qb));
+    }
+
 	public function categoryUsed(int $id): bool {
 		$qb = $this->db->getQueryBuilder();