remove with_is_new_for_siaes from method queryset to view

gip-inclusion · Mar 11, 2024 · 4153584 · 4153584
1 parent cbf27f8
commit 4153584
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py
@@ -176,12 +176,7 @@ def filter_with_siaes(self, siaes):
         - the tender-siae matching has already been done with filter_with_tender()
         - with annotation to new if it's new for siaes
         """
-        return (
-            self.sent()
-            .filter(tendersiae__is_deleted_by_siae=False, tendersiae__siae__in=siaes)
-            .distinct()
-            .with_is_new_for_siaes(siaes)
-        )
+        return self.sent().filter(tendersiae__is_deleted_by_siae=False, tendersiae__siae__in=siaes).distinct()
 
     def with_deadline_date_is_outdated(self, limit_date=datetime.today()):
         return self.annotate(

diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py
@@ -289,7 +289,7 @@ def get_queryset(self):
             siaes = user.siaes.all()
             if siaes:
                 # we get the first siae by default
-                qs = Tender.objects.filter_with_siaes(siaes)
+                qs = Tender.objects.filter_with_siaes(siaes).with_is_new_for_siaes(siaes)
         else:
             qs = Tender.objects.by_user(user).with_siae_stats()
             if self.status: