From dfe96a73287e4965f484c94ba7beacb62a3d2874 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:18:06 +0100
Subject: [PATCH 1/4] Conditional hide modals

---
 lemarche/templates/tenders/detail.html | 12 +++++++++---
 lemarche/www/tenders/views.py          |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lemarche/templates/tenders/detail.html b/lemarche/templates/tenders/detail.html
index be1fba027..fae70683c 100644
--- a/lemarche/templates/tenders/detail.html
+++ b/lemarche/templates/tenders/detail.html
@@ -66,9 +66,15 @@
 {% endblock %}
 
 {% block modals %}
-{% include "auth/_login_or_signup_siae_tender_modal.html" %}
-{% include "tenders/_detail_contact_click_confirm_modal.html" %}
-{% include "tenders/_detail_not_interested_click_confirm_modal.html" %}
+{% if not siae_has_detail_contact_click_date %}
+    {% include "auth/_login_or_signup_siae_tender_modal.html" %}
+{% endif %}
+{% if not siae_has_detail_cocontracting_click_date %}
+    {% include "tenders/_detail_contact_click_confirm_modal.html" %}
+{% endif %}
+{% if not siae_has_detail_not_interested_click_date %}
+    {% include "tenders/_detail_not_interested_click_confirm_modal.html" %}
+{% endif %}
 {% endblock %}
 
 {% block extra_js %}
diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py
index 555c72ed6..f45765aed 100644
--- a/lemarche/www/tenders/views.py
+++ b/lemarche/www/tenders/views.py
@@ -511,7 +511,7 @@ class TenderDetailNotInterestedClickView(SiaeUserRequiredOrSiaeIdParamMixin, Det
     Endpoint to handle 'not interested' button click
     """
 
-    template_name = "tenders/_detail_not_interested_click_confirm.html"
+    template_name = "tenders/_detail_not_interested_click_confirm_modal.html"
     model = Tender
 
     def get_object(self):

From 1632cced236c5d36dfb23b555e2c077a524c4d9d Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:18:49 +0100
Subject: [PATCH 2/4] New variable TENDER_NOT_INTERESTED_URL

---
 lemarche/www/tenders/tasks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lemarche/www/tenders/tasks.py b/lemarche/www/tenders/tasks.py
index c693c8bdd..38dc11890 100644
--- a/lemarche/www/tenders/tasks.py
+++ b/lemarche/www/tenders/tasks.py
@@ -190,6 +190,7 @@ def send_tender_email_to_siae(tender: Tender, siae: Siae, email_subject: str, em
             "TENDER_AMOUNT": tender.amount_display,
             "TENDER_DEADLINE_DATE": date_to_string(tender.deadline_date),
             "TENDER_URL": f"{get_object_share_url(tender)}?siae_id={siae.id}",
+            "TENDER_NOT_INTERESTED_URL": f"{get_object_share_url(tender)}?siae_id={siae.id}&not_interested=True",
         }
 
         api_mailjet.send_transactional_email_with_template(

From f8a78fc1720c5078c8cae4036592f15472eff1ff Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Mon, 4 Mar 2024 17:30:57 +0100
Subject: [PATCH 3/4] Show not interested modal if not_interested=True in the
 url

---
 lemarche/templates/tenders/detail.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lemarche/templates/tenders/detail.html b/lemarche/templates/tenders/detail.html
index fae70683c..0ba8d33af 100644
--- a/lemarche/templates/tenders/detail.html
+++ b/lemarche/templates/tenders/detail.html
@@ -78,6 +78,19 @@
 {% endblock %}
 
 {% block extra_js %}
+{% if not siae_has_detail_not_interested_click_date %}
+    <script type="text/javascript">
+        const urlParams = new URLSearchParams(window.location.search);
+        if (urlParams.get('not_interested') && urlParams.get('not_interested') === 'True') {
+            // why click() instead of OpenBootstrapModal('#detail_not_interested_click_confirm_modal') ?
+            // why setTimeout ?
+            // --> to have the siae_id set in the modal
+            setTimeout(function() {
+                document.querySelector('#show-tender-not-interested-modal-btn').click();
+            }, 100);
+        }
+    </script>
+{% endif %}
 {% if TALLY_NPS_FORM_ID and show_nps %}
     <script async type="text/javascript" src="https://tally.so/widgets/embed.js"></script>
     <script type="text/javascript">

From 48db1db1a561ca5950c8b9e3f555e4b3748b0fcd Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:54:55 +0100
Subject: [PATCH 4/4] Update tests

---
 lemarche/templates/tenders/detail.html | 18 ++++---
 lemarche/www/tenders/tests.py          | 71 ++++++++++++++++++++------
 2 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/lemarche/templates/tenders/detail.html b/lemarche/templates/tenders/detail.html
index 0ba8d33af..8516c3d3f 100644
--- a/lemarche/templates/tenders/detail.html
+++ b/lemarche/templates/tenders/detail.html
@@ -66,14 +66,16 @@
 {% endblock %}
 
 {% block modals %}
-{% if not siae_has_detail_contact_click_date %}
-    {% include "auth/_login_or_signup_siae_tender_modal.html" %}
-{% endif %}
-{% if not siae_has_detail_cocontracting_click_date %}
-    {% include "tenders/_detail_contact_click_confirm_modal.html" %}
-{% endif %}
-{% if not siae_has_detail_not_interested_click_date %}
-    {% include "tenders/_detail_not_interested_click_confirm_modal.html" %}
+{% if user.is_authenticated or siae_id %}
+    {% if not siae_has_detail_contact_click_date %}
+        {% include "auth/_login_or_signup_siae_tender_modal.html" %}
+    {% endif %}
+    {% if not siae_has_detail_cocontracting_click_date %}
+        {% include "tenders/_detail_contact_click_confirm_modal.html" %}
+    {% endif %}
+    {% if not siae_has_detail_not_interested_click_date %}
+        {% include "tenders/_detail_not_interested_click_confirm_modal.html" %}
+    {% endif %}
 {% endif %}
 {% endblock %}
 
diff --git a/lemarche/www/tenders/tests.py b/lemarche/www/tenders/tests.py
index e0b6871db..5b06720c9 100644
--- a/lemarche/www/tenders/tests.py
+++ b/lemarche/www/tenders/tests.py
@@ -1454,45 +1454,82 @@ def setUpTestData(self):
             "tenders:detail-not-interested-click", kwargs={"slug": self.tender.slug}
         )
 
-    def test_user_can_notify_not_interested_wish_with_siae_id(self):
+    def test_anonymous_user_cannot_notify_not_interested(self):
         response = self.client.get(self.tender_detail_url)
         self.assertContains(response, self.cta_message)
+        self.assertNotContains(response, 'id="detail_not_interested_click_confirm_modal"')
+        self.assertNotContains(response, self.cta_message_success)
         # anonymous user
         response = self.client.post(self.tender_not_interested_url, data={})
         self.assertEqual(response.status_code, 403)
-        # wrong siae_id
-        response = self.client.post(f"{self.tender_not_interested_url}?siae_id=999999", data={}, follow=True)
-        self.assertContains(response, self.cta_message)
-        # workflow
-        response = self.client.get(self.tender_detail_url)
-        self.assertContains(response, self.cta_message)
-        self.assertNotContains(response, self.cta_message_success)
-        tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
-        self.assertIsNone(tendersiae.detail_not_interested_click_date)
-        response = self.client.post(f"{self.tender_not_interested_url}?siae_id={self.siae.id}", data={}, follow=True)
-        self.assertContains(response, self.cta_message_success)
-        tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
-        self.assertIsNotNone(tendersiae.detail_not_interested_click_date)
-        response = self.client.get(f"{self.tender_detail_url}?siae_id={self.siae.id}")
-        self.assertContains(response, self.cta_message_success)
-        self.assertNotContains(response, self.cta_message)
 
     def test_user_can_notify_not_interested_wish_with_authenticated_user(self):
         self.client.force_login(self.siae_user)
         # workflow
         response = self.client.get(self.tender_detail_url)
         self.assertContains(response, self.cta_message)
+        self.assertContains(response, 'id="detail_not_interested_click_confirm_modal"')
         self.assertNotContains(response, self.cta_message_success)
         response = self.client.post(
             self.tender_not_interested_url, data={"detail_not_interested_feedback": "reason"}, follow=True
         )
         tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
+        self.assertNotContains(response, self.cta_message)
+        self.assertNotContains(response, 'id="detail_not_interested_click_confirm_modal"')
         self.assertContains(response, self.cta_message_success)
         self.assertIsNotNone(tendersiae.detail_not_interested_click_date)
         self.assertEqual(tendersiae.detail_not_interested_feedback, "reason")
         response = self.client.get(self.tender_detail_url)
+        self.assertNotContains(response, self.cta_message)
+        self.assertNotContains(response, 'id="detail_not_interested_click_confirm_modal"')
+        self.assertContains(response, self.cta_message_success)
+
+    def test_user_can_notify_not_interested_wish_with_siae_id_in_url(self):
+        # wrong siae_id
+        response = self.client.post(f"{self.tender_not_interested_url}?siae_id=999999", data={}, follow=True)
+        self.assertContains(response, self.cta_message)
+        self.assertContains(response, 'id="detail_not_interested_click_confirm_modal"')
+        self.assertNotContains(response, self.cta_message_success)
+        # workflow
+        tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
+        self.assertIsNone(tendersiae.detail_not_interested_click_date)
+        response = self.client.post(f"{self.tender_not_interested_url}?siae_id={self.siae.id}", data={}, follow=True)
+        self.assertNotContains(response, self.cta_message)
+        self.assertNotContains(response, 'id="detail_not_interested_click_confirm_modal"')
         self.assertContains(response, self.cta_message_success)
+        tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
+        self.assertIsNotNone(tendersiae.detail_not_interested_click_date)
+        response = self.client.get(f"{self.tender_detail_url}?siae_id={self.siae.id}")
         self.assertNotContains(response, self.cta_message)
+        self.assertNotContains(response, 'id="detail_not_interested_click_confirm_modal"')
+        self.assertContains(response, self.cta_message_success)
+
+
+def test_user_can_notify_not_interested_wish_with_siae_id_and_answer_in_url(self):
+    # wrong siae_id
+    response = self.client.post(
+        f"{self.tender_not_interested_url}?siae_id=999999&not_interested=True", data={}, follow=True
+    )
+    self.assertContains(response, self.cta_message)
+    self.assertContains(response, 'modal-siae" id="detail_not_interested_click_confirm_modal"')
+    self.assertNotContains(response, 'modal-siae show" id="detail_not_interested_click_confirm_modal"')
+    self.assertNotContains(response, self.cta_message_success)
+    # workflow
+    tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
+    self.assertIsNone(tendersiae.detail_not_interested_click_date)
+    response = self.client.post(
+        f"{self.tender_not_interested_url}?siae_id={self.siae.id}&not_interested=True", data={}, follow=True
+    )
+    self.assertContains(response, self.cta_message)
+    self.assertNotContains(response, 'modal-siae" id="detail_not_interested_click_confirm_modal"')
+    self.assertContains(response, 'modal-siae show" id="detail_not_interested_click_confirm_modal"')
+    self.assertNotContains(response, self.cta_message_success)
+    tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae)
+    self.assertIsNotNone(tendersiae.detail_not_interested_click_date)
+    response = self.client.get(f"{self.tender_detail_url}?siae_id={self.siae.id}")
+    self.assertNotContains(response, self.cta_message)
+    self.assertNotContains(response, 'id="detail_not_interested_click_confirm_modal"')
+    self.assertContains(response, self.cta_message_success)
 
 
 # TODO: this test doesn't work anymore. find a way to test logging post-email in non-prod environments?