Remove the analytics view.

Author: tim-schilling

project/newsletter/test_views.py

@@ -419,81 +419,3 @@ def test_update(self):
         )
         self.assertRedirects(response, reverse("newsletter:list_posts"))
         self.assertEqual(self.subscription.categories.get(), self.data.career)
-
-
-class TestAnalytics(DataTestCase):
-    def test_basic(self):
-        self.client.force_login(self.user)
-        response = self.client.get(reverse("newsletter:analytics"))
-        self.assertTemplateUsed(response, "staff/analytics.html")
-        self.assertEqual(
-            response.context["aggregates"],
-            {
-                "Subscriptions": 1,
-                "Subscriptions (30 days)": 1,
-                "Subscriptions (90 days)": 1,
-                "Subscriptions (180 days)": 1,
-                "Posts": 3,
-                "Posts (30 days)": 3,
-                "Posts (90 days)": 3,
-                "Posts (180 days)": 3,
-            },
-        )
-
-        self.assertEqual(
-            response.context["subscription_category_aggregates"],
-            {
-                self.data.career.title: 1,
-                self.data.social.title: 1,
-            },
-        )
-        self.assertEqual(
-            response.context["post_category_aggregates"],
-            {
-                self.data.career.title: 2,
-                self.data.social.title: 2,
-            },
-        )
-
-    def test_date_aggregates(self):
-        # Create users that are outside the cut-off points.
-        for days in [31, 91, 181]:
-            user = User.objects.create_user(username=f"days{days}")
-            subscription = Subscription.objects.create(user=user)
-            # We can't specify created in .create() because it's automatically set.
-            Subscription.objects.filter(id=subscription.id).update(
-                created=timezone.now() - timedelta(days=days)
-            )
-            subscription.categories.set([self.data.career, self.data.social])
-
-        self.client.force_login(self.user)
-        response = self.client.get(reverse("newsletter:analytics"))
-        self.assertTemplateUsed(response, "staff/analytics.html")
-        self.assertEqual(
-            response.context["aggregates"],
-            {
-                "Subscriptions": 4,
-                "Subscriptions (30 days)": 1,
-                "Subscriptions (90 days)": 2,
-                "Subscriptions (180 days)": 3,
-                "Posts": 3,
-                "Posts (30 days)": 3,
-                "Posts (90 days)": 3,
-                "Posts (180 days)": 3,
-            },
-        )
-
-        self.assertEqual(
-            response.context["subscription_category_aggregates"],
-            {
-                self.data.career.title: 4,
-                self.data.social.title: 4,
-            },
-        )
-        self.assertEqual(
-            response.context["post_category_aggregates"],
-            {
-                self.data.career.title: 2,
-                self.data.social.title: 2,
-            },
-        )

project/newsletter/urls.py

@@ -7,7 +7,6 @@
     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"),
     path("post/create/", views.create_post, name="create_post"),
     path("post/<slug>/update/", views.update_post, name="update_post"),

project/newsletter/views.py

@@ -1,6 +1,5 @@
 import os
 import uuid
-from datetime import timedelta
 
 from django.conf import settings
 from django.contrib import messages
@@ -10,17 +9,16 @@
 from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
 from django.core.paginator import Paginator
-from django.db.models import Case, Count, F, Q, Value, When
+from django.db.models import Case, F, Value, When
 from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_http_methods
 from martor.utils import LazyEncoder
 
 from project.newsletter import operations
 from project.newsletter.forms import PostForm, SubscriptionForm
-from project.newsletter.models import Category, Post, Subscription
+from project.newsletter.models import Post, Subscription
 
 LIST_POSTS_PAGE_SIZE = 100
 
@@ -187,83 +185,6 @@ def toggle_post_privacy(request, slug):
     return redirect("newsletter:list_posts")
 
 
-@staff_member_required(login_url=settings.LOGIN_URL)
-@require_http_methods(["GET"])
-def analytics(request):
-    """
-    The post detail view.
-    """
-    now = timezone.now()
-    subscription_aggregates = Subscription.objects.all().aggregate(
-        subscriptions=Count("user", distinct=True, filter=Q(categories__isnull=False)),
-        subscriptions_30_days=Count(
-            "id",
-            filter=Q(categories__isnull=False, created__gte=now - timedelta(days=30)),
-            distinct=True,
-        ),
-        subscriptions_90_days=Count(
-            "id",
-            filter=Q(categories__isnull=False, created__gte=now - timedelta(days=90)),
-            distinct=True,
-        ),
-        subscriptions_180_days=Count(
-            "id",
-            filter=Q(categories__isnull=False, created__gte=now - timedelta(days=180)),
-            distinct=True,
-        ),
-    )
-    subscription_category_aggregates = dict(
-        Category.objects.annotate(count=Count("subscriptions"))
-        .order_by("title")
-        .values_list("title", "count")
-    )
-    post_aggregates = Post.objects.all().aggregate(
-        posts=Count("id"),
-        posts_30_days=Count(
-            "id",
-            filter=Q(created__gte=now - timedelta(days=30)),
-        ),
-        posts_90_days=Count(
-            "id",
-            filter=Q(created__gte=now - timedelta(days=90)),
-        ),
-        posts_180_days=Count(
-            "id",
-            filter=Q(created__gte=now - timedelta(days=180)),
-        ),
-    )
-    post_category_aggregates = dict(
-        Category.objects.annotate(count=Count("posts"))
-        .order_by("title")
-        .values_list("title", "count")
-    )
-
-    return render(
-        request,
-        "staff/analytics.html",
-        {
-            "aggregates": {
-                "Subscriptions": subscription_aggregates["subscriptions"],
-                "Subscriptions (30 days)": subscription_aggregates[
-                    "subscriptions_30_days"
-                ],
-                "Subscriptions (90 days)": subscription_aggregates[
-                    "subscriptions_90_days"
-                ],
-                "Subscriptions (180 days)": subscription_aggregates[
-                    "subscriptions_180_days"
-                ],
-                "Posts": post_aggregates["posts"],
-                "Posts (30 days)": post_aggregates["posts_30_days"],
-                "Posts (90 days)": post_aggregates["posts_90_days"],
-                "Posts (180 days)": post_aggregates["posts_180_days"],
-            },
-            "subscription_category_aggregates": subscription_category_aggregates,
-            "post_category_aggregates": post_category_aggregates,
-        },
-    )
-
-
 @staff_member_required(login_url=settings.LOGIN_URL)
 @require_http_methods(["POST"])
 def markdown_uploader(request):

project/templates/base.html

@@ -35,9 +35,6 @@
           <a href="{% url "auth_login" %}" class="header item">Login</a>
         {% else %}
           <a href="{% url "newsletter:update_subscription" %}" class="header item">Settings</a>
-          {% if request.user.is_staff %}
-            <a href="{% url "newsletter:analytics" %}" class="header item">Analytics</a>
-          {% endif %}
         {% endif %}
         <div class="right menu">
           <a class="item" href="https://github.com/tim-schilling/debug-tutorial" target="_blank">