From bc78fc29e5eeb54220f1cfe45c9a07a7954c2c21 Mon Sep 17 00:00:00 2001 From: Vadim Stepanov Date: Fri, 4 Aug 2023 16:13:03 +0100 Subject: [PATCH] Revert "Enable push notifications for SSR beneficiary for testing purposes" (#2757) Reverts grafana/oncall#2752 --- engine/apps/schedules/models/shift_swap_request.py | 4 +--- engine/apps/schedules/tests/test_shift_swap_request.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/engine/apps/schedules/models/shift_swap_request.py b/engine/apps/schedules/models/shift_swap_request.py index 5e2de394..ebf48811 100644 --- a/engine/apps/schedules/models/shift_swap_request.py +++ b/engine/apps/schedules/models/shift_swap_request.py @@ -157,9 +157,7 @@ class ShiftSwapRequest(models.Model): @property def possible_benefactors(self) -> QuerySet["User"]: - # TODO: exclude the beneficiary from this list - # Temporarily including the beneficiary in the list of possible benefactors for testing purposes - return self.schedule.related_users() + return self.schedule.related_users().exclude(pk=self.beneficiary_id) @property def web_link(self) -> str: diff --git a/engine/apps/schedules/tests/test_shift_swap_request.py b/engine/apps/schedules/tests/test_shift_swap_request.py index 685959c0..a6735484 100644 --- a/engine/apps/schedules/tests/test_shift_swap_request.py +++ b/engine/apps/schedules/tests/test_shift_swap_request.py @@ -166,6 +166,4 @@ def test_possible_benefactors(shift_swap_request_setup) -> None: with patch.object(ssr.schedule, "related_users") as mock_related_users: mock_related_users.return_value = User.objects.filter(pk__in=[beneficiary.pk, benefactor.pk]) - # TODO: exclude the beneficiary from this list - # Temporarily including the beneficiary in the list of possible benefactors for testing purposes - assert set(ssr.possible_benefactors) == {benefactor, beneficiary} + assert list(ssr.possible_benefactors) == [benefactor]