URL de debug + tweak connection DB

rik · rik · commit e936b1fa5857 · 2025-03-14T14:23:49.000+01:00
diff --git a/django/core/models.py b/django/core/models.py
@@ -148,6 +148,7 @@ class EventImpact(StrEnum):
 
 class ProcedureQuerySet(models.QuerySet):
     def with_events(self) -> Self:
+        # FIXME : Il va falloir individualiser cela ?
         approbation_event_types = [
             event_type
             for lol in EVENT_IMPACT_BY_TYPE_DOCUMENT.values()
@@ -391,6 +392,20 @@ def departement(self, departement: str | None = None) -> list["CommuneProcedure"
                 a.append(perim)
         return a
 
+    # FIXME: Non testé
+    def collectivite(
+        self, collectivite_code: str, collectivite_type: str
+    ) -> list["CommuneProcedure"]:
+        perimetres = self.prefetch_related(
+            models.Prefetch("procedure", Procedure.objects.all())
+        ).filter(
+            collectivite_code=collectivite_code, collectivite_type=collectivite_type
+        )
+
+        for perim in perimetres:
+            perim.opposable = perim._opposable(perimetres)
+        return perimetres
+
 
 class CommuneProcedure(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4)
@@ -430,15 +445,6 @@ def _opposable(self, all_perims: list[Self]) -> bool:
                 "created_at",  # FIXME Test created_at order
             ),
         )
-        if (
-            self.collectivite_code == "24183"
-            and str(self.procedure.id) == "4c4cb7e7-f660-40d8-8cc5-9b6a34cfb741"
-        ):  # FIXME COMD 05001 cf448ad5-193b-4c1f-a38b-d92a9b4472e6
-            for p in procedures_opposables:
-                if p.is_principale:
-                    logging.warning(
-                        f"{p.id=!s} {p.date_approbation=} {p.created_at=!s}"  # noqa: G004
-                    )
         if not procedures_opposables:
             return False
         return procedures_opposables[-1].id == self.procedure_id
diff --git a/django/core/settings.py b/django/core/settings.py
@@ -63,11 +63,8 @@
 DATABASES = {
     "default": {
         **env.db("DATABASE_URL"),
-        "OPTIONS": {
-            "pool": {
-                "min_size": 1,
-            }
-        },
+        "CONN_MAX_AGE": env.int("CONN_MAX_AGE", 0),
+        "CONN_HEALTH_CHECK": True,
     }
 }
 
diff --git a/django/core/templates/collectivite.html b/django/core/templates/collectivite.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta name="color-scheme" content="dark light" />
+
+        <title>Document</title>
+    </head>
+    <body>
+        <h1>{{ collectivite.code }} {{ collectivite.intitule }}</h1>
+        {% regroup cp by procedure.is_schema as wesh %}
+        {% for wes, procedures in wesh %}
+        {{ wes }}
+        <table>
+            <tr>
+                <th>P</th>
+                <th>Opposable</th>
+                <th>Statut</th>
+                <th>Date d'approbation</th>
+            </tr>
+            {% for procedure in procedures %}
+            <tr>
+                <td>
+                    <a href="{{ procedure.procedure.get_absolute_url }}">
+                        {{ procedure.procedure }}
+                    </a>
+                    <br />
+                    {{ procedure.procedure_id }}
+                </td>
+                <td>{{ procedure.opposable }}</td>
+                <td>{{ procedure.procedure.statut }}</td>
+                <td>{{ procedure.procedure.date_approbation }}</td>
+            </tr>
+            {% endfor %}
+        </table>
+        {% endfor %}
+    </body>
+</html>
diff --git a/django/core/tests/manual_test_e2e.py b/django/core/tests/manual_test_e2e.py
@@ -31,10 +31,46 @@ def django_db_setup(django_db_modify_db_settings: None) -> None:
     connections["default"] = connections.create_connection("default")
 
 
+DATE_DAPPROBATION_MAL_DETECTEE = [
+    ("09106", "93de19ac-d609-4b26-8651-6c43ed5a2a8a"),
+    ("09106", "51ded599-7b22-44ca-b740-bf8b7475f266"),
+    ("09168", "93de19ac-d609-4b26-8651-6c43ed5a2a8a"),
+    ("09168", "5f8cf12b-4d7a-4ad6-a30e-5c10c2421ba5"),
+    ("09249", "93de19ac-d609-4b26-8651-6c43ed5a2a8a"),
+    ("09249", "da8a2cca-e609-41ee-948d-5b492793dead"),
+    ("09305", "93de19ac-d609-4b26-8651-6c43ed5a2a8a"),
+    ("09305", "8724af17-193f-44a7-80c4-ce7469866b86"),
+    ("12066", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12066", "5bdf7888-9b63-4a32-983f-7fe55a3c5ab0"),
+    ("12076", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12076", "027741b2-9d93-4606-94fb-43dca8655ba5"),
+    ("12138", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12138", "76d95ba8-510c-4bfc-b7d8-f49d3e4bc822"),
+    ("12161", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12161", "761923eb-ef9a-4836-809a-8fef427aba9c"),
+    ("12165", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12165", "da0a633d-2570-4ceb-9090-699f6eaf3d40"),
+    ("12215", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12215", "c0d393f7-bae3-4a6f-b83c-3d4f6c0d5769"),
+    ("12221", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12221", "d6bda473-bbb4-4dae-9fac-14fe9bcbd60f"),
+    ("12254", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12254", "9b13518b-8b4d-469c-b0b2-32b5af930342"),
+    ("12288", "2940c934-d3f2-43d4-8678-21a9c3a5e3db"),
+    ("12288", "e28018e0-6306-4c0d-a74c-ebdc7c2386e8"),
+    ("14365", "2f9b15b9-81fd-4634-8be9-119d41e0c45f"),
+    ("14365", "f58c3625-b5b3-45a5-aff1-c47c99822518"),
+]
+
+PROCEDURE_DABROGATION = [
+    ("15006", "475f2868-afb8-4dc9-8ca4-06e5a6a49333"),
+    ("15006", "506775b3-abdf-4e5b-b73b-0d882363ebd7"),
+]
 LEGITIMATE_DIFFERENCES = [
     # df2439d9-ba4f-4cba-9fcf-c8ed3a52b24c est un SCoT opposable mais pas pour 01155
     ("01155", "40e4f479-d0f1-4d2d-9f80-6760c44b22e5"),
-    (),
+    *DATE_DAPPROBATION_MAL_DETECTEE,
+    *PROCEDURE_DABROGATION,
 ]
 
 
@@ -98,7 +134,8 @@ def Ztest_all(
             ),
         )
 
-    @pytest.mark.parametrize("departement", [f"{i:0>2}" for i in range(9, 10)])
+    # FIXME Ne pas oublier la corse
+    @pytest.mark.parametrize("departement", [f"{i:0>2}" for i in range(24, 25)])
     @pytest.mark.django_db
     def test_departement(
         self,
@@ -120,6 +157,7 @@ def test_departement(
                 "/api/perimetres",
                 query_params={"departement": departement, "limit": limit},
             )
+            logging.warning(response.resolver_match)
             logging.warning((datetime.now() - before) / timedelta(milliseconds=1))
 
         django = pl.read_csv(
@@ -155,7 +193,7 @@ def test_departement(
                 nuxt_row["procedure_id"],
             ) in LEGITIMATE_DIFFERENCES:
                 logging.warning(f"Ignoring {nuxt_row['procedure_id']}")  # noqa: G004
-                continue
-
-            assert nuxt_row == django_row
+                assert nuxt_row != django_row
+            else:
+                assert nuxt_row == django_row
         # polars.testing.assert_frame_equal(nuxt, django)
diff --git a/django/core/tests/test_models.py b/django/core/tests/test_models.py
@@ -52,63 +52,72 @@ def test_is_schema(self) -> None:
         assert Procedure(type_document=TypeDocument.SD).is_schema
 
     @pytest.mark.django_db
-    def test_plus_recent_event_prescription(
+    def test_date_approbation_retourne_plus_recent_event_approbation(
         self, django_assert_num_queries: DjangoAssertNumQueries
     ) -> None:
         procedure = Procedure.objects.create(type_document=TypeDocument.PLUI)
         procedure.event_set.create(
-            type="Délibération de prescription du conseil municipal ou communautaire",
+            type="Caractère exécutoire",
             date_iso="2022-12-01",
         )
-        event_prescription = procedure.event_set.create(
-            type="Délibération de prescription du conseil municipal ou communautaire",
+        procedure.event_set.create(
+            type="Délibération d'approbation du municipal ou communautaire",
             date_iso="2024-12-01",
         )
         procedure.event_set.create(
-            type="Délibération de prescription du conseil municipal ou communautaire",
+            type="Délibération d'approbation",
             date_iso="2023-12-01",
         )
 
-        assert event_prescription.impact == EventImpact.EN_COURS
+        # FIXME More checks
+        assert [event.impact for event in procedure.event_set.all()] == [
+            EventImpact.OPPOSABLE,
+            EventImpact.OPPOSABLE,
+            EventImpact.OPPOSABLE,
+        ]
         with django_assert_num_queries(1):
             procedure_with_events = Procedure.objects.with_events().get(id=procedure.id)
 
-            assert procedure_with_events.date_prescription == "2024-12-01"
+            assert procedure_with_events.date_approbation == "2024-12-01"
 
     @pytest.mark.django_db
-    def test_event_prescription_uniquement(
+    def test_date_approbation_ignore_event_pas_approbation(
         self, django_assert_num_queries: DjangoAssertNumQueries
     ) -> None:
         procedure = Procedure.objects.create(type_document=TypeDocument.PLUI)
         procedure.event_set.create(
-            type="Caractère exécutoire",
-            date_iso="2025-12-01",
-        )
-        event_prescription = procedure.event_set.create(
             type="Délibération de prescription du conseil municipal ou communautaire",
+            date_iso="2023-12-01",
+        )
+        event_approbation = procedure.event_set.create(
+            type="Caractère exécutoire",
             date_iso="2024-12-01",
         )
         procedure.event_set.create(
-            type="Caractère exécutoire",
+            type="Délibération de prescription du conseil municipal ou communautaire",
             date_iso="2025-12-01",
         )
 
-        assert event_prescription.impact == EventImpact.EN_COURS
+        assert [event.impact for event in procedure.event_set.all()] == [
+            EventImpact.EN_COURS,
+            EventImpact.OPPOSABLE,
+            EventImpact.EN_COURS,
+        ]
         with django_assert_num_queries(1):
             procedure_with_events = Procedure.objects.with_events().get(id=procedure.id)
 
-            assert procedure_with_events.date_prescription == "2024-12-01"
+            assert procedure_with_events.date_approbation == "2024-12-01"
 
     @pytest.mark.django_db
-    def test_event_prescription_manquant(
+    def test_date_approbation_quand_event_approbation_manquant(
         self, django_assert_num_queries: DjangoAssertNumQueries
     ) -> None:
         procedure = Procedure.objects.create(type_document=TypeDocument.PLUI)
 
         with django_assert_num_queries(1):
             procedure_with_events = Procedure.objects.with_events().get(id=procedure.id)
 
-            assert procedure_with_events.date_prescription == "0000-00-00"
+            assert procedure_with_events.date_approbation == "0000-00-00"
 
 
 class TestProcedureStatut:
@@ -233,10 +242,8 @@ def test_plus_recente_opposable(
             is_principale=True, type_document=TypeDocument.PLUI
         )
         procedure_opposable.event_set.create(
-            type="Délibération de prescription du conseil municipal ou communautaire",
-            date_iso="2024-12-01",
+            type="Caractère exécutoire", date_iso="2024-12-01"
         )
-        procedure_opposable.event_set.create(type="Caractère exécutoire")
         commune_procedure_opposable = procedure_opposable.perimetre.create(
             collectivite_code="12345", departement="12"
         )
@@ -245,11 +252,7 @@ def test_plus_recente_opposable(
             is_principale=True, type_document=TypeDocument.PLU
         )
         procedure_precedente.event_set.create(
-            type="Délibération de prescription du conseil municipal ou communautaire",
-            date_iso="2023-12-01",
-        )
-        procedure_precedente.event_set.create(
-            type="Caractère exécutoire",
+            type="Caractère exécutoire", date_iso="2023-12-01"
         )
         commune_procedure_precedente = procedure_precedente.perimetre.create(
             collectivite_code="12345", departement="12"
diff --git a/django/core/urls.py b/django/core/urls.py
@@ -8,8 +8,9 @@
 
 urlpatterns = [
     path("_admin/", admin.site.urls),
+    path("collectivite/<collectivite_code>/", views.collectivite),
     path("api/perimetres", views.perimetres),
     path("__reload__/", include("django_browser_reload.urls")),
-    re_path(r"(?P<path>.*)", ProxyView.as_view(upstream=settings.UPSTREAM_NUXT)),
     *debug_toolbar_urls(),
+    re_path(r"(?P<path>.*)", ProxyView.as_view(upstream=settings.UPSTREAM_NUXT)),
 ]
diff --git a/django/core/views.py b/django/core/views.py
@@ -1,8 +1,10 @@
 from csv import DictWriter
+from operator import attrgetter
 
 from django.http import HttpRequest, HttpResponse
+from django.shortcuts import render
 
-from core.models import CommuneProcedure
+from core.models import CommuneProcedure, communes
 
 
 def _format_perimetre(perimetre: dict) -> dict:
@@ -22,7 +24,7 @@ def perimetres(request: HttpRequest) -> HttpResponse:
         procedure__is_principale=True
     ).departement(departement)
 
-    response = HttpResponse(content_type="text/html;charset=utf-8")
+    response = HttpResponse(content_type="text/csv;charset=utf-8")
     csv_writer = DictWriter(
         response,
         dialect="unix",
@@ -41,3 +43,21 @@ def perimetres(request: HttpRequest) -> HttpResponse:
         csv_writer.writerow(a)
 
     return response
+
+
+def collectivite(
+    request: HttpRequest, collectivite_code: str, collectivite_type: str = "COM"
+) -> HttpResponse:
+    communes_procedures = CommuneProcedure.objects.filter(
+        procedure__is_principale=True
+    ).collectivite(collectivite_code, collectivite_type)
+    communes_procedures = sorted(
+        communes_procedures,
+        key=attrgetter("procedure.is_schema", "procedure.date_approbation"),
+        reverse=True,
+    )
+
+    commune = communes[f"{collectivite_code}_{collectivite_type}"]
+    return render(
+        request, "collectivite.html", {"collectivite": commune, "cp": communes_procedures}
+    )

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,8 @@`
`63`	`63`	`DATABASES = {`
`64`	`64`	`"default": {`
`65`	`65`	`**env.db("DATABASE_URL"),`
`66`		`- "OPTIONS": {`
`67`		`- "pool": {`
`68`		`- "min_size": 1,`
`69`		`- }`
`70`		`- },`
	`66`	`+ "CONN_MAX_AGE": env.int("CONN_MAX_AGE", 0),`
	`67`	`+ "CONN_HEALTH_CHECK": True,`
`71`	`68`	`}`
`72`	`69`	`}`
`73`	`70`