Merge pull request #435 from MTES-MCT/feature/guh-v1.3

Fléchage du département à la place du simulateur sur la home (GUH - V1.3)

config/tests/test_urls.py

@@ -30,7 +30,6 @@ def site() -> Site:
 
 HAIE_URLS = [
     "triage",
-    "triage_result",
 ]
 
 AMENAGEMENT_URLS = [

config/urls_haie.py

@@ -1,8 +1,9 @@
 from django.urls import include, path
+from django.utils.translation import gettext_lazy as _
 
 from .urls import urlpatterns as common_urlpatterns
 
 urlpatterns = [
     path("", include("envergo.pages.urls_haie")),
-    path("indre/", include("envergo.moulinette.urls_haie")),
+    path(_("moulinette/"), include("envergo.moulinette.urls_haie")),
 ] + common_urlpatterns

envergo/evaluations/forms.py

@@ -8,7 +8,7 @@
 from phonenumber_field.formfields import PhoneNumberField
 
 from envergo.evaluations.models import USER_TYPES, Request
-from envergo.evaluations.utils import extract_department
+from envergo.evaluations.utils import extract_department_from_address
 from envergo.evaluations.validators import application_number_validator
 from envergo.geodata.models import Department
 from envergo.utils.fields import NoIdnEmailField
@@ -119,7 +119,7 @@ def clean(self):
         department_input = data.get("department", None)
         if not department_input:
             # extract department from address
-            department_input = extract_department(address)
+            department_input = extract_department_from_address(address)
 
         if department_input and department_input not in address:
             # when a town is selected on its own, without a complete address, there is no zip code.
@@ -128,10 +128,10 @@ def clean(self):
 
         department = (
             Department.objects.filter(department=department_input)
-            .select_related("moulinette_config")
+            .select_related("configamenagement")
             .first()
         )
-        if department and not department.is_activated():
+        if department and not department.is_amenagement_activated():
             self.add_error(
                 "department",
                 ValidationError(

envergo/evaluations/models.py

@@ -262,7 +262,7 @@ def get_moulinette_config(self):
         lng, lat = params["lng"], params["lat"]
         coords = Point(float(lng), float(lat), srid=EPSG_WGS84)
         department = Department.objects.filter(geometry__contains=coords).first()
-        return department.moulinette_config if department else None
+        return department.configamenagement if department else None
 
     def get_moulinette(self):
         """Return the moulinette instance for this evaluation."""

envergo/evaluations/tests/test_admin.py

@@ -7,7 +7,10 @@
     generate_reference,
 )
 from envergo.evaluations.tests.factories import EvaluationFactory, RequestFactory
-from envergo.moulinette.tests.factories import CriterionFactory, MoulinetteConfigFactory
+from envergo.moulinette.tests.factories import (
+    ConfigAmenagementFactory,
+    CriterionFactory,
+)
 
 pytestmark = pytest.mark.django_db
 
@@ -92,7 +95,7 @@ def test_create_eval_fails_when_it_already_exists(client, admin_user, eval_reque
 def test_evaluation_email_sending(admin_client, evaluation, mailoutbox):
     # Make sure the "loi sur l'eau" result will be set
     CriterionFactory()
-    MoulinetteConfigFactory()
+    ConfigAmenagementFactory()
 
     url = reverse("admin:evaluations_evaluation_email_avis", args=[evaluation.pk])
     res = admin_client.get(url)
@@ -126,7 +129,7 @@ def test_evaluation_email_sending(admin_client, evaluation, mailoutbox):
 def test_evaluation_email_throttling(admin_client, evaluation, mailoutbox):
     # Make sure the "loi sur l'eau" result will be set
     CriterionFactory()
-    MoulinetteConfigFactory()
+    ConfigAmenagementFactory()
 
     url = reverse("admin:evaluations_evaluation_email_avis", args=[evaluation.pk])
     res = admin_client.get(url)
@@ -156,7 +159,7 @@ def test_evaluation_email_throttling(admin_client, evaluation, mailoutbox):
 def test_evaluation_email_recipient_overriding(admin_client, evaluation, mailoutbox):
     # Make sure the "loi sur l'eau" result will be set
     CriterionFactory()
-    MoulinetteConfigFactory()
+    ConfigAmenagementFactory()
 
     url = reverse("admin:evaluations_evaluation_email_avis", args=[evaluation.pk])
     res = admin_client.get(url)
@@ -180,7 +183,7 @@ def test_evaluation_email_recipient_overriding(admin_client, evaluation, mailout
 def test_evaluation_email_with_empty_recipients(admin_client, evaluation, mailoutbox):
     # Make sure the "loi sur l'eau" result will be set
     CriterionFactory()
-    MoulinetteConfigFactory()
+    ConfigAmenagementFactory()
 
     url = reverse("admin:evaluations_evaluation_email_avis", args=[evaluation.pk])
     res = admin_client.get(url)

envergo/evaluations/tests/test_eval_emails.py

@@ -9,8 +9,8 @@
 from envergo.geodata.conftest import bizous_town_center, france_map, france_zh  # noqa
 from envergo.moulinette.regulations import RequiredAction, Stake
 from envergo.moulinette.tests.factories import (
+    ConfigAmenagementFactory,
     CriterionFactory,
-    MoulinetteConfigFactory,
     PerimeterFactory,
     RegulationFactory,
 )
@@ -25,7 +25,7 @@ def override_settings(settings):
 
 @pytest.fixture(autouse=True)
 def moulinette_config(france_map, france_zh, loire_atlantique_department):  # noqa
-    MoulinetteConfigFactory(
+    ConfigAmenagementFactory(
         department=loire_atlantique_department,
         is_activated=True,
         ddtm_water_police_email="[email protected]",

envergo/evaluations/tests/test_forms.py

@@ -2,7 +2,7 @@
 
 from envergo.evaluations.forms import WizardAddressForm
 from envergo.geodata.conftest import loire_atlantique_department  # noqa
-from envergo.moulinette.tests.factories import MoulinetteConfigFactory
+from envergo.moulinette.tests.factories import ConfigAmenagementFactory
 
 pytestmark = pytest.mark.django_db
 
@@ -17,7 +17,7 @@ def form_data():
 
 @pytest.fixture(autouse=True)
 def moulinette_config(loire_atlantique_department):  # noqa
-    MoulinetteConfigFactory(
+    ConfigAmenagementFactory(
         department=loire_atlantique_department,
         is_activated=True,
         ddtm_water_police_email="[email protected]",

envergo/evaluations/tests/test_models.py

@@ -8,8 +8,8 @@
 from envergo.geodata.conftest import loire_atlantique_department  # noqa
 from envergo.geodata.conftest import bizous_town_center, france_map  # noqa
 from envergo.moulinette.tests.factories import (
+    ConfigAmenagementFactory,
     CriterionFactory,
-    MoulinetteConfigFactory,
     PerimeterFactory,
     RegulationFactory,
 )
@@ -19,7 +19,7 @@
 
 @pytest.fixture(autouse=True)
 def moulinette_config(france_map, loire_atlantique_department):  # noqa
-    MoulinetteConfigFactory(
+    ConfigAmenagementFactory(
         department=loire_atlantique_department,
         is_activated=True,
         ddtm_water_police_email="[email protected]",

envergo/evaluations/tests/test_views.py

@@ -14,7 +14,7 @@
     VersionFactory,
 )
 from envergo.geodata.conftest import loire_atlantique_department  # noqa
-from envergo.moulinette.tests.factories import MoulinetteConfigFactory
+from envergo.moulinette.tests.factories import ConfigAmenagementFactory
 
 pytestmark = pytest.mark.django_db
 
@@ -26,7 +26,7 @@ def autouse_site(site):
 
 @pytest.fixture()
 def moulinette_config(loire_atlantique_department):  # noqa
-    MoulinetteConfigFactory(
+    ConfigAmenagementFactory(
         department=loire_atlantique_department,
         is_activated=True,
         ddtm_water_police_email="[email protected]",
@@ -37,7 +37,7 @@ def moulinette_config(loire_atlantique_department):  # noqa
 
 @pytest.fixture()
 def unactivated_moulinette_config(loire_atlantique_department):  # noqa
-    MoulinetteConfigFactory(
+    ConfigAmenagementFactory(
         department=loire_atlantique_department,
         is_activated=False,
         ddtm_water_police_email="[email protected]",

envergo/evaluations/utils.py

@@ -14,11 +14,15 @@ def extract_postal_code(address):
     return None
 
 
-def extract_department(address):
+def extract_department_from_address(address):
     """Extract the department as two (or three) digits from a stringified address.
     return None if no department is found.
     """
     postal_code = extract_postal_code(address)
+    return extract_department_from_postal_code(postal_code)
+
+
+def extract_department_from_postal_code(postal_code):
     department = None
     if postal_code:
         department = postal_code[:2]
@@ -33,5 +37,4 @@ def extract_department(address):
                 department = "2A"  # Corse-du-Sud
             elif 20200 <= code_number <= 20620:
                 department = "2B"  # Haute-Corse
-
     return department

envergo/geodata/models.py

@@ -160,8 +160,8 @@ class Meta:
     def __str__(self):
         return self.get_department_display()
 
-    def is_activated(self):
-        config = getattr(self, "moulinette_config", None)
+    def is_amenagement_activated(self):
+        config = getattr(self, "configamenagement", None)
         return config and config.is_activated
 
 

envergo/moulinette/admin.py

@@ -8,8 +8,9 @@
 from envergo.geodata.admin import DepartmentsListFilter
 from envergo.moulinette.models import (
     REGULATIONS,
+    ConfigAmenagement,
+    ConfigHaie,
     Criterion,
-    MoulinetteConfig,
     MoulinetteTemplate,
     Perimeter,
     Regulation,
@@ -250,7 +251,7 @@ def departments(self, obj):
         return obj.activation_map.departments
 
 
-class MoulinetteConfigForm(forms.ModelForm):
+class ConfigAmenagementForm(forms.ModelForm):
     regulations_available = forms.MultipleChoiceField(
         label=_("Regulations available"), required=False, choices=REGULATIONS
     )
@@ -276,7 +277,7 @@ def clean_criteria_values(self):
 
 
 class MoulinetteConfigTemplateForm(forms.ModelForm):
-    """Form to edit a MoulinetteTemplate in a MoulinetteConfig.
+    """Form to edit a MoulinetteTemplate in a ConfigAmenagement.
 
     We remove every key that is not a real template (autorisation_urba_*, etc.)
     """
@@ -295,10 +296,10 @@ class MoulinetteConfigTemplateInline(MoulinetteTemplateInline):
     form = MoulinetteConfigTemplateForm
 
 
-@admin.register(MoulinetteConfig)
-class MoulinetteConfigAdmin(admin.ModelAdmin):
+@admin.register(ConfigAmenagement)
+class ConfigAmenagementAdmin(admin.ModelAdmin):
     list_display = ["department", "is_activated", "zh_doubt"]
-    form = MoulinetteConfigForm
+    form = ConfigAmenagementForm
     inlines = [MoulinetteConfigTemplateInline]
     list_filter = ["is_activated", "zh_doubt"]
 
@@ -315,3 +316,17 @@ def get_queryset(self, request):
 class MoulinetteTemplateAdmin(admin.ModelAdmin):
     list_display = ["config", "key"]
     search_fields = ["content"]
+
+
+@admin.register(ConfigHaie)
+class ConfigHaieAdmin(admin.ModelAdmin):
+    list_display = ["department", "is_activated", "department_guichet_unique_url"]
+    list_filter = ["is_activated"]
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return (
+            qs.select_related("department")
+            .order_by("department__department")
+            .defer("department__geometry")
+        )

envergo/moulinette/forms/__init__.py

@@ -229,7 +229,6 @@ class TriageFormHaie(forms.Form):
     department = DisplayCharField(
         label="Département",
         required=True,
-        initial="36",
         get_display_value=lambda x: dict(DEPARTMENT_CHOICES).get(x, "Inconnu"),
     )
     element = DisplayChoiceField(