Преглед изворни кода

Funcion de frequencia vieja removida, actualizada la funcion send_report_now

Tomás Ponce Gessi пре 3 година
родитељ
комит
73bdabf1c8
1 измењених фајлова са 2 додато и 6 уклоњено
  1. 2 6
      app/api/models.py

+ 2 - 6
app/api/models.py

@@ -32,11 +32,6 @@ class ProgrammedReport(models.Model):
     notified_emails = models.JSONField(
         validators=[json_not_empty_string_array, json_email_array])
 
-    @property
-    def timestamp_freq(self) -> timezone.timedelta:
-        return CALENDAR_FREQUENCIES.get(self.frequency) if self.frequency in CALENDAR_FREQUENCIES else timezone.timedelta(seconds=int(self.frequency))
-
-
     # Actualiza la due_date en cada save del modelo.
     def save(self, *args, **kwargs):
         base_date = self.last_report_date if self.last_report_date is not None else self.start_report_date
@@ -77,7 +72,8 @@ class ProgrammedReport(models.Model):
     def send_report_now(self):
         # Calculamos el formato en el que Clima requiere recibir los rangos.
         end_date = timezone.datetime.now()
-        start_date = end_date - self.timestamp_freq
+        start_date = (self.last_report_date if self.last_report_date is not None else self.start_report_date).strftime(
+            "%d/%m/%Y %H:%M")
 
         end_date = end_date.strftime("%d/%m/%Y %H:%M")
         start_date = start_date.strftime("%d/%m/%Y %H:%M")