From 6e28031419689c4e509247e276411784ce5150c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@lebouder.net>
Date: Fri, 13 Sep 2024 17:05:28 -0400
Subject: [PATCH] users: {community,commercial}_terms_accepted

We don't use the fields anymore.
---
 ansible_ai_connect/test_utils.py              |  3 ---
 ansible_ai_connect/users/admin.py             | 14 -------------
 .../users/management/commands/createtoken.py  |  3 ---
 ...user_commercial_terms_accepted_and_more.py | 21 +++++++++++++++++++
 ansible_ai_connect/users/models.py            |  2 --
 5 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 ansible_ai_connect/users/migrations/0014_remove_user_commercial_terms_accepted_and_more.py

diff --git a/ansible_ai_connect/test_utils.py b/ansible_ai_connect/test_utils.py
index 0159302e8..1ce080883 100644
--- a/ansible_ai_connect/test_utils.py
+++ b/ansible_ai_connect/test_utils.py
@@ -26,7 +26,6 @@
 from django.contrib.auth.models import Group
 from django.core.cache import cache
 from django.test import TestCase
-from django.utils import timezone
 from rest_framework.test import APITransactionTestCase
 from segment import analytics
 from social_django.models import UserSocialAuth
@@ -214,8 +213,6 @@ def setUp(self):
         self.create_user()
 
         self.user.user_id = str(uuid4())
-        self.user.community_terms_accepted = timezone.now()
-        self.user.save()
 
         group_1, _ = Group.objects.get_or_create(name="Group 1")
         group_2, _ = Group.objects.get_or_create(name="Group 2")
diff --git a/ansible_ai_connect/users/admin.py b/ansible_ai_connect/users/admin.py
index f3c6bcbdd..2c3898669 100644
--- a/ansible_ai_connect/users/admin.py
+++ b/ansible_ai_connect/users/admin.py
@@ -15,7 +15,6 @@
 from django.contrib import admin
 from django.contrib.auth.admin import GroupAdmin, UserAdmin
 from django.contrib.auth.models import Group
-from import_export import resources
 from import_export.admin import ExportMixin
 
 from .models import User
@@ -28,27 +27,14 @@ class MembershipInline(admin.TabularInline):
     extra = 0
 
 
-class UserTermsResource(resources.ModelResource):
-    class Meta:
-        model = User
-        fields = ["username", "community_terms_accepted", "commercial_terms_accepted"]
-        name = "Export only user terms"
-
-
 @admin.register(User)
 class WisdomUserAdmin(ExportMixin, UserAdmin):
-    resource_classes = [UserTermsResource]
     # add any additional fields you want to display in the User page
     list_display = (
         "username",
         "is_staff",
-        "community_terms_accepted",
-        "commercial_terms_accepted",
         "uuid",
     )
-    fieldsets = UserAdmin.fieldsets + (
-        (None, {"fields": ("community_terms_accepted", "commercial_terms_accepted")}),
-    )
     search_fields = UserAdmin.search_fields + ("uuid",)
 
 
diff --git a/ansible_ai_connect/users/management/commands/createtoken.py b/ansible_ai_connect/users/management/commands/createtoken.py
index c66c44e10..763bad05d 100644
--- a/ansible_ai_connect/users/management/commands/createtoken.py
+++ b/ansible_ai_connect/users/management/commands/createtoken.py
@@ -69,13 +69,10 @@ def handle(
         if u is None:
             if create_user:
                 self.stdout.write(f"Creating a new user {username}")
-                n = now()
                 u = User.objects.create_user(
                     username=username,
                     password=password,
                     external_username=username,
-                    community_terms_accepted=n,
-                    commercial_terms_accepted=n,
                 )
                 if organization_id:
                     u.organization = Organization.objects.get_or_create(id=organization_id)[0]
diff --git a/ansible_ai_connect/users/migrations/0014_remove_user_commercial_terms_accepted_and_more.py b/ansible_ai_connect/users/migrations/0014_remove_user_commercial_terms_accepted_and_more.py
new file mode 100644
index 000000000..428d093aa
--- /dev/null
+++ b/ansible_ai_connect/users/migrations/0014_remove_user_commercial_terms_accepted_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.16 on 2024-09-13 21:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0013_user_email_verified_user_family_name_user_given_name_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="user",
+            name="commercial_terms_accepted",
+        ),
+        migrations.RemoveField(
+            model_name="user",
+            name="community_terms_accepted",
+        ),
+    ]
diff --git a/ansible_ai_connect/users/models.py b/ansible_ai_connect/users/models.py
index 7dc5bc907..8d5c0747a 100644
--- a/ansible_ai_connect/users/models.py
+++ b/ansible_ai_connect/users/models.py
@@ -55,8 +55,6 @@ class Plan(models.Model):
 
 class User(ExportModelOperationsMixin("user"), AbstractUser):
     uuid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
-    community_terms_accepted = models.DateTimeField(default=None, null=True)
-    commercial_terms_accepted = models.DateTimeField(default=None, null=True)
     organization_id = deprecate_field(models.IntegerField(default=None, null=True))
     organization = NonClashingForeignKey(
         Organization,