zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-03 09:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix test + lint

Browse source
This commit is contained in:
zandercymatics 2024-04-22 11:08:59 -06:00
parent 68e44eb98e
commit 2a7eb6db81
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/fixtures_users.py
View file

@ -6,7 +6,7 @@ from registrar.models import (
User, User,
UserGroup, UserGroup,
) )
from registrar.models.verified_by_staff import VerifiedByStaff
fake = Faker() fake = Faker()
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

9
src/registrar/models/user.py
View file

@ -29,12 +29,13 @@ class User(AbstractUser):
Users achieve access to our system in a few different ways. Users achieve access to our system in a few different ways.
These choices reflect those pathways. These choices reflect those pathways.
""" """
GRANDFATHERED = "grandfathered", "Legacy user" GRANDFATHERED = "grandfathered", "Legacy user"
VERIFIED_BY_STAFF = "verified_by_staff", "Verified by staff" VERIFIED_BY_STAFF = "verified_by_staff", "Verified by staff"
REGULAR = "regular", "Verified by Login.gov" REGULAR = "regular", "Verified by Login.gov"
INVITED = "invited", "Invited by a domain manager" INVITED = "invited", "Invited by a domain manager"
# We need a type for fixture users (rather than using verified by staff) # We need a type for fixture users (rather than using verified by staff)
# because those users still do get "verified" through normal means # because those users still do get "verified" through normal means
# after they login. # after they login.
FIXTURE_USER = "fixture_user", "Created by fixtures" FIXTURE_USER = "fixture_user", "Created by fixtures"
@ -153,7 +154,7 @@ class User(AbstractUser):
@classmethod @classmethod
def get_verification_type_from_email(cls, email, invitation_status=DomainInvitation.DomainInvitationStatus.INVITED): def get_verification_type_from_email(cls, email, invitation_status=DomainInvitation.DomainInvitationStatus.INVITED):
"""Retrieves the verification type based off of a provided email address""" """Retrieves the verification type based off of a provided email address"""
verification_type = None verification_type = None
if TransitionDomain.objects.filter(username=email).exists(): if TransitionDomain.objects.filter(username=email).exists():
# A new incoming user who is a domain manager for one of the domains # A new incoming user who is a domain manager for one of the domains
@ -164,12 +165,12 @@ class User(AbstractUser):
# New users flagged by Staff to bypass ial2 # New users flagged by Staff to bypass ial2
verification_type = cls.VerificationTypeChoices.VERIFIED_BY_STAFF verification_type = cls.VerificationTypeChoices.VERIFIED_BY_STAFF
elif DomainInvitation.objects.filter(email=email, status=invitation_status).exists(): elif DomainInvitation.objects.filter(email=email, status=invitation_status).exists():
# A new incoming user who is being invited to be a domain manager (that is, # A new incoming user who is being invited to be a domain manager (that is,
# their email address is in DomainInvitation for an invitation that is not yet "retrieved"). # their email address is in DomainInvitation for an invitation that is not yet "retrieved").
verification_type = cls.VerificationTypeChoices.INVITED verification_type = cls.VerificationTypeChoices.INVITED
else: else:
verification_type = cls.VerificationTypeChoices.REGULAR verification_type = cls.VerificationTypeChoices.REGULAR
return verification_type return verification_type
def check_domain_invitations_on_login(self): def check_domain_invitations_on_login(self):

2
src/registrar/tests/test_admin.py
View file

@ -2820,7 +2820,7 @@ class MyUserAdminTest(TestCase):
request.user = create_user() request.user = create_user()
fieldsets = self.admin.get_fieldsets(request) fieldsets = self.admin.get_fieldsets(request)
expected_fieldsets = ( expected_fieldsets = (
(None, {"fields": ("password", "status")}), (None, {"fields": ("password", "status", "verification_type")}),
("Personal Info", {"fields": ("first_name", "last_name", "email")}), ("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Permissions", {"fields": ("is_active", "groups")}), ("Permissions", {"fields": ("is_active", "groups")}),
("Important dates", {"fields": ("last_login", "date_joined")}), ("Important dates", {"fields": ("last_login", "date_joined")}),