sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Merge branch 'post-sorting' into 'development'

Browse source 
Fix post sorting by rule

See merge request sonny/newsreader!36
This commit is contained in:
sonny 2020-08-31 22:38:59 +02:00
commit 7ee5ad7879
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/newsreader/js/pages/homepage/components/postlist/filters.js
View file

@ -11,7 +11,9 @@ export const filterPostsByRule = (rule = {}, posts = []) => {
const filteredData = filteredPosts.map(post => ({ ...post, rule: { ...rule } })); const filteredData = filteredPosts.map(post => ({ ...post, rule: { ...rule } }));
return filteredData.length > 0 ? [...filteredData] : []; return filteredData.sort((firstPost, secondPost) => {
return new Date(secondPost.publicationDate) - new Date(firstPost.publicationDate);
});
}; };
export const filterPostsByCategory = (category = {}, rules = [], posts = []) => { export const filterPostsByCategory = (category = {}, rules = [], posts = []) => {

11
src/newsreader/news/collection/tests/endpoints/rule/list/tests.py
View file

@ -165,7 +165,12 @@ class NestedRuleListViewTestCase(TestCase):
def test_pagination(self): def test_pagination(self):
rule = FeedFactory.create(user=self.user) rule = FeedFactory.create(user=self.user)
FeedPostFactory.create_batch(size=80, rule=rule)
posts = sorted(
FeedPostFactory.create_batch(size=80, rule=rule),
key=lambda post: post.publication_date,
reverse=True,
)
response = self.client.get( response = self.client.get(
reverse("api:news:collection:rules-nested-posts", kwargs={"pk": rule.pk}), reverse("api:news:collection:rules-nested-posts", kwargs={"pk": rule.pk}),
@ -177,6 +182,10 @@ class NestedRuleListViewTestCase(TestCase):
self.assertEquals(data["count"], 80) self.assertEquals(data["count"], 80)
self.assertEquals(len(data["results"]), 30) self.assertEquals(len(data["results"]), 30)
self.assertEquals(
[post["id"] for post in data["results"]], [post.id for post in posts[:30]]
)
def test_empty(self): def test_empty(self):
rule = FeedFactory.create(user=self.user) rule = FeedFactory.create(user=self.user)