nextcloud
/
news
зеркало из https://github.com/nextcloud/news.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

try marking same items as read if they contain the same content

This commit is contained in:
Bernhard Posselt 2016-04-06 23:43:27 +02:00
Родитель 4f8b81c7a3
Коммит 65d28653ae
7 изменённых файлов: 142 добавлений и 65 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
db/itemmapper.php
Просмотреть файл

@ -379,5 +379,29 @@ class ItemMapper extends NewsMapper {
}
}
public function readItem($itemId, $isRead, $lastModified, $userId) {
$item = $this->find($itemId, $userId);
// reading an item should set all of the same items as read, whereas
// marking an item as unread should only mark the selected instance
// as unread
if ($isRead) {
$sql = 'UPDATE `*PREFIX*news_items`
SET `status` = `status` & ?
AND `last_modified` = ?
WHERE `fingerprint` = ?
AND feed_id IN (
SELECT `f`.`id` FROM `*PREFIX*news_feeds` `f`
WHERE `f`.`user_id` = ?
)';
$params = [~StatusFlag::UNREAD, $lastModified,
$item->getFingerprint(), $userId];
$this->execute($sql, $params);
} else {
$item->setLastModified($lastModified);
$item->setUnread();
$this->update($item);
}
}
}

17
db/mysql/itemmapper.php
Просмотреть файл

@ -63,5 +63,22 @@ class ItemMapper extends \OCA\News\Db\ItemMapper {
}
public function readItem($itemId, $isRead, $lastModified, $userId) {
if ($isRead) {
$sql = 'UPDATE `*PREFIX*news_items` `items`
JOIN `*PREFIX*news_feeds` `feeds`
ON `feeds`.`id` = `items`.`feed_id`
SET `items`.`status` = `items`.`status` & ?
AND `items`.`last_modified` = ?
WHERE `items`.`fingerprint` = ?
AND `feeds`.`user_id` = ?';
$params = [~StatusFlag::UNREAD, $lastModified,
$item->getFingerprint(), $userId];
$this->execute($sql, $params);
} else {
// no other behavior for mysql if should be marked unread
parent::readItem($itemId, $isRead, $lastModified, $userId);
}
}
}

10
service/itemservice.php
Просмотреть файл

@ -148,14 +148,8 @@ class ItemService extends Service {
* @throws ServiceNotFoundException if the item does not exist
*/
public function read($itemId, $isRead, $userId){
$item = $this->find($itemId, $userId);
$item->setLastModified($this->timeFactory->getTime());
if($isRead){
$item->setRead();
} else {
$item->setUnread();
}
$this->itemMapper->update($item);
$lastModified = $this->timeFactory->getTime();
$this->itemMapper->readItem($itemId, $isRead, $lastModified, $userId);
}

71
tests/integration/db/ItemMapperTest.php
Просмотреть файл

@ -225,30 +225,73 @@ class ItemMapperTest extends IntegrationTest {
}
/* TBD
public function testFindAllFolder () {
public function testReadItem() {
$this->loadFixtures('readitem');
// assert that all items are unread
$feed = $this->feedMapper->where(['userId' => 'john'])[0];
$items = $this->itemMapper->where(['feedId' => $feed->getId()]);
foreach ($items as $item) {
$this->assertTrue($item->isUnread());
}
$feed = $this->feedMapper->where(['userId' => 'test'])[0];
$items = $this->itemMapper->where(['feedId' => $feed->getId()]);
foreach ($items as $item) {
$this->assertTrue($item->isUnread());
}
// read an item
$duplicateItem = $this->itemMapper->where(['feedId' => $feed->getId()])[0];
$this->itemMapper->readItem($duplicateItem->getId(), true, 1000, $this->user);
public function testFindAllFeed () {
// assert that all test user's same items are read
$items = $this->itemMapper->where(['feedId' => $feed->getId(), 'title' => 'blubb']);
foreach ($items as $item) {
$this->assertTrue($item->isRead());
}
public function testFindAllNew () {
// assert that a different item is not read
$items = $this->itemMapper->where(['feedId' => $feed->getId(), 'title' => 'blubbs']);
foreach ($items as $item) {
$this->assertTrue($item->isUnread());
}
public function testFindAllNewFolder () {
// assert that other user's same items stayed the same
$johnsFeed = $this->feedMapper->where(['userId' => 'john'])[0];
$items = $this->itemMapper->where(['feedId' => $johnsFeed->getId()]);
foreach ($items as $item) {
$this->assertTrue($item->isUnread());
}
}
public function testUnreadItem() {
$this->loadFixtures('readitem');
// unread an item
$feed = $this->feedMapper->where(['userId' => 'test'])[0];
$duplicateItem = $this->itemMapper->where(['feedId' => $feed->getId()])[0];
$this->itemMapper->readItem($duplicateItem->getId(), true, 1000, $this->user);
$this->itemMapper->readItem($duplicateItem->getId(), false, 1000, $this->user);
public function testFindAllNewFeed () {
// assert that only one item is now unread
$items = $this->itemMapper->where(['feedId' => $feed->getId(), 'title' => 'blubb']);
foreach ($items as $item) {
if ($item->getId() === $duplicateItem->getId()) {
$this->assertTrue($item->isUnread());
} else {
$this->assertTrue($item->isRead());
}
}
// assert that other user's same items stayed the same
$johnsFeed = $this->feedMapper->where(['userId' => 'john'])[0];
$items = $this->itemMapper->where(['feedId' => $johnsFeed->getId()]);
foreach ($items as $item) {
$this->assertTrue($item->isUnread());
}
}
protected function tearDown() {
parent::tearDown();
$this->clearUserNewsDatabase('john');
}
*/
}

33
tests/integration/fixtures/data/readitem.php Normal file
Просмотреть файл

@ -0,0 +1,33 @@
<?php
/**
* ownCloud - News
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @copyright Bernhard Posselt 2015
*/
return [
'feeds' => [
[
'title' => 'john feed',
'userId' => 'john',
'items' => [
['title' => 'blubb', 'status' => 2],
['title' => 'blubb', 'status' => 2]
]
],
[
'title' => 'test feed',
'userId' => 'test',
'items' => [
['title' => 'blubb', 'status' => 2],
['title' => 'blubbs', 'status' => 2],
['title' => 'blubb', 'status' => 2],
['title' => 'blubb', 'status' => 2]
]
]
]
];

3
tests/integration/fixtures/itemfixture.php
Просмотреть файл

@ -42,9 +42,8 @@ class ItemFixture extends Item {
$defaults['guidHash'] = $defaults['guid'];
}
$this->generateSearchIndex();
$this->fillDefaults($defaults);
$this->generateSearchIndex();
}
}

43
tests/unit/service/ItemServiceTest.php
Просмотреть файл

@ -272,34 +272,6 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
$this->assertTrue($item->isUnstarred());
}
public function testUnread(){
$itemId = 3;
$item = new Item();
$item->setStatus(128);
$item->setId($itemId);
$item->setRead();
$expectedItem = new Item();
$expectedItem->setStatus(128);
$expectedItem->setUnread();
$expectedItem->setId($itemId);
$expectedItem->setLastModified($this->time);
$this->mapper->expects($this->once())
->method('find')
->with($this->equalTo($itemId), $this->equalTo($this->user))
->will($this->returnValue($item));
$this->mapper->expects($this->once())
->method('update')
->with($this->equalTo($expectedItem));
$this->itemService->read($itemId, false, $this->user);
$this->assertTrue($item->isUnread());
}
public function testRead(){
$itemId = 3;
$item = new Item();
@ -314,17 +286,14 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
$expectedItem->setLastModified($this->time);
$this->mapper->expects($this->once())
->method('find')
->with($this->equalTo($itemId), $this->equalTo($this->user))
->method('readItem')
->with($this->equalTo($itemId),
$this->equalTo(true),
$this->equalTo($this->time),
$this->equalTo($this->user))
->will($this->returnValue($item));
$this->mapper->expects($this->once())
->method('update')
->with($this->equalTo($expectedItem));
$this->itemService->read($itemId, true, $this->user);
$this->assertTrue($item->isRead());
}
@ -471,5 +440,3 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
}