Add distinct

apptax/taxonomie/routestaxref.py

@@ -479,6 +479,7 @@ def get_names():
     if id_liste and not id_liste == -1:
         q = q.filter(CorNomListe.id_liste.in_(tuple(id_liste)))
 
+    # filtre sur search_name
     search_name = request.args.get("search_name")
     if search_name:
         search_name = search_name.replace(" ", "%")
@@ -491,16 +492,23 @@ def get_names():
             desc(VMTaxrefListForautocomplete.cd_nom == VMTaxrefListForautocomplete.cd_ref)
         )
 
-    results = q.paginate(page=page, per_page=limit, error_out=False)
-    items = []
-
+    # Filtrer champs retourner par la requête
     fields = request.args.get("fields", type=str, default=[])
     if fields:
         fields = fields.split(",")
     fields_to_filter = None
     if fields:
         fields_to_filter = [f for f in fields if getattr(VMTaxrefListForautocomplete, f, None)]
+        # Ajout disctinct pour ne pas avoir de doublons
+        for field in [
+            getattr(VMTaxrefListForautocomplete, f, None)
+            for f in fields
+            if getattr(VMTaxrefListForautocomplete, f, None)
+        ]:
+            q = q.distinct(field)
 
+    results = q.paginate(page=page, per_page=limit, error_out=False)
+    items = []
     for r in results.items:
         data = r.as_dict(fields=fields_to_filter, exclude=["unaccent_search_name"])
         if not fields or "lists" in fields:

apptax/tests/test_taxref.py

@@ -138,6 +138,17 @@ def test_get_names_routes_limit_fields(self):
         if data:
             assert current_schema.is_valid(data)
 
+    def test_get_names_routes_limit_filter_id_liste(self):
+        query_string = {"limit": 10, "id_liste": "100", "fields": "cd_nom"}
+        response = self.client.get(url_for("taxref.get_names"), query_string=query_string)
+        current_schema = Schema([{"cd_nom": int}])
+        assert response.status_code == 200
+        data = response.json
+
+        if data:
+            assert current_schema.is_valid(data)
+            assert len(data) == 9
+
     def test_get_distinct_routes(self):
         response = self.client.get(url_for("taxref.getDistinctField", field="regne"))
         assert response.status_code == 200