From 4a17da5704e3714bce25a4614a7e0fabb68195af Mon Sep 17 00:00:00 2001 From: Ethan Nguyen Date: Fri, 30 Apr 2021 23:12:52 -0400 Subject: [PATCH] style: add type hints --- scripts/check.sh | 2 +- tjdests/apps/authentication/forms.py | 9 +++++++++ tjdests/apps/destinations/views.py | 2 ++ tjdests/apps/profile/tests.py | 4 ++-- tjdests/apps/profile/views.py | 10 ++++++++++ 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/scripts/check.sh b/scripts/check.sh index 7499ce0..5de221c 100755 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -32,4 +32,4 @@ for cmd in flake8 isort mypy pylint; do fi done -flake8 tjdests && isort --check tjdests && mypy tjdests && pylint tjdests \ No newline at end of file +flake8 tjdests && isort --check tjdests && mypy --check tjdests && pylint tjdests \ No newline at end of file diff --git a/tjdests/apps/authentication/forms.py b/tjdests/apps/authentication/forms.py index 5ea1fe2..5516466 100644 --- a/tjdests/apps/authentication/forms.py +++ b/tjdests/apps/authentication/forms.py @@ -43,6 +43,15 @@ class TOSForm(forms.Form): } ) + if password1 is None: + raise forms.ValidationError( + { + "password": [ + "You must provide a password.", + ] + } + ) + # Validate checkboxes checked accept_tos = cleaned_data.get("accept_tos") understand_no_reset = cleaned_data.get("understand_no_reset") diff --git a/tjdests/apps/destinations/views.py b/tjdests/apps/destinations/views.py index bbcb8c4..d869412 100644 --- a/tjdests/apps/destinations/views.py +++ b/tjdests/apps/destinations/views.py @@ -63,6 +63,7 @@ class StudentDestinationListView( return context def test_func(self): + assert self.request.user.is_authenticated return self.request.user.accepted_terms template_name = "destinations/student_list.html" @@ -186,6 +187,7 @@ class CollegeDestinationListView( return context def test_func(self): + assert self.request.user.is_authenticated return self.request.user.accepted_terms template_name = "destinations/college_list.html" diff --git a/tjdests/apps/profile/tests.py b/tjdests/apps/profile/tests.py index 32c7f60..886bd5c 100644 --- a/tjdests/apps/profile/tests.py +++ b/tjdests/apps/profile/tests.py @@ -192,7 +192,7 @@ class ProfileTest(TJDestsTestCase): self.assertEqual( 0, TestScore.objects.filter( - user=user, exam_type="ACT_COMP", exam_score=3.6 + user=user, exam_type="ACT_COMP", exam_score=3.6 # type: ignore ).count(), ) @@ -270,7 +270,7 @@ class ProfileTest(TJDestsTestCase): self.assertEqual( 0, TestScore.objects.filter( - user=user, exam_type="AP_CSA", exam_score=3.6 + user=user, exam_type="AP_CSA", exam_score=3.6 # type: ignore ).count(), ) diff --git a/tjdests/apps/profile/views.py b/tjdests/apps/profile/views.py index 7b8de37..b8ac52b 100644 --- a/tjdests/apps/profile/views.py +++ b/tjdests/apps/profile/views.py @@ -54,6 +54,7 @@ class TestScoreCreateView( return super().form_valid(form) def test_func(self): + assert self.request.user.is_authenticated return self.request.user.is_senior and self.request.user.accepted_terms def get_success_url(self): @@ -73,10 +74,12 @@ class TestScoreUpdateView( return super().form_valid(form) def get_queryset(self): + assert self.request.user.is_authenticated owner = self.request.user return self.model.objects.filter(user=owner) def test_func(self): + assert self.request.user.is_authenticated return self.request.user.is_senior and self.request.user.accepted_terms def get_success_url(self): @@ -91,10 +94,12 @@ class TestScoreDeleteView( success_message = "Test score deleted successfully." def get_queryset(self): + assert self.request.user.is_authenticated owner = self.request.user return self.model.objects.filter(user=owner) def test_func(self): + assert self.request.user.is_authenticated return self.request.user.is_senior and self.request.user.accepted_terms def get_success_url(self): @@ -119,6 +124,7 @@ class DecisionCreateView( return form_kwargs def test_func(self): + assert self.request.user.is_authenticated return self.request.user.is_senior and self.request.user.accepted_terms def get_success_url(self): @@ -144,10 +150,12 @@ class DecisionUpdateView( return form_kwargs def get_queryset(self): + assert self.request.user.is_authenticated owner = self.request.user return self.model.objects.filter(user=owner) def test_func(self): + assert self.request.user.is_authenticated return self.request.user.is_senior and self.request.user.accepted_terms def get_success_url(self): @@ -162,10 +170,12 @@ class DecisionDeleteView( success_message = "Decision deleted successfully." def get_queryset(self): + assert self.request.user.is_authenticated owner = self.request.user return self.model.objects.filter(user=owner) def test_func(self): + assert self.request.user.is_authenticated return self.request.user.is_senior and self.request.user.accepted_terms def get_success_url(self):