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

Lint fixes

Browse source
This commit is contained in:
Neil Martinsen-Burrell 2023-03-09 15:17:30 -06:00
parent 36eb7064c2
commit 99425ebc4f
No known key found for this signature in database
GPG key ID: 6A3C818CC10D0184
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/registrar/models/user_domain_role.py
View file

@ -2,6 +2,7 @@ from django.db import models
from .utility.time_stamped_model import TimeStampedModel from .utility.time_stamped_model import TimeStampedModel
class UserDomainRole(TimeStampedModel): class UserDomainRole(TimeStampedModel):
"""This is a linking table that connects a user with a role on a domain.""" """This is a linking table that connects a user with a role on a domain."""
@ -19,7 +20,7 @@ class UserDomainRole(TimeStampedModel):
user = models.ForeignKey( user = models.ForeignKey(
"registrar.User", "registrar.User",
null=False, null=False,
on_delete=models.CASCADE, # when a user is deleted, their permissions will be too on_delete=models.CASCADE, # when a user is deleted, permissions are too
related_name="permissions", related_name="permissions",
) )
@ -27,7 +28,7 @@ class UserDomainRole(TimeStampedModel):
"registrar.Domain", "registrar.Domain",
null=False, null=False,
on_delete=models.CASCADE, # when a domain is deleted, permissions are too on_delete=models.CASCADE, # when a domain is deleted, permissions are too
related_name="permissions" related_name="permissions",
) )
role = models.TextField( role = models.TextField(
@ -44,6 +45,6 @@ class UserDomainRole(TimeStampedModel):
# a user can have only one role on a given domain, that is, there can # a user can have only one role on a given domain, that is, there can
# be only a single row with a certain (user, domain) pair. # be only a single row with a certain (user, domain) pair.
models.UniqueConstraint( models.UniqueConstraint(
fields=['user', 'domain'], name='unique_user_domain_role' fields=["user", "domain"], name="unique_user_domain_role"
) )
] ]

15
src/registrar/tests/test_models.py
View file

@ -1,7 +1,14 @@
from django.test import TestCase from django.test import TestCase
from django.db.utils import IntegrityError from django.db.utils import IntegrityError
from registrar.models import Contact, DomainApplication, User, Website, Domain, UserDomainRole from registrar.models import (
Contact,
DomainApplication,
User,
Website,
Domain,
UserDomainRole,
)
from unittest import skip from unittest import skip
import boto3_mocking # type: ignore import boto3_mocking # type: ignore
@ -146,8 +153,9 @@ class TestPermissions(TestCase):
def test_approval_creates_role(self): def test_approval_creates_role(self):
domain, _ = Domain.objects.get_or_create(name="igorville.gov") domain, _ = Domain.objects.get_or_create(name="igorville.gov")
user, _ = User.objects.get_or_create() user, _ = User.objects.get_or_create()
application = DomainApplication.objects.create(creator=user, application = DomainApplication.objects.create(
requested_domain=domain) creator=user, requested_domain=domain
)
# skip using the submit method # skip using the submit method
application.status = DomainApplication.SUBMITTED application.status = DomainApplication.SUBMITTED
application.approve() application.approve()
@ -156,7 +164,6 @@ class TestPermissions(TestCase):
self.assertTrue(UserDomainRole.objects.get(user=user, domain=domain)) self.assertTrue(UserDomainRole.objects.get(user=user, domain=domain))
@skip("Not implemented yet.") @skip("Not implemented yet.")
class TestDomainApplicationLifeCycle(TestCase): class TestDomainApplicationLifeCycle(TestCase):
def test_application_approval(self): def test_application_approval(self):

1
src/registrar/tests/test_views.py
View file

@ -1116,7 +1116,6 @@ class TestDomainPermissions(TestWithUser):
class TestDomainDetail(TestDomainPermissions, WebTest): class TestDomainDetail(TestDomainPermissions, WebTest):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.app.set_user(self.user.username) self.app.set_user(self.user.username)

2
src/registrar/views/utility/mixins.py
View file

@ -29,7 +29,7 @@ class DomainPermission(PermissionsLoginMixin):
# user needs to have a role on the domain # user needs to have a role on the domain
try: try:
role = UserDomainRole.objects.get( UserDomainRole.objects.get(
user=self.request.user, domain__id=self.kwargs["pk"] user=self.request.user, domain__id=self.kwargs["pk"]
) )
except UserDomainRole.DoesNotExist: except UserDomainRole.DoesNotExist: