Address PR feedback: move view counting logic to PublishedProject model

Author: lukepayyapilli

physionet-django/project/modelcomponents/publishedproject.py

@@ -4,6 +4,7 @@
 from distutils.version import StrictVersion
 
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.urls import reverse
 from django.utils import timezone
@@ -385,3 +386,60 @@ def get_all_news(self):
             link_all_versions=True).exclude(project=self)
 
         return direct_news | linked_news
+
+    def view_count(self, all_versions=False):
+        """
+        Return the count of unique registered users who have viewed this project.
+
+        Args:
+            all_versions: If True, count views across all versions of this project.
+                         If False (default), count only views of this specific version.
+        """
+        from project.models import AccessLog
+
+        if all_versions:
+            versions = PublishedProject.objects.filter(slug=self.slug)
+            total = 0
+            for v in versions:
+                content_type = ContentType.objects.get_for_model(v)
+                total += AccessLog.objects.filter(
+                    object_id=v.id,
+                    content_type=content_type
+                ).unique_viewers_count()
+            return total
+        else:
+            content_type = ContentType.objects.get_for_model(self)
+            return AccessLog.objects.filter(
+                object_id=self.id,
+                content_type=content_type
+            ).unique_viewers_count()
+
+    def views_by_version(self):
+        """
+        Return a list of view counts for each version of this project.
+        """
+        from project.models import AccessLog
+
+        versions = PublishedProject.objects.filter(slug=self.slug).order_by('version_order')
+        result = []
+        for v in versions:
+            content_type = ContentType.objects.get_for_model(v)
+            count = AccessLog.objects.filter(
+                object_id=v.id,
+                content_type=content_type
+            ).unique_viewers_count()
+            result.append({'version': v.version, 'count': count})
+        return result
+
+    def views_over_time(self):
+        """
+        Return monthly view counts for this project version.
+        Each user is only counted in the month of their first view.
+        """
+        from project.models import AccessLog
+
+        content_type = ContentType.objects.get_for_model(self)
+        return AccessLog.objects.filter(
+            object_id=self.id,
+            content_type=content_type
+        ).first_views_by_month()

physionet-django/project/views.py

@@ -2013,17 +2013,8 @@ def published_project(request, project_slug, version, subdir=''):
     except AWS.DoesNotExist:
         user_in_access_point_policy = False
 
-    content_type = ContentType.objects.get_for_model(project)
-    project_views_count = AccessLog.objects.filter(
-        object_id=project.id,
-        content_type=content_type
-    ).values('user').distinct().count()
-
-    all_version_ids = PublishedProject.objects.filter(slug=project_slug).values_list('id', flat=True)
-    all_versions_views_count = AccessLog.objects.filter(
-        object_id__in=all_version_ids,
-        content_type=content_type
-    ).values('user').distinct().count()
+    project_views_count = project.view_count()
+    all_versions_views_count = project.view_count(all_versions=True)
 
     context = {
         'project': project,
@@ -2112,38 +2103,14 @@ def published_project_metrics(request, project_slug, version):
     """
     Public metrics page for a published project.
     """
-    from django.db.models import Count
-    from django.db.models.functions import TruncMonth
-
-    try:
-        project = PublishedProject.objects.get(slug=project_slug, version=version)
-    except ObjectDoesNotExist:
-        raise Http404()
-
-    content_type = ContentType.objects.get_for_model(project)
-
-    project_logs = AccessLog.objects.filter(object_id=project.id, content_type=content_type)
-    project_views_count = project_logs.unique_viewers_count()
-    views_over_time = project_logs.first_views_by_month()
-
-    all_versions = PublishedProject.objects.filter(slug=project_slug).order_by('version_order')
-    views_by_version = []
-    all_versions_views_count = 0
-    for v in all_versions:
-        v_content_type = ContentType.objects.get_for_model(v)
-        v_count = AccessLog.objects.filter(
-            object_id=v.id,
-            content_type=v_content_type
-        ).unique_viewers_count()
-        views_by_version.append({'version': v.version, 'count': v_count})
-        all_versions_views_count += v_count
+    project = get_object_or_404(PublishedProject, slug=project_slug, version=version)
 
     return render(request, 'project/published_project_metrics.html', {
         'project': project,
-        'project_views_count': project_views_count,
-        'all_versions_views_count': all_versions_views_count,
-        'views_over_time': views_over_time,
-        'views_by_version': views_by_version,
+        'project_views_count': project.view_count(),
+        'all_versions_views_count': project.view_count(all_versions=True),
+        'views_over_time': project.views_over_time(),
+        'views_by_version': project.views_by_version(),
     })