From 3a7a36e7bafc80276f1ae7450ddc99a6e8d1b17d Mon Sep 17 00:00:00 2001
From: NEZRI Ygal <T0298741@gemalto.com>
Date: Fri, 14 Jun 2024 18:37:10 +0200
Subject: [PATCH] Fix Ticked ID Bug

Fixed a bug related to the Ticket ID that was preventing the creation or modification of a ticket with a free format, enabling smoother integration and precise traceability.
---
 .../src/components/SiteMonitoring/SuspiciousSites.js   | 10 +---------
 Watcher/Watcher/site_monitoring/models.py              |  7 +++++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js b/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js
index 067eb15..b1d3d33 100755
--- a/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js
+++ b/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js
@@ -311,12 +311,11 @@ export class SuspiciousSites extends Component {
             e.preventDefault();
             const domain_name = this.inputDomainRef.current.value;
             const ticket_id = this.inputTicketRef.current.value;
-            const rtir = this.inputRtirRef.current.value ? this.inputRtirRef.current.value : getMax(this.props.sites, "rtir")+1;
             const expiry = this.state.day;
             const ip_monitoring = this.ipMonitoringRef.current.checked;
             const content_monitoring = this.webContentMonitoringRef.current.checked;
             const mail_monitoring = this.emailMonitoringRef.current.checked;
-            const site = expiry ? {domain_name, ticket_id, rtir, expiry, ip_monitoring, content_monitoring, mail_monitoring} : {domain_name, ticket_id, rtir, ip_monitoring, content_monitoring, mail_monitoring};
+            const site = expiry ? {domain_name, ticket_id, expiry, ip_monitoring, content_monitoring, mail_monitoring} : {domain_name, ticket_id, ip_monitoring, content_monitoring, mail_monitoring};
 
             this.props.addSite(site);
             this.setState({
@@ -356,13 +355,6 @@ export class SuspiciousSites extends Component {
                                                 placeholder="230509-200a2"
                                                 defaultValue={this.state.ticketId}/>
                                         </Col>
-                                        <Form.Label column sm="4">ID</Form.Label>
-                                        <Col sm="8">
-                                            <Form.Control ref={this.inputRtirRef} size="md"
-                                                          type="number" placeholder="number"
-                                                          defaultValue={this.state.rtir}
-                                                          readOnly/>
-                                        </Col>
                                         <Form.Label column sm="4">Expiry Date</Form.Label>
                                         <Col sm="8">
                                             <DayPickerInput
diff --git a/Watcher/Watcher/site_monitoring/models.py b/Watcher/Watcher/site_monitoring/models.py
index 84964d5..667b523 100644
--- a/Watcher/Watcher/site_monitoring/models.py
+++ b/Watcher/Watcher/site_monitoring/models.py
@@ -42,6 +42,13 @@ def __str__(self):
         return self.domain_name
 
 
+@receiver(pre_save, sender=Site)
+def set_rtir(sender, instance, **kwargs):
+    if instance.rtir is None:
+        last_site = Site.objects.order_by('-rtir').first()
+        instance.rtir = 1 if not last_site else last_site.rtir + 1
+
+
 class Alert(models.Model):
     """
     Triggered when there is a site status change.