From e783e53a0cad8cc5941389bd957d408e76331e49 Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Thu, 22 Feb 2024 14:02:41 +0100 Subject: [PATCH 1/9] add attribute model to tendersiae for delete --- .../0078_tendersiae_is_deleted_by_siae.py | 17 +++++++++++++++++ lemarche/tenders/models.py | 1 + 2 files changed, 18 insertions(+) create mode 100644 lemarche/tenders/migrations/0078_tendersiae_is_deleted_by_siae.py diff --git a/lemarche/tenders/migrations/0078_tendersiae_is_deleted_by_siae.py b/lemarche/tenders/migrations/0078_tendersiae_is_deleted_by_siae.py new file mode 100644 index 000000000..4f81e2122 --- /dev/null +++ b/lemarche/tenders/migrations/0078_tendersiae_is_deleted_by_siae.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.9 on 2024-02-22 13:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("tenders", "0077_alter_tender_siae_kind"), + ] + + operations = [ + migrations.AddField( + model_name="tendersiae", + name="is_deleted_by_siae", + field=models.BooleanField(db_index=True, default=False, verbose_name="Supprimé par l'utilisateur ?"), + ), + ] diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py index cdc966730..ffd115256 100644 --- a/lemarche/tenders/models.py +++ b/lemarche/tenders/models.py @@ -948,6 +948,7 @@ class TenderSiae(models.Model): default=tender_constants.TENDER_SIAE_SOURCE_EMAIL, ) found_with_ai = models.BooleanField("Trouvé par l'IA", default=False) + is_deleted_by_siae = models.BooleanField("Supprimé par l'utilisateur ?", default=False, db_index=True) # stats: relation email_send_date = models.DateTimeField("Date d'envoi de l'e-mail", blank=True, null=True) From ed28fa0ec6704c362ee6875124dfd5cf9a6333e1 Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Mon, 4 Mar 2024 22:23:41 +0100 Subject: [PATCH 2/9] add current siae in to the context --- lemarche/templates/tenders/_list_item_siae.html | 2 +- lemarche/www/tenders/views.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lemarche/templates/tenders/_list_item_siae.html b/lemarche/templates/tenders/_list_item_siae.html index fe5bfbeaa..725bcdf63 100644 --- a/lemarche/templates/tenders/_list_item_siae.html +++ b/lemarche/templates/tenders/_list_item_siae.html @@ -16,7 +16,7 @@ {% endif %} Disponible jusqu'au : {{ tender.deadline_date|default:"" }} - {% if not tender.tendersiae_set.first.detail_display_date %} + {% if not current_siae.detail_display_date %} Nouveau {% endif %} {% endif %} diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py index 555c72ed6..914e2c9c7 100644 --- a/lemarche/www/tenders/views.py +++ b/lemarche/www/tenders/views.py @@ -2,7 +2,6 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.core.paginator import Paginator -from django.db.models import Prefetch from django.http import HttpResponseForbidden, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect from django.urls import reverse_lazy @@ -277,6 +276,7 @@ class TenderListView(LoginRequiredMixin, ListView): paginate_by = 10 paginator_class = Paginator status = None + siae: Siae = None def get_queryset(self): """ @@ -288,11 +288,9 @@ def get_queryset(self): if user.kind == User.KIND_SIAE and user.siaes: siaes = user.siaes.all() if siaes: - # filtered prefetch to get detail_display_date on tendersiae_set related to user's siaes - tendersiae_qs = TenderSiae.objects.filter(siae__in=siaes) - qs = Tender.objects.filter_with_siaes(siaes).prefetch_related( - Prefetch("tendersiae_set", queryset=tendersiae_qs) - ) + # we get the first siae by default + self.siae = siaes[0] + qs = Tender.objects.filter_with_siaes(siaes) else: qs = Tender.objects.by_user(user).with_siae_stats() if self.status: @@ -326,6 +324,8 @@ def get_context_data(self, **kwargs): context["title_kind_sourcing_siae"] = TITLE_KIND_SOURCING_SIAE context["tender_constants"] = tender_constants context["filter_form"] = self.filter_form + if self.siae: + context["current_siae"] = self.siae return context From ef08228122a79ea771903d4faace8e01b1d3e1ca Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Wed, 6 Mar 2024 15:42:20 +0100 Subject: [PATCH 3/9] add new annotation --- lemarche/tenders/models.py | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py index ffd115256..b40b5d961 100644 --- a/lemarche/tenders/models.py +++ b/lemarche/tenders/models.py @@ -4,7 +4,20 @@ from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation from django.db import IntegrityError, models, transaction -from django.db.models import BooleanField, Case, Count, ExpressionWrapper, F, IntegerField, Q, Sum, Value, When +from django.db.models import ( + BooleanField, + Case, + Count, + Exists, + ExpressionWrapper, + F, + IntegerField, + OuterRef, + Q, + Sum, + Value, + When, +) from django.db.models.functions import Greatest from django.urls import reverse from django.utils import timezone @@ -136,13 +149,28 @@ def in_sectors(self, sectors): else: return self + def with_is_new_for_siaes(self, siaes, limit_date=datetime.today()): + tender_siae_subquery = TenderSiae.objects.filter( + tender=OuterRef("pk"), + siae__in=siaes, + detail_display_date__isnull=False, + ) + return self.annotate( + is_new_for_siaes=Exists( + # if the tender deadline_date is less than limite date the tender is not new + # that why we user this filter + tender_siae_subquery.filter(tender__deadline_date__lt=limit_date) + ) + ) + def filter_with_siaes(self, siaes): """ Return the list of tenders corresponding to the list of - we return only sent tenders - 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__siae__in=siaes).distinct() + return self.sent().filter(tendersiae__siae__in=siaes).distinct().with_is_new_for_siaes(siaes) def with_deadline_date_is_outdated(self, limit_date=datetime.today()): return self.annotate( From 8f71c464d842e61f20ccb6e85886efca1fe2630c Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Wed, 6 Mar 2024 16:48:36 +0100 Subject: [PATCH 4/9] allow to delete siaetenders --- .../templates/tenders/_list_item_siae.html | 29 ++++++++++++++----- lemarche/www/tenders/urls.py | 6 ++++ lemarche/www/tenders/views.py | 19 ++++++++++-- 3 files changed, 44 insertions(+), 10 deletions(-) diff --git a/lemarche/templates/tenders/_list_item_siae.html b/lemarche/templates/tenders/_list_item_siae.html index 725bcdf63..679cbe8f7 100644 --- a/lemarche/templates/tenders/_list_item_siae.html +++ b/lemarche/templates/tenders/_list_item_siae.html @@ -1,9 +1,8 @@ {% load static humanize %} - -
+
-
+

{% if tender.deadline_date_is_outdated_annotated %} Clôturé le {{ tender.deadline_date|default:"" }} @@ -16,15 +15,29 @@ {% endif %} Disponible jusqu'au : {{ tender.deadline_date|default:"" }} - {% if not current_siae.detail_display_date %} - Nouveau - {% endif %} + {% endif %}

+
+ {% if not tender.is_new_for_siaes %} + Nouveau + {% elif tender.deadline_date_is_outdated_annotated %} +
+ {% csrf_token %} + +
+ {% endif %} +
- -

{{ tender.title }}

+ +

{{ tender.title }}

+
diff --git a/lemarche/www/tenders/urls.py b/lemarche/www/tenders/urls.py index 93f7fff2c..06eaa5033 100644 --- a/lemarche/www/tenders/urls.py +++ b/lemarche/www/tenders/urls.py @@ -10,6 +10,7 @@ TenderDetailSurveyTransactionedView, TenderDetailView, TenderListView, + TenderSiaeDeleteView, TenderSiaeListView, ) @@ -45,6 +46,11 @@ TenderDetailNotInterestedClickView.as_view(), name="detail-not-interested-click", ), + path( + "/supprimer-depot-de-besoin", + TenderSiaeDeleteView.as_view(), + name="delete-tender-siae", + ), path( "/sondage-transaction", TenderDetailSurveyTransactionedView.as_view(), diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py index 914e2c9c7..8aeea4038 100644 --- a/lemarche/www/tenders/views.py +++ b/lemarche/www/tenders/views.py @@ -2,12 +2,12 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.core.paginator import Paginator -from django.http import HttpResponseForbidden, HttpResponseRedirect +from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect from django.urls import reverse_lazy from django.utils import timezone from django.utils.safestring import mark_safe -from django.views.generic import DetailView, ListView, UpdateView +from django.views.generic import DetailView, ListView, UpdateView, View from django.views.generic.edit import FormMixin from formtools.wizard.views import SessionWizardView @@ -728,3 +728,18 @@ def get_success_message(self, already_answered=False): if already_answered: return "Votre réponse a déjà été prise en compte." return "Merci pour votre réponse !" + + +class TenderSiaeDeleteView(LoginRequiredMixin, View): + def post(self, request, *args, **kwargs): + tender = get_object_or_404(Tender, slug=kwargs["slug"]) + user = self.request.user + if user.kind == User.KIND_SIAE: + tender.tendersiae_set.filter(siae__in=user.siaes.all()).update(is_deleted_by_siae=True) + if request.htmx: + # status code 204 doesn't work with htmx + return HttpResponse("", status=200) + return HttpResponseRedirect(reverse_lazy("home")) + else: + # if the user is not SIAE kind, the post is not allowed + return HttpResponse(status=401) From bc4da8f0e900b8f8f7de3d566320bd0595933f06 Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Wed, 6 Mar 2024 16:57:43 +0100 Subject: [PATCH 5/9] we display only tenders not deleted --- lemarche/tenders/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py index b40b5d961..d7d85a2f3 100644 --- a/lemarche/tenders/models.py +++ b/lemarche/tenders/models.py @@ -170,7 +170,12 @@ 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__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() + .with_is_new_for_siaes(siaes) + ) def with_deadline_date_is_outdated(self, limit_date=datetime.today()): return self.annotate( From 2669db88a097f87877fb49018b0a94b1c1d04ef8 Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Wed, 6 Mar 2024 16:57:53 +0100 Subject: [PATCH 6/9] clean from the code --- lemarche/www/tenders/views.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py index 8aeea4038..59b9a0ed2 100644 --- a/lemarche/www/tenders/views.py +++ b/lemarche/www/tenders/views.py @@ -289,7 +289,6 @@ def get_queryset(self): siaes = user.siaes.all() if siaes: # we get the first siae by default - self.siae = siaes[0] qs = Tender.objects.filter_with_siaes(siaes) else: qs = Tender.objects.by_user(user).with_siae_stats() @@ -324,8 +323,6 @@ def get_context_data(self, **kwargs): context["title_kind_sourcing_siae"] = TITLE_KIND_SOURCING_SIAE context["tender_constants"] = tender_constants context["filter_form"] = self.filter_form - if self.siae: - context["current_siae"] = self.siae return context From cbf27f82f4bc1fb74f818080e678d812e3519ebf Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Wed, 6 Mar 2024 18:08:09 +0100 Subject: [PATCH 7/9] fix tests --- .../templates/tenders/_list_item_siae.html | 2 +- lemarche/tenders/models.py | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lemarche/templates/tenders/_list_item_siae.html b/lemarche/templates/tenders/_list_item_siae.html index 679cbe8f7..2ce640a9c 100644 --- a/lemarche/templates/tenders/_list_item_siae.html +++ b/lemarche/templates/tenders/_list_item_siae.html @@ -20,7 +20,7 @@

- {% if not tender.is_new_for_siaes %} + {% if tender.is_new_for_siaes %} Nouveau {% elif tender.deadline_date_is_outdated_annotated %}
Date: Mon, 11 Mar 2024 12:13:29 +0100 Subject: [PATCH 8/9] remove with_is_new_for_siaes from method queryset to view --- lemarche/tenders/models.py | 7 +------ lemarche/www/tenders/views.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py index 3e3364925..44ebade44 100644 --- 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 index 59b9a0ed2..00ec88979 100644 --- 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: From 453af7571fc7545803de7dec7051579ce82e66ac Mon Sep 17 00:00:00 2001 From: "madjid.asa" Date: Mon, 11 Mar 2024 15:14:59 +0100 Subject: [PATCH 9/9] rename delete to hide --- lemarche/templates/tenders/_list_item_siae.html | 4 ++-- lemarche/www/tenders/urls.py | 8 ++++---- lemarche/www/tenders/views.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lemarche/templates/tenders/_list_item_siae.html b/lemarche/templates/tenders/_list_item_siae.html index 2ce640a9c..677e4929f 100644 --- a/lemarche/templates/tenders/_list_item_siae.html +++ b/lemarche/templates/tenders/_list_item_siae.html @@ -23,8 +23,8 @@ {% if tender.is_new_for_siaes %} Nouveau {% elif tender.deadline_date_is_outdated_annotated %} - {% csrf_token %} diff --git a/lemarche/www/tenders/urls.py b/lemarche/www/tenders/urls.py index 06eaa5033..00406573d 100644 --- a/lemarche/www/tenders/urls.py +++ b/lemarche/www/tenders/urls.py @@ -10,7 +10,7 @@ TenderDetailSurveyTransactionedView, TenderDetailView, TenderListView, - TenderSiaeDeleteView, + TenderSiaeHideView, TenderSiaeListView, ) @@ -47,9 +47,9 @@ name="detail-not-interested-click", ), path( - "/supprimer-depot-de-besoin", - TenderSiaeDeleteView.as_view(), - name="delete-tender-siae", + "/cacher-depot-de-besoin", + TenderSiaeHideView.as_view(), + name="hide-tender-siae", ), path( "/sondage-transaction", diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py index 00ec88979..35af0fd9c 100644 --- a/lemarche/www/tenders/views.py +++ b/lemarche/www/tenders/views.py @@ -727,7 +727,7 @@ def get_success_message(self, already_answered=False): return "Merci pour votre réponse !" -class TenderSiaeDeleteView(LoginRequiredMixin, View): +class TenderSiaeHideView(LoginRequiredMixin, View): def post(self, request, *args, **kwargs): tender = get_object_or_404(Tender, slug=kwargs["slug"]) user = self.request.user