From 150adedd5504a6a48aaf4640594902e9718aaf21 Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Mon, 18 Dec 2023 10:32:48 +0000
Subject: [PATCH 1/6] Add profile view count

---
 app/logger/views/userprofile.py                 |  1 +
 app/templates/logger/_quick_stats.html          |  5 +++++
 app/templates/logger/profile.html               |  6 +++++-
 .../0043_cavinguser_profile_view_count.py       | 17 +++++++++++++++++
 app/users/models.py                             |  9 +++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 app/users/migrations/0043_cavinguser_profile_view_count.py

diff --git a/app/logger/views/userprofile.py b/app/logger/views/userprofile.py
index 3a249c76..4048d5da 100644
--- a/app/logger/views/userprofile.py
+++ b/app/logger/views/userprofile.py
@@ -28,6 +28,7 @@ def setup(self, *args, **kwargs):
         """Assign self.profile_user and perform permissions checks"""
         super().setup(*args, **kwargs)
         self.profile_user = get_object_or_404(User, username=self.kwargs["username"])
+        self.profile_user.add_profile_view(self.request.user)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
diff --git a/app/templates/logger/_quick_stats.html b/app/templates/logger/_quick_stats.html
index c80512bf..0ff20a37 100644
--- a/app/templates/logger/_quick_stats.html
+++ b/app/templates/logger/_quick_stats.html
@@ -97,6 +97,11 @@
   <span class="quick-stat-value">{{ quick_stats.qs_friends }}</span>
 </div>
 
+<div class="nav-item quick-stat">
+  <span class="quick-stat-name">Profile views</span>
+  <span class="quick-stat-value">{{ user.profile_view_count }}</span>
+</div>
+
 {% if user.has_social_media_links %}
   <div class="nav-item quick-stat">
     <span class="quick-stat-name">Social media</span>
diff --git a/app/templates/logger/profile.html b/app/templates/logger/profile.html
index 69311dc4..f73235cd 100644
--- a/app/templates/logger/profile.html
+++ b/app/templates/logger/profile.html
@@ -3,6 +3,7 @@
 {% load markdownify %}
 {% load core_tags %}
 {% load logger_tags %}
+{% load humanize %}
 
 {% block stylesheets %}
   {% if photos %}
@@ -302,7 +303,10 @@ <h3 class="my-3">{{ profile_user.name }}</h3>
             <dt class="col-sm-4">Account age</dt>
             <dd class="col-sm-8">{{ profile_user.date_joined|timesince }}</dd>
 
-            {% if user.has_social_media_links %}
+            <dt class="col-sm-4">Profile views</dt>
+            <dd class="col-sm-8">{{ profile_user.profile_view_count|intcomma }}</dd>
+
+            {% if profile_user.has_social_media_links %}
               <dt class="col-sm-4">Social media</dt>
               <dd class="col-sm-8 social-media-links">
                 {% include "logger/_social_media_links.html" with user=profile_user %}
diff --git a/app/users/migrations/0043_cavinguser_profile_view_count.py b/app/users/migrations/0043_cavinguser_profile_view_count.py
new file mode 100644
index 00000000..9fbb19f3
--- /dev/null
+++ b/app/users/migrations/0043_cavinguser_profile_view_count.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2 on 2023-12-18 10:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0042_remove_cavinguser_private_notes"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="cavinguser",
+            name="profile_view_count",
+            field=models.IntegerField(default=0),
+        ),
+    ]
diff --git a/app/users/models.py b/app/users/models.py
index 29bce7b7..179dc723 100644
--- a/app/users/models.py
+++ b/app/users/models.py
@@ -191,6 +191,9 @@ class CavingUser(AbstractBaseUser, PermissionsMixin):
         help_text="A profile picture to display on your public profile.",
     )
 
+    # Profile views
+    profile_view_count = models.IntegerField(default=0)
+
     #
     #  Settings
     #
@@ -445,6 +448,12 @@ def get_photos(self, for_user: Union["User", "CavingUser", None] = None):
 
         return qs
 
+    def add_profile_view(self, viewing: "User"):
+        if self == viewing:
+            return
+        self.profile_view_count += 1
+        self.save(update_fields=["profile_view_count"])
+
     @property
     def trips(self):
         return Trip.objects.filter(user=self)

From fc88bdbbd878f157dcadb008b6963354adf94822 Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Mon, 18 Dec 2023 10:59:52 +0000
Subject: [PATCH 2/6] Add trip view counts

---
 .../migrations/0045_add_trip_view_count.py      | 17 +++++++++++++++++
 app/logger/models/trip.py                       | 10 ++++++++++
 app/logger/services.py                          | 13 ++++++++++---
 app/logger/views/feed.py                        |  4 ++++
 app/logger/views/trips.py                       |  5 +++++
 app/templates/logger/_trip_data_blocks.html     |  8 ++++++++
 app/users/models.py                             |  6 ++++--
 7 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 app/logger/migrations/0045_add_trip_view_count.py

diff --git a/app/logger/migrations/0045_add_trip_view_count.py b/app/logger/migrations/0045_add_trip_view_count.py
new file mode 100644
index 00000000..cbc8afcc
--- /dev/null
+++ b/app/logger/migrations/0045_add_trip_view_count.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2 on 2023-12-18 10:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("logger", "0044_remove_trip_trip_report_trip_public_notes_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="trip",
+            name="view_count",
+            field=models.IntegerField(default=0),
+        ),
+    ]
diff --git a/app/logger/models/trip.py b/app/logger/models/trip.py
index 7cce330f..41a989ed 100644
--- a/app/logger/models/trip.py
+++ b/app/logger/models/trip.py
@@ -6,6 +6,7 @@
 from django.contrib.gis.db import models
 from django.core.exceptions import ValidationError
 from django.db.models import Sum
+from django.http.request import HttpRequest
 from django.urls import reverse
 
 from ..validators import (
@@ -321,6 +322,7 @@ class Trip(models.Model):
     followers = models.ManyToManyField(
         settings.AUTH_USER_MODEL, blank=True, related_name="followed_trips"
     )
+    view_count = models.IntegerField(default=0)
     featured_photo = models.ForeignKey(
         "logger.TripPhoto",
         null=True,
@@ -485,6 +487,14 @@ def get_liked_str(self, for_user=None, for_user_friends=None):
 
         return self._build_liked_str(liked_user_names, self_liked)
 
+    def add_view(self, request: HttpRequest, commit=True):
+        if request.user.is_anonymous or self.user == request.user:
+            return
+
+        self.view_count += 1
+        if commit:
+            self.save(update_fields=["view_count"])
+
     @property
     def latitude(self):
         return self.cave_coordinates.y if self.cave_coordinates else None
diff --git a/app/logger/services.py b/app/logger/services.py
index e84c66db..9ba2085f 100644
--- a/app/logger/services.py
+++ b/app/logger/services.py
@@ -1,7 +1,10 @@
+import typing
+
 import boto3
 from django.conf import settings
 from django.core.paginator import EmptyPage, Paginator
 from django.db.models import Case, Count, Exists, OuterRef, Q, Value, When
+from django.http import HttpRequest
 from users.models import CavingUser
 
 from .models import Trip, TripPhoto
@@ -90,14 +93,12 @@ def get_trips_context(request, ordering, page=1):
     sanitised_trips = [x for x in trips if x.is_viewable_by(request.user)]
 
     try:
-        paginated_trips = Paginator(
+        return Paginator(
             object_list=sanitised_trips, per_page=10, allow_empty_first_page=False
         ).page(page)
     except EmptyPage:
         return []
 
-    return paginated_trips
-
 
 def get_liked_str_context(request, trips):
     """Return a dictionary of liked strings for each trip
@@ -109,3 +110,9 @@ def get_liked_str_context(request, trips):
         liked_str_index[trip.pk] = trip.get_liked_str(request.user, friends)
 
     return liked_str_index
+
+
+def bulk_update_view_count(request: HttpRequest, trips: typing.Iterable[Trip]):
+    for trip in trips:
+        trip.add_view(request, commit=False)
+    Trip.objects.bulk_update(trips, ["view_count"])
diff --git a/app/logger/views/feed.py b/app/logger/views/feed.py
index e4b4c4f7..800c3386 100644
--- a/app/logger/views/feed.py
+++ b/app/logger/views/feed.py
@@ -44,6 +44,7 @@ def get_authenticated_context(self, **kwargs):
         # If there are no trips, show the new user page
         if context["trips"]:
             self.template_name = "logger/social_feed.html"
+            services.bulk_update_view_count(self.request, context["trips"])
         else:
             self.template_name = "core/new_user.html"
 
@@ -158,4 +159,7 @@ def get_context_data(self, **kwargs):
         context["liked_str"] = services.get_liked_str_context(
             self.request, context["trips"]
         )
+
+        services.bulk_update_view_count(self.request, context["trips"])
+
         return context
diff --git a/app/logger/views/trips.py b/app/logger/views/trips.py
index a5f8c5d7..3ff87893 100644
--- a/app/logger/views/trips.py
+++ b/app/logger/views/trips.py
@@ -72,6 +72,11 @@ class TripDetail(TripContextMixin, ViewableObjectDetailView):
     slug_field = "uuid"
     slug_url_kwarg = "uuid"
 
+    def get_object(self, *args, **kwargs):
+        obj = super().get_object(*args, **kwargs)
+        obj.add_view(self.request)
+        return obj
+
     def get_queryset(self):
         qs = (
             Trip.objects.all()
diff --git a/app/templates/logger/_trip_data_blocks.html b/app/templates/logger/_trip_data_blocks.html
index 7d185052..23070c37 100644
--- a/app/templates/logger/_trip_data_blocks.html
+++ b/app/templates/logger/_trip_data_blocks.html
@@ -1,5 +1,6 @@
 {% load users_tags %}
 {% load logger_tags %}
+{% load humanize %}
 
 {% if trip.cavers.all %}
   <div class="row mb-3">
@@ -86,4 +87,11 @@
       </div>
     {% endfor %}
   {% endif %}
+
+  {% if user == trip.user %}
+    <div class="col">
+      <span class="trip-field">View count</span>
+      {{ trip.view_count|intcomma }}
+    </div>
+  {% endif %}
 </div>
diff --git a/app/users/models.py b/app/users/models.py
index 179dc723..1043f1aa 100644
--- a/app/users/models.py
+++ b/app/users/models.py
@@ -15,6 +15,7 @@
 from django.core.validators import MinLengthValidator, RegexValidator
 from django.db import models
 from django.db.models import Count, Max, QuerySet, Sum
+from django.http import HttpRequest
 from django.urls import reverse
 from django.utils import timezone as django_tz
 from django.utils.functional import cached_property
@@ -448,9 +449,10 @@ def get_photos(self, for_user: Union["User", "CavingUser", None] = None):
 
         return qs
 
-    def add_profile_view(self, viewing: "User"):
-        if self == viewing:
+    def add_profile_view(self, request: HttpRequest):
+        if request.user == self or request.user.is_anonymous:
             return
+
         self.profile_view_count += 1
         self.save(update_fields=["profile_view_count"])
 

From a420b7df571b7f6712be70bf4df21a114154a34b Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Mon, 18 Dec 2023 11:00:04 +0000
Subject: [PATCH 3/6] Do not permit view count increments from anonymous users

---
 app/logger/views/userprofile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/logger/views/userprofile.py b/app/logger/views/userprofile.py
index 4048d5da..734e7a73 100644
--- a/app/logger/views/userprofile.py
+++ b/app/logger/views/userprofile.py
@@ -28,7 +28,7 @@ def setup(self, *args, **kwargs):
         """Assign self.profile_user and perform permissions checks"""
         super().setup(*args, **kwargs)
         self.profile_user = get_object_or_404(User, username=self.kwargs["username"])
-        self.profile_user.add_profile_view(self.request.user)
+        self.profile_user.add_profile_view(self.request)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data()

From 5f2ba02a1485007297dc50177ed1c37ea1ec1c5d Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Mon, 18 Dec 2023 11:06:35 +0000
Subject: [PATCH 4/6] Show private quick stats on profile page if user is owner

---
 app/logger/views/userprofile.py           |  1 +
 app/templates/logger/_quick_stats.html    | 12 +++++++-----
 app/templates/logger/profile.html         |  6 ++++--
 app/templates/sidebars/_profile_page.html |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/logger/views/userprofile.py b/app/logger/views/userprofile.py
index 734e7a73..b946fdfb 100644
--- a/app/logger/views/userprofile.py
+++ b/app/logger/views/userprofile.py
@@ -38,6 +38,7 @@ def get_context_data(self, **kwargs):
         context["photos"] = self.profile_user.get_photos(for_user=self.request.user)
         context["quick_stats"] = self.profile_user.quick_stats
         context["show_stats_link"] = self.profile_user == self.request.user
+        context["private_stats"] = self.profile_user == self.request.user
 
         if self.request.user not in self.profile_user.friends.all():
             if self.profile_user.allow_friend_username:
diff --git a/app/templates/logger/_quick_stats.html b/app/templates/logger/_quick_stats.html
index 0ff20a37..89576866 100644
--- a/app/templates/logger/_quick_stats.html
+++ b/app/templates/logger/_quick_stats.html
@@ -64,7 +64,7 @@
   <span class="quick-stat-value">{{ quick_stats.qs_longest_trip|shortdelta }}</span>
 </div>
 
-{% if private_stats %}
+{% if private_stats is True %}
   <div class="nav-item quick-stat border-top pt-2 mt-2">
     <span class="quick-stat-name">Last trip</span>
     <span class="quick-stat-value">
@@ -97,10 +97,12 @@
   <span class="quick-stat-value">{{ quick_stats.qs_friends }}</span>
 </div>
 
-<div class="nav-item quick-stat">
-  <span class="quick-stat-name">Profile views</span>
-  <span class="quick-stat-value">{{ user.profile_view_count }}</span>
-</div>
+{% if private_stats is True %}
+  <div class="nav-item quick-stat">
+    <span class="quick-stat-name">Profile views</span>
+    <span class="quick-stat-value">{{ user.profile_view_count }}</span>
+  </div>
+{% endif %}
 
 {% if user.has_social_media_links %}
   <div class="nav-item quick-stat">
diff --git a/app/templates/logger/profile.html b/app/templates/logger/profile.html
index f73235cd..6cc26bd9 100644
--- a/app/templates/logger/profile.html
+++ b/app/templates/logger/profile.html
@@ -303,8 +303,10 @@ <h3 class="my-3">{{ profile_user.name }}</h3>
             <dt class="col-sm-4">Account age</dt>
             <dd class="col-sm-8">{{ profile_user.date_joined|timesince }}</dd>
 
-            <dt class="col-sm-4">Profile views</dt>
-            <dd class="col-sm-8">{{ profile_user.profile_view_count|intcomma }}</dd>
+            {% if private_stats is True %}
+              <dt class="col-sm-4">Profile views</dt>
+              <dd class="col-sm-8">{{ profile_user.profile_view_count|intcomma }}</dd>
+            {% endif %}
 
             {% if profile_user.has_social_media_links %}
               <dt class="col-sm-4">Social media</dt>
diff --git a/app/templates/sidebars/_profile_page.html b/app/templates/sidebars/_profile_page.html
index d90d03ce..bc75f1c7 100644
--- a/app/templates/sidebars/_profile_page.html
+++ b/app/templates/sidebars/_profile_page.html
@@ -12,6 +12,6 @@
 
   {% if not private_profile %}
     {% include "logger/_quick_stats.html" with quick_stats=quick_stats user=profile_user %}
-    {% include "logger/_quick_friends.html" with friends=mutual_friends %}
+    {% include "logger/_quick_friends.html" with friends=mutual_friends private_stats=private_stats%}
   {% endif %}
 </div>

From 9d6058ae13192d2caf1c8d5ae72b4e40c0b71a2c Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Mon, 18 Dec 2023 11:08:20 +0000
Subject: [PATCH 5/6] Add missing space character

---
 app/templates/sidebars/_profile_page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/sidebars/_profile_page.html b/app/templates/sidebars/_profile_page.html
index bc75f1c7..b2d5e7e0 100644
--- a/app/templates/sidebars/_profile_page.html
+++ b/app/templates/sidebars/_profile_page.html
@@ -12,6 +12,6 @@
 
   {% if not private_profile %}
     {% include "logger/_quick_stats.html" with quick_stats=quick_stats user=profile_user %}
-    {% include "logger/_quick_friends.html" with friends=mutual_friends private_stats=private_stats%}
+    {% include "logger/_quick_friends.html" with friends=mutual_friends private_stats=private_stats %}
   {% endif %}
 </div>

From bff5326ead6c0dadcdf2df0f1f7b0996413fa5ee Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Mon, 18 Dec 2023 11:31:03 +0000
Subject: [PATCH 6/6] Minor refactors

---
 app/logger/services.py          | 3 +++
 app/logger/views/userprofile.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/logger/services.py b/app/logger/services.py
index 9ba2085f..b6265329 100644
--- a/app/logger/services.py
+++ b/app/logger/services.py
@@ -113,6 +113,9 @@ def get_liked_str_context(request, trips):
 
 
 def bulk_update_view_count(request: HttpRequest, trips: typing.Iterable[Trip]):
+    if not trips:
+        return
+
     for trip in trips:
         trip.add_view(request, commit=False)
     Trip.objects.bulk_update(trips, ["view_count"])
diff --git a/app/logger/views/userprofile.py b/app/logger/views/userprofile.py
index b946fdfb..743810c1 100644
--- a/app/logger/views/userprofile.py
+++ b/app/logger/views/userprofile.py
@@ -28,7 +28,10 @@ def setup(self, *args, **kwargs):
         """Assign self.profile_user and perform permissions checks"""
         super().setup(*args, **kwargs)
         self.profile_user = get_object_or_404(User, username=self.kwargs["username"])
+
+    def get(self, request, *args, **kwargs):
         self.profile_user.add_profile_view(self.request)
+        return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data()