Remove unused search filters

MTES-MCT · Nov 14, 2024 · 35e149d · 35e149d
1 parent 5b4dcd5
commit 35e149d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 61 deletions.
diff --git a/project/views/crud.py b/project/views/crud.py
@@ -26,7 +26,7 @@
 from project.models.create import update_period
 from project.models.enums import ProjectChangeReason
 from public_data.exceptions import LandException
-from public_data.models import AdminRef, Land
+from public_data.models import Land
 from utils.views_mixins import BreadCrumbMixin, RedirectURLMixin
 
 from .mixins import GroupMixin, ReactMixin
@@ -69,40 +69,12 @@ def get_context_data(self, **kwargs):
 
     def form_valid(self, form):
         """If the form is valid, redirect to the supplied URL."""
-        if not form.cleaned_data["selection"]:
-            search_for = []
-            if form.cleaned_data["search_region"]:
-                search_for.append(AdminRef.REGION)
-            if form.cleaned_data["search_departement"]:
-                search_for.append(AdminRef.DEPARTEMENT)
-            if form.cleaned_data["search_epci"]:
-                search_for.append(AdminRef.EPCI)
-            if form.cleaned_data["search_commune"]:
-                search_for.append(AdminRef.COMMUNE)
-            if form.cleaned_data["search_scot"]:
-                search_for.append(AdminRef.SCOT)
-            needle = form.cleaned_data["keyword"]
-            if needle == "*":
-                needle = ""
-            results = Land.search(
-                needle,
-                region=form.cleaned_data["region"],
-                departement=form.cleaned_data["departement"],
-                epci=form.cleaned_data["epci"],
-                search_for=search_for,
-            )
-            kwargs = {
-                "results": {AdminRef.get_label(k): v for k, v in results.items()},
-                "form": form,
-            }
-            return self.render_to_response(self.get_context_data(**kwargs))
-        else:
-            project = create_from_public_key(form.cleaned_data["selection"], user=self.request.user)
+        project = create_from_public_key(form.cleaned_data["selection"], user=self.request.user)
 
-            if self.request.GET.get("next") == "download":
-                return redirect("project:report_download", pk=project.id)
-            else:
-                return redirect("project:splash", pk=project.id)
+        if self.request.GET.get("next") == "download":
+            return redirect("project:report_download", pk=project.id)
+        else:
+            return redirect("project:splash", pk=project.id)
 
 
 class ProjectUpdateView(ReactMixin, UpdateView):

diff --git a/public_data/models/administration/Commune.py b/public_data/models/administration/Commune.py
@@ -118,13 +118,6 @@ def search(cls, needle, region=None, departement=None, epci=None):
         qs = qs.filter(similarity__gt=0.2)  # Filtrer par un score minimum de similarité
         qs = qs.order_by("-similarity")  # Trier par score décroissant
 
-        if region:
-            qs = qs.filter(departement__region=region)
-        if departement:
-            qs = qs.filter(departement=departement)
-        if epci:
-            qs = qs.filter(epci=epci)
-
         return qs
 
     @classmethod

diff --git a/public_data/models/administration/Departement.py b/public_data/models/administration/Departement.py
@@ -59,9 +59,4 @@ def search(cls, needle, region=None, departement=None, epci=None):
         qs = qs.filter(similarity__gt=0.15)  # Filtrer par un score minimum de similarité
         qs = qs.order_by("-similarity")  # Trier par score décroissant
 
-        if region:
-            qs = qs.filter(region=region)
-        if departement:
-            qs = qs.filter(id=departement.id)
-
         return qs
diff --git a/public_data/models/administration/Epci.py b/public_data/models/administration/Epci.py
@@ -73,13 +73,6 @@ def search(cls, needle, region=None, departement=None, epci=None):
         qs = qs.filter(similarity__gt=0.15)  # Filtrer par un score minimum de similarité
         qs = qs.order_by("-similarity")  # Trier par score décroissant
 
-        if region:
-            qs = qs.filter(departements__region=region)
-        if departement:
-            qs = qs.filter(departements__id=departement.id)
-        if epci:
-            qs = qs.filter(id=epci.id)
-
         qs = qs.distinct().order_by("-similarity")
 
         return qs
diff --git a/public_data/models/administration/Region.py b/public_data/models/administration/Region.py
@@ -53,9 +53,6 @@ def search(cls, needle, region=None, departement=None, epci=None):
         qs = qs.filter(similarity__gt=0.15)  # Filtrer par un score minimum de similarité
         qs = qs.order_by("-similarity")  # Trier par score décroissant
 
-        if region:
-            qs = qs.filter(id=region.id)
-
         return qs
 
     @property

diff --git a/public_data/models/administration/Scot.py b/public_data/models/administration/Scot.py
@@ -61,9 +61,4 @@ def search(cls, needle, region=None, departement=None, epci=None):
         qs = qs.filter(similarity__gt=0.15)  # Filtrer par un score minimum de similarité
         qs = qs.order_by("-similarity")  # Trier par score décroissant
 
-        if region:
-            qs = qs.filter(regions=region)
-        if departement:
-            qs = qs.filter(id=departement.id)
-
         return qs