- {% include "django/admin/includes/contact_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
+ {% include "django/admin/includes/contact_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly user_verification_type=original_object.creator.get_verification_type_display%}
{% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
{% elif field.field.name == "submitter" %}
-
+
{% include "django/admin/includes/contact_detail_list.html" with user=original_object.submitter no_title_top_padding=field.is_readonly %}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index fb3f6b58f..b42667e01 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -3065,7 +3065,15 @@ class TestMyUserAdmin(TestCase):
request.user = create_user()
fieldsets = self.admin.get_fieldsets(request)
expected_fieldsets = (
- (None, {"fields": ("status",)}),
+ (
+ None,
+ {
+ "fields": (
+ "status",
+ "verification_type",
+ )
+ },
+ ),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Permissions", {"fields": ("is_active", "groups")}),
("Important dates", {"fields": ("last_login", "date_joined")}),
diff --git a/src/registrar/tests/test_management_scripts.py b/src/registrar/tests/test_management_scripts.py
index 1bb6c59b7..062136d1a 100644
--- a/src/registrar/tests/test_management_scripts.py
+++ b/src/registrar/tests/test_management_scripts.py
@@ -14,8 +14,9 @@ from registrar.models import (
TransitionDomain,
DomainInformation,
UserDomainRole,
+ VerifiedByStaff,
+ PublicContact,
)
-from registrar.models.public_contact import PublicContact
from django.core.management import call_command
from unittest.mock import patch, call
@@ -25,6 +26,103 @@ from .common import MockEppLib, less_console_noise, completed_domain_request
from api.tests.common import less_console_noise_decorator
+class TestPopulateVerificationType(MockEppLib):
+ """Tests for the populate_organization_type script"""
+
+ def setUp(self):
+ """Creates a fake domain object"""
+ super().setUp()
+
+ # Get the domain requests
+ self.domain_request_1 = completed_domain_request(
+ name="lasers.gov",
+ generic_org_type=DomainRequest.OrganizationChoices.FEDERAL,
+ is_election_board=True,
+ status=DomainRequest.DomainRequestStatus.IN_REVIEW,
+ )
+
+ # Approve the request
+ self.domain_request_1.approve()
+
+ # Get the domains
+ self.domain_1 = Domain.objects.get(name="lasers.gov")
+
+ # Get users
+ self.regular_user, _ = User.objects.get_or_create(username="testuser@igormail.gov")
+
+ vip, _ = VerifiedByStaff.objects.get_or_create(email="vipuser@igormail.gov")
+ self.verified_by_staff_user, _ = User.objects.get_or_create(username="vipuser@igormail.gov")
+
+ grandfathered, _ = TransitionDomain.objects.get_or_create(
+ username="grandpa@igormail.gov", domain_name=self.domain_1.name
+ )
+ self.grandfathered_user, _ = User.objects.get_or_create(username="grandpa@igormail.gov")
+
+ invited, _ = DomainInvitation.objects.get_or_create(
+ email="invited@igormail.gov", domain=self.domain_1, status=DomainInvitation.DomainInvitationStatus.RETRIEVED
+ )
+ self.invited_user, _ = User.objects.get_or_create(username="invited@igormail.gov")
+
+ self.untouched_user, _ = User.objects.get_or_create(
+ username="iaminvincible@igormail.gov", verification_type=User.VerificationTypeChoices.GRANDFATHERED
+ )
+
+ # Fixture users should be untouched by the script. These will auto update once the
+ # user logs in / creates an account.
+ self.fixture_user, _ = User.objects.get_or_create(
+ username="fixture@igormail.gov", verification_type=User.VerificationTypeChoices.FIXTURE_USER
+ )
+
+ def tearDown(self):
+ """Deletes all DB objects related to migrations"""
+ super().tearDown()
+
+ # Delete domains and related information
+ Domain.objects.all().delete()
+ DomainInformation.objects.all().delete()
+ DomainRequest.objects.all().delete()
+ User.objects.all().delete()
+ Contact.objects.all().delete()
+ Website.objects.all().delete()
+
+ @less_console_noise_decorator
+ def run_populate_verification_type(self):
+ """
+ This method executes the populate_organization_type command.
+
+ The 'call_command' function from Django's management framework is then used to
+ execute the populate_organization_type command with the specified arguments.
+ """
+ with patch(
+ "registrar.management.commands.utility.terminal_helper.TerminalHelper.query_yes_no_exit", # noqa
+ return_value=True,
+ ):
+ call_command("populate_verification_type")
+
+ @less_console_noise_decorator
+ def test_verification_type_script_populates_data(self):
+ """Ensures that the verification type script actually populates data"""
+
+ # Run the script
+ self.run_populate_verification_type()
+
+ # Scripts don't work as we'd expect in our test environment, we need to manually
+ # trigger the refresh event
+ self.regular_user.refresh_from_db()
+ self.grandfathered_user.refresh_from_db()
+ self.invited_user.refresh_from_db()
+ self.verified_by_staff_user.refresh_from_db()
+ self.untouched_user.refresh_from_db()
+
+ # Test all users
+ self.assertEqual(self.regular_user.verification_type, User.VerificationTypeChoices.REGULAR)
+ self.assertEqual(self.grandfathered_user.verification_type, User.VerificationTypeChoices.GRANDFATHERED)
+ self.assertEqual(self.invited_user.verification_type, User.VerificationTypeChoices.INVITED)
+ self.assertEqual(self.verified_by_staff_user.verification_type, User.VerificationTypeChoices.VERIFIED_BY_STAFF)
+ self.assertEqual(self.untouched_user.verification_type, User.VerificationTypeChoices.GRANDFATHERED)
+ self.assertEqual(self.fixture_user.verification_type, User.VerificationTypeChoices.FIXTURE_USER)
+
+
class TestPopulateOrganizationType(MockEppLib):
"""Tests for the populate_organization_type script"""
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index fc391f8b5..6448e91e1 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -344,8 +344,6 @@ class TestDomainManagers(TestDomainOverview):
def tearDown(self):
"""Ensure that the user has its original permissions"""
super().tearDown()
- self.user.is_staff = False
- self.user.save()
def test_domain_managers(self):
response = self.client.get(reverse("domain-users", kwargs={"pk": self.domain.id}))
diff --git a/src/requirements.txt b/src/requirements.txt
index 3c005f162..017d42542 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,8 +1,8 @@
-i https://pypi.python.org/simple
annotated-types==0.6.0; python_version >= '3.8'
asgiref==3.8.1; python_version >= '3.8'
-boto3==1.34.88; python_version >= '3.8'
-botocore==1.34.88; python_version >= '3.8'
+boto3==1.34.90; python_version >= '3.8'
+botocore==1.34.90; python_version >= '3.8'
cachetools==5.3.3; python_version >= '3.7'
certifi==2024.2.2; python_version >= '3.6'
cfenv==0.5.3
@@ -15,7 +15,7 @@ dj-email-url==1.0.6
django==4.2.10; python_version >= '3.8'
django-admin-multiple-choice-list-filter==0.1.1
django-allow-cidr==0.7.1
-django-auditlog==2.3.0; python_version >= '3.7'
+django-auditlog==3.0.0; python_version >= '3.8'
django-cache-url==3.4.5
django-cors-headers==4.3.1; python_version >= '3.8'
django-csp==3.8
@@ -44,8 +44,8 @@ phonenumberslite==8.13.35
psycopg2-binary==2.9.9; python_version >= '3.7'
pycparser==2.22; python_version >= '3.8'
pycryptodomex==3.20.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-pydantic==2.7.0; python_version >= '3.8'
-pydantic-core==2.18.1; python_version >= '3.8'
+pydantic==2.7.1; python_version >= '3.8'
+pydantic-core==2.18.2; python_version >= '3.8'
pydantic-settings==2.2.1; python_version >= '3.8'
pyjwkest==1.4.2
python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'