Readd list and landing views.

Author: tim-schilling

project/config/settings.py

@@ -161,7 +161,7 @@
 
 # Login URL setting
 LOGIN_URL = reverse_lazy("auth_login")
-LOGIN_REDIRECT_URL = "/"
+LOGIN_REDIRECT_URL = reverse_lazy("newsletter:landing")
 
 # Martor / Markdown editor
 

project/newsletter/syndication.py

@@ -1,4 +1,5 @@
 from django.contrib.syndication.views import Feed
+from django.urls import reverse
 
 from project.newsletter.models import Category, Post
 
@@ -46,7 +47,7 @@ def item_title(self, obj):
         return f"{obj.title} newsletter posts"
 
     def item_link(self, obj):
-        return "/p/" + f"?category={obj.slug}"
+        return reverse("newsletter:list_posts") + f"?category={obj.slug}"
 
     def items(self, obj):
         return (

project/newsletter/test_views.py

@@ -12,6 +12,88 @@
 from project.newsletter.test import DataTestCase
 
 
+class TestLanding(DataTestCase):
+    url = reverse("newsletter:landing")
+
+    def test_unauthenticated(self):
+        response = self.client.get(self.url)
+        self.assertTemplateUsed(response, "landing.html")
+        self.assertEqual(
+            list(response.context["posts"]), [self.data.career_post, self.data.all_post]
+        )
+
+    def test_authenticated_no_subscription(self):
+        self.client.force_login(User.objects.create_user(username="inline"))
+        response = self.client.get(self.url)
+        self.assertTemplateUsed(response, "landing.html")
+        self.assertEqual(
+            list(response.context["posts"]), [self.data.career_post, self.data.all_post]
+        )
+        # Verify the categories are rendered
+        self.assertContains(response, self.data.career_post.categories.first().title)
+
+    def test_authenticated_subscriber(self):
+        self.client.force_login(self.data.subscription.user)
+        response = self.client.get(self.url)
+        self.assertTemplateUsed(response, "landing.html")
+        self.assertEqual(
+            list(response.context["posts"]),
+            [self.data.private_post, self.data.career_post, self.data.all_post],
+        )
+
+
+class TestListPosts(DataTestCase):
+    url = reverse("newsletter:list_posts")
+
+    @patch("project.newsletter.views.LIST_POSTS_PAGE_SIZE", 1)
+    def test_unauthenticated(self):
+        response = self.client.get(self.url)
+        self.assertTemplateUsed(response, "posts/list.html")
+        self.assertEqual(list(response.context["page"]), [self.data.career_post])
+
+        # Verify the pagination exists.
+        self.assertInHTML(
+            '<a class="item active" href="?page=1">1</a>',
+            response.content.decode("utf-8"),
+        )
+        self.assertInHTML(
+            '<a class="item" href="?page=2">2</a>', response.content.decode("utf-8")
+        )
+
+    @patch("project.newsletter.views.LIST_POSTS_PAGE_SIZE", 1)
+    def test_authenticated(self):
+        self.client.force_login(self.data.subscription.user)
+        response = self.client.get(self.url)
+        self.assertTemplateUsed(response, "posts/list.html")
+        self.assertEqual(list(response.context["page"]), [self.data.private_post])
+
+        # Verify the categories are rendered
+        self.assertContains(response, self.data.private_post.categories.first().title)
+        # Verify the pagination exists.
+        self.assertInHTML(
+            '<a class="item active" href="?page=1">1</a>',
+            response.content.decode("utf-8"),
+        )
+        self.assertInHTML(
+            '<a class="item" href="?page=2">2</a>', response.content.decode("utf-8")
+        )
+
+    @patch("project.newsletter.views.LIST_POSTS_PAGE_SIZE", 1)
+    def test_pagination(self):
+        self.client.force_login(self.data.subscription.user)
+        response = self.client.get(self.url + "?page=2")
+        self.assertTemplateUsed(response, "posts/list.html")
+        self.assertEqual(list(response.context["page"]), [self.data.career_post])
+        # Verify the pagination exists.
+        self.assertInHTML(
+            '<a class="item" href="?page=1">1</a>', response.content.decode("utf-8")
+        )
+        self.assertInHTML(
+            '<a class="item active" href="?page=2">2</a>',
+            response.content.decode("utf-8"),
+        )
+
+
 class TestViewPost(DataTestCase):
     def test_unauthenticated(self):
         response = self.client.get(
@@ -227,7 +309,7 @@ def test_toggle(self):
         )
         url = reverse("newsletter:toggle_post_privacy", kwargs={"slug": post.slug})
         response = self.client.post(url)
-        self.assertRedirects(response, "/admin/")
+        self.assertRedirects(response, reverse("newsletter:list_posts"))
         post.refresh_from_db()
         self.assertFalse(post.is_public)
 
@@ -332,7 +414,10 @@ def test_invalid(self):
     def test_update(self):
         self.client.force_login(self.user)
         data = {"categories": [self.data.career.slug]}
-        self.client.post(reverse("newsletter:update_subscription"), data=data)
+        response = self.client.post(
+            reverse("newsletter:update_subscription"), data=data
+        )
+        self.assertRedirects(response, reverse("newsletter:list_posts"))
         self.assertEqual(self.subscription.categories.get(), self.data.career)
 
 

project/newsletter/urls.py

@@ -5,6 +5,7 @@
 app_name = "newsletter"
 urlpatterns = [
     path("markdown/uploader/", views.markdown_uploader, name="markdown_uploader"),
+    path("", views.landing, name="landing"),
     path("account/", views.update_subscription, name="update_subscription"),
     path("analytics/", views.analytics, name="analytics"),
     path("post/unpublished/", views.unpublished_posts, name="unpublished_posts"),
@@ -19,6 +20,7 @@
         "p/",
         include(
             [
+                path("", views.list_posts, name="list_posts"),
                 path("<slug>/", views.view_post, name="view_post"),
             ]
         ),

project/newsletter/views.py

@@ -25,6 +25,41 @@
 LIST_POSTS_PAGE_SIZE = 100
 
 
+@require_http_methods(["GET"])
+def landing(request):
+    """
+    The landing page view.
+
+    Render the public posts or the most recent posts an authenticated
+    user is subscribed for.
+    """
+    posts = Post.objects.recent_first().published().annotate_is_unread(request.user)
+    if request.user.is_authenticated and (
+        subscription := Subscription.objects.for_user(request.user)
+    ):
+        posts = posts.in_relevant_categories(subscription)
+    else:
+        posts = posts.public()
+    return render(request, "landing.html", {"posts": posts[:3]})
+
+
+@require_http_methods(["GET"])
+def list_posts(request):
+    """
+    The post lists view.
+    """
+    posts = Post.objects.recent_first().published().annotate_is_unread(request.user)
+    if not request.user.is_authenticated:
+        posts = posts.public()
+    paginator = Paginator(posts, LIST_POSTS_PAGE_SIZE)
+    page_number = request.GET.get("page")
+    page_obj = paginator.get_page(page_number)
+    page_range = paginator.get_elided_page_range(page_obj.number)
+    return render(
+        request, "posts/list.html", {"page": page_obj, "page_range": page_range}
+    )
+
+
 @require_http_methods(["GET"])
 def view_post(request, slug):
     """
@@ -64,7 +99,7 @@ def update_subscription(request):
                 form.instance.user = request.user
             form.save()
             messages.success(request, "Your subscription changes have been saved.")
-            return redirect("/")
+            return redirect("newsletter:list_posts")
     return render(request, "subscription/update.html", {"form": form})
 
 
@@ -139,7 +174,7 @@ def toggle_post_privacy(request, slug):
     messages.success(request, f"Post slug={slug} was updated.")
     if url := request.GET.get("next"):
         return redirect(url)
-    return redirect("/admin/")
+    return redirect("newsletter:list_posts")
 
 
 @staff_member_required(login_url=settings.LOGIN_URL)

project/templates/base.html

@@ -11,18 +11,19 @@
   <header>
     <div class="ui fixed inverted menu">
       <div class="ui container">
-        <a href="#" class="header item">
+        <a href="{% url "newsletter:landing" %}" class="header item">
           Debug Newsletter
         </a>
         {% if not request.user.is_staff %}
-        <a href="#" class="header item">
+          <a href="{% url "newsletter:list_posts" %}" class="header item">
             Posts
-        </a>
+          </a>
         {% else %}
           <div class="ui dropdown item" tabindex="0">
             Posts
             <i class="dropdown icon"></i>
             <div class="menu transition hidden" tabindex="-1">
+              <a href="{% url "newsletter:list_posts" %}" class="item">Published</a>
               <a href="{% url "newsletter:unpublished_posts" %}" class="item">Unpublished</a>
               <div class="divider"></div>
               <a href="{% url "newsletter:create_post" %}" class="item">Create</a>

project/templates/posts/detail.html

@@ -17,9 +17,9 @@
 {% block content %}
 <div class="ui main text container">
   <div class="ui breadcrumb">
-    <a href="/" class="section">Home</a>
+    <a href="{% url "newsletter:landing" %}" class="section">Home</a>
     <div class="divider"> / </div>
-    <a href="/p/" class="section">Posts</a>
+    <a href="{% url "newsletter:list_posts" %}" class="section">Posts</a>
     <div class="divider"> / </div>
     <div class="active section">
       {% if is_trending %}

project/templates/posts/list.html

@@ -7,7 +7,7 @@
   <div class="ui vertical stripe segment">
     <div class="ui text container">
       <div class="ui breadcrumb">
-        <a href="/" class="section">Home</a>
+        <a href="{% url "newsletter:landing" %}" class="section">Home</a>
         <div class="divider"> / </div>
         <div class="active section">Posts</div>
       </div>

project/templates/staff/analytics.html

@@ -8,7 +8,7 @@
   <div class="ui vertical stripe segment">
     <div class="ui text container">
       <div class="ui breadcrumb">
-        <a href="/" class="section">Home</a>
+        <a href="{% url "newsletter:landing" %}" class="section">Home</a>
         <div class="divider"> / </div>
         <div class="active section">Analytics</div>
       </div>