opensourcemirror
/
nextcloud-news
mirror of https://github.com/nextcloud/news.git
1
0
Fork 0
Code Issues Releases Wiki Activity

db: no longer order by items.last_modified 

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
This commit is contained in:
Sean Molenaar 2021-05-04 21:05:27 +02:00 committed by Benjamin Brahmer
parent 3eb8b070fb
commit 5ba75f4e22
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
### Changed
### Fixed
- newestId does not return newest ID but last updated
# Releases
## [15.4.4] - 2021-05-21

4
lib/Db/ItemMapperV2.php
View File

@ -302,7 +302,6 @@ class ItemMapperV2 extends NewsMapperV2
->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id')
->where('feeds.user_id = :userId')
->setParameter('userId', $userId)
->orderBy('items.last_modified', 'DESC')
->addOrderBy('items.id', 'DESC')
->setMaxResults(1);
@ -337,7 +336,6 @@ class ItemMapperV2 extends NewsMapperV2
'feedId' => $feedId,
'userId'=> $userId,
])
->orderBy('items.last_modified', 'DESC')
->addOrderBy('items.id', 'DESC');
if ($hideRead === true) {
@ -377,7 +375,6 @@ class ItemMapperV2 extends NewsMapperV2
'folderId' => $folderId,
'userId' => $userId,
])
->orderBy('items.last_modified', 'DESC')
->addOrderBy('items.id', 'DESC');
if ($hideRead === true) {
@ -410,7 +407,6 @@ class ItemMapperV2 extends NewsMapperV2
'updatedSince' => number_format($updatedSince, 0, '.', ''),
'userId' => $userId,
])
->orderBy('items.last_modified', 'DESC')
->addOrderBy('items.id', 'DESC');
switch ($feedType) {

16
tests/Unit/Db/ItemMapperAfterTest.php
View File

@ -81,7 +81,7 @@ class ItemMapperAfterTest extends MapperTestUtility
])
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -152,7 +152,7 @@ class ItemMapperAfterTest extends MapperTestUtility
->with('unread', true)
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -220,7 +220,7 @@ class ItemMapperAfterTest extends MapperTestUtility
])
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -294,7 +294,7 @@ class ItemMapperAfterTest extends MapperTestUtility
->with('unread', true)
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -363,7 +363,7 @@ class ItemMapperAfterTest extends MapperTestUtility
->with('unread', true)
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -432,7 +432,7 @@ class ItemMapperAfterTest extends MapperTestUtility
->with('starred', true)
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -495,7 +495,7 @@ class ItemMapperAfterTest extends MapperTestUtility
])
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());
@ -561,7 +561,7 @@ class ItemMapperAfterTest extends MapperTestUtility
])
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());

2
tests/Unit/Db/ItemMapperTest.php
View File

@ -432,7 +432,7 @@ class ItemMapperTest extends MapperTestUtility
->with('items', 'news_feeds', 'feeds', 'items.feed_id = feeds.id')
->will($this->returnSelf());
$this->builder->expects($this->once())
$this->builder->expects($this->never())
->method('orderBy')
->with('items.last_modified', 'DESC')
->will($this->returnSelf());