diff --git a/engine/apps/api/urls.py b/engine/apps/api/urls.py index 164b2e12..d5f3dc43 100644 --- a/engine/apps/api/urls.py +++ b/engine/apps/api/urls.py @@ -1,4 +1,3 @@ -from django.conf import settings from django.urls import include, path, re_path from common.api_helpers.optional_slash_router import OptionalSlashRouter, optional_slash_path @@ -66,9 +65,7 @@ router.register(r"heartbeats", IntegrationHeartBeatView, basename="integration_h router.register(r"tokens", PublicApiTokenView, basename="api_token") router.register(r"live_settings", LiveSettingViewSet, basename="live_settings") router.register(r"oncall_shifts", OnCallShiftView, basename="oncall_shifts") - -if settings.FEATURE_SHIFT_SWAPS_ENABLED: - router.register(r"shift_swaps", ShiftSwapViewSet, basename="shift_swap") +router.register(r"shift_swaps", ShiftSwapViewSet, basename="shift_swap") urlpatterns = [ path("", include(router.urls)), diff --git a/engine/apps/mobile_app/tasks.py b/engine/apps/mobile_app/tasks.py index df619e2e..456cbe45 100644 --- a/engine/apps/mobile_app/tasks.py +++ b/engine/apps/mobile_app/tasks.py @@ -518,10 +518,6 @@ def notify_shift_swap_requests() -> None: """ A periodic task that notifies users about shift swap requests. """ - - if not settings.FEATURE_SHIFT_SWAPS_ENABLED: - return - for shift_swap_request in _get_shift_swap_requests_to_notify(timezone.now()): notify_shift_swap_request.delay(shift_swap_request.pk) diff --git a/engine/apps/mobile_app/tests/test_shift_swap_request.py b/engine/apps/mobile_app/tests/test_shift_swap_request.py index 46d8b485..9d763713 100644 --- a/engine/apps/mobile_app/tests/test_shift_swap_request.py +++ b/engine/apps/mobile_app/tests/test_shift_swap_request.py @@ -108,9 +108,7 @@ def test_get_shift_swap_requests_to_notify_starts_not_soon( @pytest.mark.django_db -def test_notify_shift_swap_requests(make_organization, make_user, make_schedule, make_shift_swap_request, settings): - settings.FEATURE_SHIFT_SWAPS_ENABLED = True - +def test_notify_shift_swap_requests(make_organization, make_user, make_schedule, make_shift_swap_request): organization = make_organization() user = make_user(organization=organization) schedule = make_schedule(organization, schedule_class=OnCallScheduleWeb) @@ -134,17 +132,6 @@ def test_notify_shift_swap_requests(make_organization, make_user, make_schedule, mock_notify_shift_swap_request.assert_called_once_with(shift_swap_request.pk) -@pytest.mark.django_db -def test_notify_shift_swap_requests_feature_flag_disabled( - make_organization, make_user, make_schedule, make_shift_swap_request, settings -): - settings.FEATURE_SHIFT_SWAPS_ENABLED = False - with patch("apps.mobile_app.tasks._get_shift_swap_requests_to_notify") as mock_get_shift_swap_requests_to_notify: - notify_shift_swap_requests() - - mock_get_shift_swap_requests_to_notify.assert_not_called() - - @pytest.mark.django_db def test_notify_shift_swap_request(make_organization, make_user, make_schedule, make_shift_swap_request, settings): organization = make_organization() @@ -250,11 +237,7 @@ def test_notify_shift_swap_request_success( @pytest.mark.django_db -def test_notify_user_about_shift_swap_request( - make_organization, make_user, make_schedule, make_shift_swap_request, settings -): - settings.FEATURE_SHIFT_SWAPS_ENABLED = True - +def test_notify_user_about_shift_swap_request(make_organization, make_user, make_schedule, make_shift_swap_request): organization = make_organization() beneficiary = make_user(organization=organization, name="John Doe", username="john.doe") benefactor = make_user(organization=organization) diff --git a/engine/settings/base.py b/engine/settings/base.py index 29f08f38..0d2bc46a 100644 --- a/engine/settings/base.py +++ b/engine/settings/base.py @@ -64,7 +64,6 @@ FEATURE_SLACK_INTEGRATION_ENABLED = getenv_boolean("FEATURE_SLACK_INTEGRATION_EN FEATURE_MULTIREGION_ENABLED = getenv_boolean("FEATURE_MULTIREGION_ENABLED", default=False) FEATURE_INBOUND_EMAIL_ENABLED = getenv_boolean("FEATURE_INBOUND_EMAIL_ENABLED", default=False) FEATURE_PROMETHEUS_EXPORTER_ENABLED = getenv_boolean("FEATURE_PROMETHEUS_EXPORTER_ENABLED", default=False) -FEATURE_SHIFT_SWAPS_ENABLED = getenv_boolean("FEATURE_SHIFT_SWAPS_ENABLED", default=False) FEATURE_GRAFANA_ALERTING_V2_ENABLED = getenv_boolean("FEATURE_GRAFANA_ALERTING_V2_ENABLED", default=False) GRAFANA_CLOUD_ONCALL_HEARTBEAT_ENABLED = getenv_boolean("GRAFANA_CLOUD_ONCALL_HEARTBEAT_ENABLED", default=True) GRAFANA_CLOUD_NOTIFICATIONS_ENABLED = getenv_boolean("GRAFANA_CLOUD_NOTIFICATIONS_ENABLED", default=True) diff --git a/engine/settings/ci-test.py b/engine/settings/ci-test.py index 21fc9216..9751c49d 100644 --- a/engine/settings/ci-test.py +++ b/engine/settings/ci-test.py @@ -40,5 +40,3 @@ TWILIO_ACCOUNT_SID = "dummy_twilio_account_sid" TWILIO_AUTH_TOKEN = "dummy_twilio_auth_token" EXTRA_MESSAGING_BACKENDS = [("apps.base.tests.messaging_backend.TestOnlyBackend", 42)] - -FEATURE_SHIFT_SWAPS_ENABLED = True