From dcadd8bcb3763ad99a39732c02623a459c65b041 Mon Sep 17 00:00:00 2001
From: Andrew Northall <andrew@northall.me.uk>
Date: Tue, 19 Dec 2023 10:06:18 +0000
Subject: [PATCH] Remove public_statistics option

---
 app/logger/tests/test_user_profile.py         | 19 -------------------
 app/logger/views/userprofile.py               |  8 +++-----
 app/templates/users/account.html              | 14 --------------
 app/users/admin.py                            |  1 -
 app/users/factories.py                        |  1 -
 app/users/forms.py                            |  2 --
 ...044_remove_cavinguser_public_statistics.py | 16 ++++++++++++++++
 app/users/models.py                           |  8 --------
 app/users/tests/test_custom_user_model.py     |  2 --
 9 files changed, 19 insertions(+), 52 deletions(-)
 create mode 100644 app/users/migrations/0044_remove_cavinguser_public_statistics.py

diff --git a/app/logger/tests/test_user_profile.py b/app/logger/tests/test_user_profile.py
index ad32124a..9cb5363a 100644
--- a/app/logger/tests/test_user_profile.py
+++ b/app/logger/tests/test_user_profile.py
@@ -156,25 +156,6 @@ def test_user_profile_page_with_various_privacy_settings(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, self.user.name)
 
-    @tag("privacy")
-    def test_public_statistics_privacy_setting(self):
-        """Test that the public statistics privacy setting works"""
-        for i in range(0, 50):
-            TripFactory(user=self.user)
-        self.user.public_statistics = False
-        self.user.save()
-
-        response = self.client.get(self.user.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
-        self.assertNotContains(response, '<div class="profile-stats')
-
-        self.user.public_statistics = True
-        self.user.save()
-
-        response = self.client.get(self.user.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, '<div class="profile-stats')
-
     def test_friends_appear_on_the_user_profile_page(self):
         """Test that friends appear on the user profile page when viewed by the user"""
         self.client.force_login(self.user)
diff --git a/app/logger/views/userprofile.py b/app/logger/views/userprofile.py
index 4aba0fca..3c411363 100644
--- a/app/logger/views/userprofile.py
+++ b/app/logger/views/userprofile.py
@@ -68,15 +68,13 @@ def get_context_data(self, **kwargs):
             context["trips"] = self.get_trips(user)
             context["photos"] = self.profile_user.get_photos(for_user=user)
             context["quick_stats"] = self.profile_user.quick_stats
+            context["stats"] = statistics.yearly(
+                self.profile_user.trips.exclude(type=Trip.SURFACE)
+            )
             context["enable_private_stats"] = (
                 self.profile_user == user
             ) or user.is_superuser
         else:
             context["private_profile"] = True
 
-        if self.profile_user.public_statistics:
-            context["stats"] = statistics.yearly(
-                self.profile_user.trips.exclude(type=Trip.SURFACE)
-            )
-
         return context
diff --git a/app/templates/users/account.html b/app/templates/users/account.html
index 5d1baa97..60452d0b 100644
--- a/app/templates/users/account.html
+++ b/app/templates/users/account.html
@@ -177,20 +177,6 @@ <h3 class="fs-5">Profile settings</h3>
           </div>
         </div>
 
-        <div class="row p-1 border-bottom">
-          <div class="col-5 col-md-4 col-lg-3 col-xl-2 account-info-label">
-            Statistics
-          </div>
-
-          <div class="col account-info-data">
-            {% if user.privacy == user.PRIVATE %}
-              Public statistics are disabled as your profile is private.
-            {% else %}
-              Statistics are {% if not user.public_statistics %}not {% endif %}shown on your profile page.
-            {% endif %}
-          </div>
-        </div>
-
         <div class="row p-1">
           <div class="col-5 col-md-4 col-lg-3 col-xl-2 account-info-label">
             Biography
diff --git a/app/users/admin.py b/app/users/admin.py
index e81cfbe3..0830f06d 100644
--- a/app/users/admin.py
+++ b/app/users/admin.py
@@ -114,7 +114,6 @@ class CavingUserAdmin(BaseUserAdmin, ModelAdmin):
                     "allow_friend_email",
                     "allow_friend_username",
                     "allow_comments",
-                    "public_statistics",
                     "email_friend_requests",
                 ),
             },
diff --git a/app/users/factories.py b/app/users/factories.py
index 24cefc10..89d3ac66 100644
--- a/app/users/factories.py
+++ b/app/users/factories.py
@@ -20,7 +20,6 @@ class Meta:
     location = factory.Faker("city")
     clubs = factory.LazyFunction(generate_club)
     timezone = factory.Faker("timezone")
-    public_statistics = factory.Faker("pybool")
     allow_friend_email = factory.Faker("pybool")
     allow_friend_username = factory.Faker("pybool")
     allow_comments = factory.Faker("pybool")
diff --git a/app/users/forms.py b/app/users/forms.py
index a3630fa9..8b53afca 100644
--- a/app/users/forms.py
+++ b/app/users/forms.py
@@ -289,7 +289,6 @@ class Meta:
             "allow_friend_email",
             "allow_comments",
             "show_cavers_on_trip_list",
-            "public_statistics",
             "disable_distance_statistics",
             "disable_survey_statistics",
             "disable_stats_over_time",
@@ -318,7 +317,6 @@ def __init__(self, *args, **kwargs):
             ),
             HTML('<h5 class="mt-3">Statistics</h5>'),
             Div(
-                Div("public_statistics", css_class="col"),
                 Div("disable_distance_statistics", css_class="col"),
                 Div("disable_survey_statistics", css_class="col"),
                 Div("disable_stats_over_time", css_class="col"),
diff --git a/app/users/migrations/0044_remove_cavinguser_public_statistics.py b/app/users/migrations/0044_remove_cavinguser_public_statistics.py
new file mode 100644
index 00000000..34f7f08f
--- /dev/null
+++ b/app/users/migrations/0044_remove_cavinguser_public_statistics.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2 on 2023-12-19 10:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0043_cavinguser_profile_view_count"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="cavinguser",
+            name="public_statistics",
+        ),
+    ]
diff --git a/app/users/models.py b/app/users/models.py
index 1043f1aa..6e6d00b2 100644
--- a/app/users/models.py
+++ b/app/users/models.py
@@ -259,14 +259,6 @@ class CavingUser(AbstractBaseUser, PermissionsMixin):
             "comments, but will hide them until it is re-enabled."
         ),
     )
-    public_statistics = models.BooleanField(
-        "Show statistics on profile",
-        default=True,
-        help_text=(
-            "Enabling this option will show an annual statistics table on your "
-            "profile page which will be visible to anyone who can view your profile."
-        ),
-    )
     disable_distance_statistics = models.BooleanField(
         "Disable distance statistics",
         default=False,
diff --git a/app/users/tests/test_custom_user_model.py b/app/users/tests/test_custom_user_model.py
index ba945c3d..788bfe35 100644
--- a/app/users/tests/test_custom_user_model.py
+++ b/app/users/tests/test_custom_user_model.py
@@ -464,7 +464,6 @@ def test_submit_updates_to_settings(self):
                 "privacy": "Friends",
                 "timezone": "US/Central",
                 "units": "Imperial",
-                "public_statistics": True,
                 "settings_submit": "Save",
             },
             follow=True,
@@ -480,7 +479,6 @@ def test_submit_updates_to_settings(self):
         self.assertEqual(self.user.privacy, self.user.FRIENDS)
         self.assertEqual(self.user.timezone, ZoneInfo("US/Central"))
         self.assertEqual(self.user.units, self.user.IMPERIAL)
-        self.assertTrue(self.user.public_statistics)
 
     def test_submit_invalid_updates_to_profile(self):
         """Test submitting invalid updates to a user's profile"""