summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bl/bl.php59
-rw-r--r--bl/blexception.php39
-rw-r--r--bl/folderbl.php55
-rw-r--r--db/feedmapper.php1
-rw-r--r--doc/mapper spec.md14
-rw-r--r--tests/bl/BlTest.php107
-rw-r--r--tests/bl/FeedBlTest.php98
7 files changed, 349 insertions, 24 deletions
diff --git a/bl/bl.php b/bl/bl.php
new file mode 100644
index 000000000..eeabdcb17
--- /dev/null
+++ b/bl/bl.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\Bl;
+
+use \OCA\AppFramework\Db\DoesNotExistException;
+use \OCA\AppFramework\Db\MultipleObjectsReturnedException;
+
+use \OCA\News\Db\NewsMapper;
+
+
+abstract class Bl {
+
+ protected $mapper;
+
+ public function __construct(NewsMapper $mapper){
+ $this->mapper = $mapper;
+ }
+
+
+ public function delete($id, $userId){
+ $entity = $this->find($id, $userId);
+ $this->mapper->delete($entity);
+ }
+
+
+ public function find($id, $userId){
+ try {
+ return $this->mapper->find($id, $userId);
+ } catch(DoesNotExistException $ex){
+ throw new BLException($ex->getMessage());
+ } catch(MultipleObjectsReturnedException $ex){
+ throw new BLException($ex->getMessage());
+ }
+ }
+
+} \ No newline at end of file
diff --git a/bl/blexception.php b/bl/blexception.php
new file mode 100644
index 000000000..fca362ea7
--- /dev/null
+++ b/bl/blexception.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\Bl;
+
+
+class BLException extends \Exception {
+
+ /**
+ * Constructor
+ * @param string $msg the error message
+ */
+ public function __construct($msg){
+ parent::__construct($msg);
+ }
+
+} \ No newline at end of file
diff --git a/bl/folderbl.php b/bl/folderbl.php
index 85c386d90..9f9c09d15 100644
--- a/bl/folderbl.php
+++ b/bl/folderbl.php
@@ -1,27 +1,61 @@
<?php
-namespace OCA\News;
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
-class FolderBl {
+namespace OCA\News\Bl;
+
+use \OCA\News\Db\Folder;
+
+
+class FolderBl extends Bl {
public function __construct($folderMapper){
- $this->folderMapper = $folderMapper;
+ parent::__construct($folderMapper);
}
- public function getAll() {
- return $this->folderMapper->getAll();
+
+ public function getAll($userId) {
+ return $this->mapper->findAllFromUser($userId);
}
+
public function create($name, $parentId) {
- //TODO: change the setparentid in the model class Folder
- $folder = new Folder($name, null, null);
- return $this->folderMapper->save($folder);
+ $folder = new Folder();
+ $folder->setName($name);
+ $folder->setParentId($parentId);
+ return $this->mapper->insert($folder);
}
- public function delete($folderid) {
- return $this->folderMapper->deleteById($folderid);
+
+ public function setOpened($folderId, $opened, $userId){
+ $folder = $this->find($folderId, $userId);
+ $folder->setOpened($opened);
+ $this->mapper->update($folder);
}
+
+/*
public function modify($folderid, $name = null, $parent = null, $opened = null) {
$folder = $this->folderMapper->find($folderid);
if(!$folder)
@@ -35,4 +69,5 @@ class FolderBl {
$folder->setOpened($opened);
return $this->folderMapper->update($folder);
}
+*/
}
diff --git a/db/feedmapper.php b/db/feedmapper.php
index 3d1c4d773..fbadb989a 100644
--- a/db/feedmapper.php
+++ b/db/feedmapper.php
@@ -35,6 +35,7 @@ class FeedMapper extends NewsMapper {
parent::__construct($api, 'news_feeds');
}
+ // TODO: add unread_count!
public function find($id, $userId){
$sql = 'SELECT * FROM `*dbprefix*news_feeds` ' .
diff --git a/doc/mapper spec.md b/doc/mapper spec.md
index 1080884db..2996dc6c6 100644
--- a/doc/mapper spec.md
+++ b/doc/mapper spec.md
@@ -1,11 +1,3 @@
-itemmapper
-
-<<<<<<< Updated upstream
-find(int $feedId, $userId)
-
-
-
-findAll()
request: get just starred items of a user
SELECT * FROM items
@@ -37,9 +29,3 @@ request: get all items of a feed of a user (unread and read)
all requests: can be specified using an (offset (id), limit) or (updatedSince (timestamp))
-
-
-foldermapper
-
-find($feedId, $userId)
-findAllFromUser($userId)
diff --git a/tests/bl/BlTest.php b/tests/bl/BlTest.php
new file mode 100644
index 000000000..5dc16d5a2
--- /dev/null
+++ b/tests/bl/BlTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\Bl;
+
+require_once(__DIR__ . "/../classloader.php");
+
+
+use \OCA\News\Db\Folder;
+
+
+class TestBl extends BL {
+ public function __construct($mapper){
+ parent::__construct($mapper);
+ }
+}
+
+class BlTest extends \OCA\AppFramework\Utility\TestUtility {
+
+ protected $api;
+ protected $newsMapper;
+ protected $newsBl;
+
+ protected function setUp(){
+ $this->api = $this->getAPIMock();
+ $this->newsMapper = $this->getMock('\OCA\News\Db\NewsMapper',
+ array('update', 'delete', 'find'), array($this->api, 'test'));
+ $this->newsBl = new TestBl($this->newsMapper);
+ }
+
+
+ public function testDelete(){
+ $id = 5;
+ $user = 'ken';
+ $folder = new Folder();
+ $folder->setId($id);
+
+ $this->newsMapper->expects($this->once())
+ ->method('delete')
+ ->with($this->equalTo($folder));
+ $this->newsMapper->expects($this->once())
+ ->method('find')
+ ->with($this->equalTo($id), $this->equalTo($user))
+ ->will($this->returnValue($folder));
+
+ $result = $this->newsBl->delete($id, $user);
+ }
+
+
+ public function testFind(){
+ $id = 3;
+ $user = 'ken';
+
+ $this->newsMapper->expects($this->once())
+ ->method('find')
+ ->with($this->equalTo($id), $this->equalTo($user));
+
+ $result = $this->newsBl->find($id, $user);
+ }
+
+
+ public function testFindDoesNotExist(){
+ $ex = new \OCA\AppFramework\Db\DoesNotExistException('hi');
+
+ $this->newsMapper->expects($this->once())
+ ->method('find')
+ ->will($this->throwException($ex));
+
+ $this->setExpectedException('\OCA\News\Bl\BLException');
+ $this->newsBl->find(1, '');
+ }
+
+
+ public function testFindMultiple(){
+ $ex = new \OCA\AppFramework\Db\MultipleObjectsReturnedException('hi');
+
+ $this->newsMapper->expects($this->once())
+ ->method('find')
+ ->will($this->throwException($ex));
+
+ $this->setExpectedException('\OCA\News\Bl\BLException');
+ $this->newsBl->find(1, '');
+ }
+
+}
diff --git a/tests/bl/FeedBlTest.php b/tests/bl/FeedBlTest.php
new file mode 100644
index 000000000..01301b91f
--- /dev/null
+++ b/tests/bl/FeedBlTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\Bl;
+
+require_once(__DIR__ . "/../classloader.php");
+
+
+use \OCA\News\Db\Folder;
+
+
+class FolderBlTest extends \OCA\AppFramework\Utility\TestUtility {
+
+ protected $api;
+ protected $folderMapper;
+ protected $folderBl;
+
+ protected function setUp(){
+ $this->api = $this->getAPIMock();
+ $this->folderMapper = $this->getMock(
+ '\OCA\News\Db\NewsMapper',
+ array('findAllFromUser', 'insert', 'update', 'find'),
+ array($this->api, 'test'));
+ $this->folderBl = new FolderBl($this->folderMapper);
+ }
+
+
+ function testGetAll(){
+ $userId = 'jack';
+ $return = 'hi';
+ $this->folderMapper->expects($this->once())
+ ->method('findAllFromUser')
+ ->with($this->equalTo($userId))
+ ->will($this->returnValue($return));
+
+ $result = $this->folderBl->getAll($userId);
+
+ $this->assertEquals($return, $result);
+ }
+
+
+ public function testCreate(){
+ $folder = new Folder();
+ $folder->setName('hey');
+ $folder->setParentId(5);
+
+ $this->folderMapper->expects($this->once())
+ ->method('insert')
+ ->with($this->equalTo($folder))
+ ->will($this->returnValue($folder));
+
+ $result = $this->folderBl->create('hey', 5);
+
+ $this->assertEquals($folder, $result);
+ }
+
+
+ public function testSetOpened(){
+ $folder = new Folder();
+
+ $this->folderMapper->expects($this->once())
+ ->method('find')
+ ->with($this->equalTo(3))
+ ->will($this->returnValue($folder));
+
+ $this->folderMapper->expects($this->once())
+ ->method('update')
+ ->with($this->equalTo($folder));
+
+ $this->folderBl->setOpened(3, false, '');
+
+ $this->assertFalse($folder->getOpened());
+
+ }
+
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 23:12:07 +0000