fix(Admin): Besoins: ajuste les règles de filtrage pour le montant ex…

…act. ref #1112
gip-inclusion · Mar 1, 2024 · fa21009 · fa21009
1 parent df3fd2f
commit fa21009
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lemarche/tenders/admin.py b/lemarche/tenders/admin.py
@@ -61,7 +61,7 @@ class AmountCustomFilter(admin.SimpleListFilter):
     def lookups(self, request, model_admin):
         return (
             ("<10k", "Inférieur (<) à 10k €"),
-            ("5k-10k", "Entre 5k et 10k €"),
+            ("5k-10k", "Entre (>=) 5k et (<) 10k €"),
             (">=10k", "Supérieur (>=) à 10k €"),
         )
 
@@ -72,8 +72,8 @@ def queryset(self, request, queryset):
         if value == "<10k":
             return queryset.filter_by_amount_exact(amount_10k, operation="lt")
         elif value == "5k-10k":
-            return queryset.filter_by_amount_exact(amount_10k, operation="lte").filter_by_amount_exact(
-                amount_5k, operation="gte"
+            return queryset.filter_by_amount_exact(amount_5k, operation="gte").filter_by_amount_exact(
+                amount_10k, operation="lt"
             )
         elif value == ">=10k":
             return queryset.filter_by_amount_exact(amount_10k, operation="gte")

diff --git a/lemarche/tenders/tests.py b/lemarche/tenders/tests.py
@@ -434,6 +434,12 @@ def test_filter_by_amount_exact(self):
             .count(),
             3,
         )
+        self.assertEqual(
+            tender_qs.filter_by_amount_exact(10000, operation="lt")
+            .filter_by_amount_exact(5000, operation="gte")
+            .count(),
+            2,
+        )
 
 
 class TenderModelQuerysetOrderTest(TestCase):