Skip to content

Commit

Permalink
feat(#2449): Rename handlers of signup accept/decline actions
Browse files Browse the repository at this point in the history
  • Loading branch information
pbanaszkiewicz committed Jan 19, 2025
1 parent 2a2fa14 commit 8dcb099
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
26 changes: 13 additions & 13 deletions amy/recruitment/tests/test_instructor_recruitment_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,8 @@ def test_integration(self) -> None:
# Assert
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, success_url)
self.assertEqual(recruitment.signups.count(), 1)
signup = recruitment.signups.last()
self.assertEqual(recruitment.signups.count(), 1) # type: ignore
signup = recruitment.signups.last() # type: ignore
self.assertEqual(signup.person, person)
self.assertEqual(signup.user_notes, "")
self.assertEqual(signup.notes, notes)
Expand Down Expand Up @@ -665,8 +665,8 @@ def test_form_valid(self) -> None:
view = InstructorRecruitmentSignupChangeState(
object=mock_signup, request=request
)
view.add_instructor_task = mock.MagicMock()
view.remove_instructor_task = mock.MagicMock()
view.accept_signup = mock.MagicMock()
view.decline_signup = mock.MagicMock()
data = {"action": "confirm"}
form = InstructorRecruitmentSignupChangeStateForm(data)
form.is_valid()
Expand All @@ -675,10 +675,10 @@ def test_form_valid(self) -> None:
# Assert
self.assertEqual(mock_signup.state, "a")
mock_signup.save.assert_called_once()
view.add_instructor_task.assert_called_once_with(
view.accept_signup.assert_called_once_with(
request, mock_signup, mock_signup.person, mock_signup.recruitment.event
)
view.remove_instructor_task.assert_not_called()
view.decline_signup.assert_not_called()

def test_add_instructor_task(self) -> None:
# Arrange
Expand All @@ -698,7 +698,7 @@ def test_add_instructor_task(self) -> None:
recruitment = InstructorRecruitment(event=event)
signup = InstructorRecruitmentSignup(recruitment=recruitment, person=person)
# Act
task = view.add_instructor_task(request, signup, person, event)
task = view.accept_signup(request, signup, person, event)
# Assert
self.assertTrue(task.pk)

Expand All @@ -722,7 +722,7 @@ def test_remove_instructor_task(self) -> None:
role = Role.objects.get(name="instructor")
task = Task.objects.create(person=person, event=event, role=role)
# Act
view.remove_instructor_task(request, signup, person, event)
view.decline_signup(request, signup, person, event)
# Assert
with self.assertRaises(Task.DoesNotExist):
task.refresh_from_db()
Expand All @@ -744,7 +744,7 @@ def test_remove_instructor_task__no_task(self) -> None:
recruitment = InstructorRecruitment(event=event)
signup = InstructorRecruitmentSignup(recruitment=recruitment, person=person)
# Act & Assert - no error
view.remove_instructor_task(request, signup, person, event)
view.decline_signup(request, signup, person, event)

def test_post__form_valid(self) -> None:
# Arrange
Expand Down Expand Up @@ -935,13 +935,13 @@ def test_post__action_reopen(self) -> None:
def test__validate_for_closing(self) -> None:
# Arrange
recruitment1 = InstructorRecruitment(event=None, status="o")
recruitment1.num_pending = 123
recruitment1.num_pending = 123 # type: ignore
recruitment2 = InstructorRecruitment(event=None, status="c")
recruitment2.num_pending = 123
recruitment2.num_pending = 123 # type: ignore
recruitment3 = InstructorRecruitment(event=None, status="o")
recruitment3.num_pending = 0
recruitment3.num_pending = 0 # type: ignore
recruitment4 = InstructorRecruitment(event=None, status="c")
recruitment4.num_pending = 0
recruitment4.num_pending = 0 # type: ignore
data = [
(recruitment1, False),
(recruitment2, False),
Expand Down
8 changes: 4 additions & 4 deletions amy/recruitment/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ def form_valid(self, form) -> HttpResponse:
[HttpRequest, InstructorRecruitmentSignup, Person, Event], Task | None
],
] = {
"a": self.add_instructor_task,
"d": self.remove_instructor_task,
"a": self.accept_signup,
"d": self.decline_signup,
}
handler = state_to_method_action_mapping[self.object.state]
try:
Expand All @@ -421,7 +421,7 @@ def form_valid(self, form) -> HttpResponse:
)
return HttpResponseRedirect(self.get_success_url())

def add_instructor_task(
def accept_signup(
self,
request: HttpRequest,
signup: InstructorRecruitmentSignup,
Expand Down Expand Up @@ -465,7 +465,7 @@ def add_instructor_task(

return task

def remove_instructor_task(
def decline_signup(
self,
request: HttpRequest,
signup: InstructorRecruitmentSignup,
Expand Down

0 comments on commit 8dcb099

Please sign in to comment.