Skip to content

Commit

Permalink
feat: Add IAB blog feed
Browse files Browse the repository at this point in the history
  • Loading branch information
kesara committed Jul 17, 2023
1 parent 2bb8467 commit 360e8b9
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
9 changes: 9 additions & 0 deletions ietf/blog/feeds.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,12 @@ def item_author_name(self, item):

def item_pubdate(self, item):
return item.date

class IABBlogFeed(BlogFeed):
def items(self):
return (
BlogPage.objects.live()
.filter(topics__topic__slug="iab")
.annotate(d=Coalesce("date_published", "first_published_at"))
.order_by("-d")
)
22 changes: 21 additions & 1 deletion ietf/blog/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from wagtail.models import Page, Site

from ..home.models import HomePage
from .models import BlogIndexPage, BlogPage
from ..snippets.models import Topic
from .models import BlogIndexPage, BlogPage, BlogPageTopic


class BlogTests(TestCase):
Expand Down Expand Up @@ -100,3 +101,22 @@ def test_previous_next_links_correct(self):
blog = BlogPage.objects.get(pk=self.blog.pk)
self.assertEquals(self.prevblog, blog.previous)
self.assertEquals(self.nextblog, blog.next)

def test_blog_feed(self):
r = self.client.get(path='/blog/feed/')
self.assertEqual(r.status_code, 200)
self.assertIn(self.blog.url.encode(), r.content)
self.assertIn(self.otherblog.url.encode(), r.content)

def test_iab_feed(self):
topic=Topic(title="iab", slug="iab")
topic.save()
iab_topic = BlogPageTopic(topic=topic, page=self.otherblog)
iab_topic.save()
self.otherblog.topics = [iab_topic, ]
self.otherblog.save()

r = self.client.get(path='/blog/iab/feed/')
self.assertEqual(r.status_code, 200)
self.assertNotIn(self.blog.url.encode(), r.content)
self.assertIn(self.otherblog.url.encode(), r.content)
3 changes: 2 additions & 1 deletion ietf/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from wagtail.documents import urls as wagtaildocs_urls

from ietf.bibliography import urls as bibliography_urls
from ietf.blog.feeds import BlogFeed
from ietf.blog.feeds import BlogFeed, IABBlogFeed
from ietf.search.views import search
from ietf.snippets import urls as snippet_urls

Expand All @@ -21,6 +21,7 @@
url(r"^bibliography/", include(bibliography_urls)),
url(r"^django-admin/", admin.site.urls),
url(r"^blog/feed/$", BlogFeed(), name="blog_feed"),
url(r"^blog/iab/feed/$", IABBlogFeed(), name="iab_blog_feed"),
url(r"^admin/", include(wagtailadmin_urls)),
url(r"^documents/", include(wagtaildocs_urls)),
url(r"^search/$", search, name="search"),
Expand Down

0 comments on commit 360e8b9

Please sign in to comment.