Merge branch 'develop' of github.com:betagouv/recommandations-collaboratives into develop

Author: glibersat

recoco/apps/communication/api.py

@@ -22,7 +22,8 @@
 from django.core.mail import send_mail as django_send_mail
 from django.utils import timezone
 
-from recoco.utils import build_absolute_url, get_site_config_or_503
+from recoco.apps.home.models import SiteConfiguration
+from recoco.utils import build_absolute_url
 
 from .brevo import Brevo
 from .models import EmailTemplate, TransactionRecord
@@ -57,7 +58,7 @@ def get_site_params():
     params["site_name"] = current_site.name
     params["site_domain"] = current_site.domain
 
-    site_config = get_site_config_or_503(current_site)
+    site_config = SiteConfiguration.objects.get(site=current_site)
     params["legal_address"] = site_config.legal_address or ""
     params["legal_owner"] = site_config.legal_owner or ""
     params["description"] = site_config.description or ""

recoco/apps/communication/digests.py

@@ -18,6 +18,7 @@
 from django.urls import reverse
 
 from recoco import utils, verbs
+from recoco.apps.home.models import SiteConfiguration
 from recoco.apps.projects import models as projects_models
 from recoco.apps.reminders.api import (
     get_due_new_recommendations_reminder_for_project,
@@ -292,30 +293,31 @@ def make_site_digest(site):
         "name": site.name,
     }
 
-    siteconf = utils.get_site_config_or_503(site)
+    site_config = SiteConfiguration.objects.get(site=site)
+
     data.update(
         {
-            "description": siteconf.description or "",
-            "sender_name": siteconf.sender_name or "",
-            "sender_email": siteconf.sender_email or "",
-            "legal_address": siteconf.legal_address or "",
-            "main_topic": siteconf.main_topic or "",
-            "legal_owner": siteconf.legal_owner or "",
+            "description": site_config.description or "",
+            "sender_name": site_config.sender_name or "",
+            "sender_email": site_config.sender_email or "",
+            "legal_address": site_config.legal_address or "",
+            "main_topic": site_config.main_topic or "",
+            "legal_owner": site_config.legal_owner or "",
         }
     )
 
-    if siteconf.email_logo:
-        data["site_logo"] = utils.build_absolute_url(siteconf.email_logo.url)
+    if site_config.email_logo:
+        data["site_logo"] = utils.build_absolute_url(site_config.email_logo.url)
 
     return data
 
 
 def make_project_survey_digest_for_site(user, project, site):
     """Return survey information as a dict for a given project on a given site"""
 
-    siteconf = utils.get_site_config_or_503(site)
+    site_config = SiteConfiguration.objects.get(site=site)
 
-    if not siteconf.project_survey:
+    if not site_config.project_survey:
         return {"name": None, "url": None}
 
     project_survey_url = utils.build_absolute_url(
@@ -324,7 +326,7 @@ def make_project_survey_digest_for_site(user, project, site):
         site=site,
     )
 
-    data = {"name": siteconf.project_survey.name, "url": project_survey_url}
+    data = {"name": site_config.project_survey.name, "url": project_survey_url}
 
     return data
 

recoco/apps/communication/tests/test_digests.py

@@ -14,7 +14,6 @@
 import test  # noqa
 from django.contrib.auth import models as auth
 from django.contrib.sites.shortcuts import get_current_site
-from django.core.exceptions import ImproperlyConfigured
 from freezegun import freeze_time
 from model_bakery import baker
 from model_bakery.recipe import Recipe
@@ -150,14 +149,6 @@ def test_send_digests_for_new_reco_empty(client, request, make_project):
     assert membership.member.notifications.unsent().count() == 0
 
 
-@pytest.mark.django_db
-def test_make_site_digest_without_siteconfiguration(client, request):
-    site = get_current_site(request)
-
-    with pytest.raises(ImproperlyConfigured):
-        digests.make_site_digest(site)
-
-
 @pytest.mark.django_db
 def test_make_site_digest_with_siteconfiguration(client, request):
     site = get_current_site(request)

recoco/apps/crm/views.py

@@ -66,7 +66,6 @@
 from recoco.apps.tasks.models import Task
 from recoco.utils import (
     get_group_for_site,
-    get_site_config_or_503,
     has_perm,
     has_perm_or_403,
     make_group_name_for_site,
@@ -783,7 +782,7 @@ def project_details(request, project_id):
 
     project = get_object_or_404(Project.all_on_site, pk=project_id)
 
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     site_origin = project.project_sites.get(is_origin=True)
 
@@ -871,7 +870,7 @@ def project_toggle_annotation(request, project_id=None):
 
     project = get_object_or_404(Project.on_site, pk=project_id)
 
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     form = forms.ProjectAnnotationForm(request.POST)
     if form.is_valid():
@@ -1078,7 +1077,7 @@ def crm_list_recommendation_without_resources(request):
 
 
 def make_low_reach_project_query(request):
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     return (
         Project.on_site.filter(

recoco/apps/home/middlewares.py

@@ -0,0 +1,27 @@
+from django.core.exceptions import ImproperlyConfigured
+from django.http import HttpRequest
+
+from recoco.apps.home.models import SiteConfiguration
+
+
+class CurrentSiteConfigurationMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request: HttpRequest):
+        if not hasattr(request, "site"):
+            raise ImproperlyConfigured(
+                "The request object does not have a 'site' attribute. "
+                "Ensure that the site middleware is applied before this middleware."
+            )
+
+        # TODO: use SiteConfiguration.objects.get() instead of filter().first()
+        # Because the site configuration should be unique per site and always exist.
+        request.site_config = (
+            SiteConfiguration.objects.filter(site=request.site)
+            .prefetch_related("onboarding_questions", "crm_available_tags")
+            .select_related("project_survey")
+            .first()
+        )
+
+        return self.get_response(request)

recoco/apps/home/tests/test_middlewares.py

@@ -0,0 +1,45 @@
+from unittest.mock import Mock
+
+import pytest
+from django.core.exceptions import ImproperlyConfigured
+from model_bakery import baker
+
+from recoco.apps.home.middlewares import CurrentSiteConfigurationMiddleware
+from recoco.apps.home.models import SiteConfiguration
+
+
+@pytest.fixture
+def get_response_mock():
+    return Mock()
+
+
+@pytest.fixture
+def middleware(get_response_mock):
+    return CurrentSiteConfigurationMiddleware(get_response=get_response_mock)
+
+
+@pytest.fixture
+def request_mock():
+    return Mock()
+
+
+@pytest.mark.django_db
+class TestCurrentSiteConfigurationMiddleware:
+    def test_raises_error_if_request_has_no_site_attribute(
+        self, middleware, request_mock
+    ):
+        delattr(request_mock, "site")  # Ensure the 'site' attribute is missing
+
+        with pytest.raises(
+            ImproperlyConfigured,
+            match="The request object does not have a 'site' attribute",
+        ):
+            middleware(request_mock)
+
+    def test_sets_site_config_on_request(self, middleware, request_mock, current_site):
+        site_config = baker.make(SiteConfiguration, site=current_site)
+
+        request_mock.site = current_site
+        middleware(request_mock)
+
+        assert request_mock.site_config == site_config

recoco/apps/onboarding/views.py

@@ -31,7 +31,6 @@
 from recoco.apps.survey import models as survey_models
 from recoco.apps.survey.forms import AnswerForm
 from recoco.utils import (
-    get_site_config_or_503,
     is_switchtender_or_403,
 )
 
@@ -98,7 +97,7 @@ def form_invalid(self, form):
 
 def onboarding_signup(request):
     """Return the onboarding signup page and process onboarding signup submission"""
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     if request.user.is_authenticated:
         return redirect(reverse("onboarding-project"))
@@ -153,7 +152,7 @@ def onboarding_signup(request):
 @login_required
 def onboarding_project(request):
     """Return the onboarding page and process onboarding submission"""
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     form = forms.OnboardingProject(request.POST or None)
 
@@ -216,7 +215,7 @@ def onboarding_project(request):
 @login_required
 def onboarding_summary(request, project_id=None):
     """Resume project from onboarding"""
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     project = get_object_or_404(projects.Project, sites=request.site, pk=project_id)
 
@@ -249,7 +248,7 @@ def onboarding_summary(request, project_id=None):
 
 def prefill_project_set_user(request):
     """Create a new project for someone else - step 1 create user"""
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     is_switchtender_or_403(request.user)
 
@@ -267,7 +266,7 @@ def prefill_project_set_user(request):
 
 def prefill_project_submit(request):
     """Create a new project for someone else - step 2 create project"""
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     is_switchtender_or_403(request.user)
 

recoco/apps/projects/views/__init__.py

@@ -34,7 +34,6 @@
 from recoco.utils import (
     check_if_advisor,
     get_group_for_site,
-    get_site_config_or_503,
     has_perm_or_403,
     is_staff_for_site,
 )
@@ -79,7 +78,7 @@ def mark_general_notifications_as_seen(user):
 def project_moderation_list(request):
     is_project_moderator_or_403(request.user, request.site)
 
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     draft_projects = models.Project.on_site.filter(
         project_sites__status="DRAFT", project_sites__site=request.site, deleted=None
@@ -422,7 +421,7 @@ def project_list_for_staff(request):
     ):
         raise PermissionDenied("Vous n'avez pas le droit d'accéder à ceci.")
 
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     mark_general_notifications_as_seen(request.user)
 

recoco/apps/projects/views/detail.py

@@ -28,13 +28,7 @@
 from recoco.apps.projects.views.notes import create_public_note
 from recoco.apps.survey import models as survey_models
 from recoco.apps.tasks import models as tasks_models
-from recoco.utils import (
-    get_site_config_or_503,
-    has_perm,
-    has_perm_or_403,
-    is_staff_for_site,
-    require_htmx,
-)
+from recoco.utils import has_perm, has_perm_or_403, is_staff_for_site, require_htmx
 
 from .. import models, signals
 from ..forms import (
@@ -73,7 +67,7 @@ def project_overview(request, project_id=None):
         pk=project_id,
     )
 
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
 
     is_regional_actor = is_regional_actor_for_project(
         request.site, project, request.user, allow_national=True
@@ -184,13 +178,14 @@ def project_knowledge(request, project_id=None):
         request.user, "view_surveys", project
     )
 
-    site_config = get_site_config_or_503(request.site)
+    site_config = request.site_config
+
     session, created = survey_models.Session.objects.get_or_create(
         project=project, survey=site_config.project_survey
     )
 
     sorted_sessions = sorted(
-        project.survey_session.all(),
+        project.survey_session.select_related("survey__site"),
         key=lambda session: session.survey.site != request.site,
     )
 

recoco/apps/projects/views/export.py

@@ -17,12 +17,7 @@
 
 from recoco.apps.crm import models as crm_models
 from recoco.apps.tasks import models as task_models
-from recoco.utils import (
-    build_absolute_url,
-    get_group_for_site,
-    get_site_config_or_503,
-    is_switchtender_or_403,
-)
+from recoco.utils import build_absolute_url, get_group_for_site, is_switchtender_or_403
 
 from .. import models
 from ..utils import (
@@ -84,8 +79,10 @@ def project_list_export_csv(request):
         "exclude_stats",
         "origin_site",
     ]
-    site_config = get_site_config_or_503(request.site)
-    tags_for_site = site_config.crm_available_tags.values_list("name", flat=True)
+
+    site_config = request.site_config
+
+    tags_for_site = [tag.name for tag in site_config.crm_available_tags.all()]
     for tag in tags_for_site:
         columns.append(tag)