Kick off GPS!

gip-inclusion · Jun 12, 2024 · 60ef30f · 60ef30f
1 parent de6dc91
commit 60ef30f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 48 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -658,5 +658,4 @@
 # GPS
 # ------------------------------------------------------------------------------
 # Until GPS goes live for everyone, keep the feature hidden in production.
-GPS_ENABLED = ITOU_ENVIRONMENT not in ("DEMO", "PROD")
 GPS_GROUPS_CREATED_BY_EMAIL = os.getenv("GPS_GROUPS_CREATED_BY_EMAIL", None)
diff --git a/itou/templates/dashboard/dashboard.html b/itou/templates/dashboard/dashboard.html
@@ -351,9 +351,7 @@ <h2>Services partenaires</h2>
                                 <div class="row row-cols-1 row-cols-md-2 mt-3 mt-md-4">
                                     {% include "dashboard/includes/dora_card.html" with siret=request.current_organization.siret|default:"" tracker="mtm_campaign=LesEmplois&mtm_kwd=Dashboard" %}
                                     {% include "dashboard/includes/diagoriente_card.html" with user=user only %}
-                                    {% if GPS_ENABLED %}
-                                        {% include "dashboard/includes/gps_card.html" %}
-                                    {% endif %}
+                                    {% include "dashboard/includes/gps_card.html" %}
                                 </div>
                             {% endif %}
                         </div>

diff --git a/itou/utils/settings_context_processors.py b/itou/utils/settings_context_processors.py
@@ -22,7 +22,6 @@ def expose_settings(request):
         "ALLOWED_HOSTS": settings.ALLOWED_HOSTS,
         "API_EMAIL_CONTACT": settings.API_EMAIL_CONTACT,
         "DORA_BASE_URL": settings.DORA_BASE_URL,
-        "GPS_ENABLED": settings.GPS_ENABLED,
         "ITOU_HELP_CENTER_URL": help_center_url,
         "ITOU_EMAIL_CONTACT": settings.ITOU_EMAIL_CONTACT,
         "ITOU_ENVIRONMENT": settings.ITOU_ENVIRONMENT,

diff --git a/itou/www/autocomplete/views.py b/itou/www/autocomplete/views.py
@@ -11,7 +11,6 @@
 from itou.cities.models import City
 from itou.jobs.models import Appellation
 from itou.users.models import User
-from itou.utils.decorators import settings_protected_view
 
 
 # Consider that after 50 matches the user should refine its search.
@@ -157,7 +156,6 @@ def communes_autocomplete(request):
 
 
 @login_required
-@settings_protected_view("GPS_ENABLED")
 @user_passes_test(lambda u: not u.is_job_seeker, login_url=reverse_lazy("dashboard:index"), redirect_field_name=None)
 def gps_users_autocomplete(request):
     """

diff --git a/itou/www/gps/views.py b/itou/www/gps/views.py
@@ -5,13 +5,11 @@
 from django.urls import reverse, reverse_lazy
 
 from itou.gps.models import FollowUpGroup, FollowUpGroupMembership
-from itou.utils.decorators import settings_protected_view
 from itou.utils.urls import get_safe_url
 from itou.www.gps.forms import GpsUserSearchForm
 
 
 @login_required
-@settings_protected_view("GPS_ENABLED")
 @user_passes_test(
     lambda u: not u.is_job_seeker,
     login_url=reverse_lazy("dashboard:index"),
@@ -41,7 +39,6 @@ def my_groups(request, template_name="gps/my_groups.html"):
 
 
 @login_required
-@settings_protected_view("GPS_ENABLED")
 @user_passes_test(
     lambda u: not u.is_job_seeker,
     login_url=reverse_lazy("dashboard:index"),
@@ -72,7 +69,6 @@ def join_group(request, template_name="gps/join_group.html"):
 
 
 @login_required
-@settings_protected_view("GPS_ENABLED")
 @user_passes_test(
     lambda u: not u.is_job_seeker,
     login_url=reverse_lazy("dashboard:index"),
@@ -91,7 +87,6 @@ def leave_group(request, group_id):
 
 
 @login_required
-@settings_protected_view("GPS_ENABLED")
 @user_passes_test(
     lambda u: not u.is_job_seeker,
     login_url=reverse_lazy("dashboard:index"),

diff --git a/tests/gps/tests.py b/tests/gps/tests.py
@@ -2,7 +2,7 @@
 from bs4 import BeautifulSoup
 from django.test.utils import override_settings
 from django.urls import reverse
-from pytest_django.asserts import assertContains, assertNotContains
+from pytest_django.asserts import assertContains
 
 from itou.gps.models import FollowUpGroup, FollowUpGroupMembership
 from itou.users.enums import UserKind
@@ -193,41 +193,6 @@ def test_access_as_jobseeker(client):
     assert response.status_code == 302
 
 
-@override_settings(GPS_ENABLED=True, TALLY_URL="https://hello-tally.so")
-def test_access_gps_enabled(client):
-    user = PrescriberFactory(membership=True)
-    client.force_login(user)
-
-    response = client.get(reverse("gps:my_groups"))
-    assert response.status_code == 200
-
-    response = client.get(reverse("gps:join_group"))
-    assert response.status_code == 200
-
-    response = client.get(reverse("dashboard:index"))
-    assertContains(response, "gps-card")
-
-    user = JobSeekerWithAddressFactory()
-    client.force_login(user)
-    response = client.get(reverse("dashboard:index"))
-    assertNotContains(response, "gps-card")
-
-
-@override_settings(GPS_ENABLED=False)
-def test_access_gps_disabled(client):
-    user = PrescriberFactory(membership=True)
-    client.force_login(user)
-
-    response = client.get(reverse("gps:my_groups"))
-    assert response.status_code == 403
-
-    response = client.get(reverse("gps:join_group"))
-    assert response.status_code == 403
-
-    response = client.get(reverse("dashboard:index"))
-    assertNotContains(response, "gps-card")
-
-
 def test_leave_group(client):
     member = PrescriberFactory(membership=True)
     another_member = PrescriberFactory(membership=True)