From 9ff7992faec2bccb5fe994767ada4ca901d541e1 Mon Sep 17 00:00:00 2001
From: Eduardo Alonso <eduardo.alonso@quasarsr.com>
Date: Tue, 30 Jan 2024 12:04:32 +0100
Subject: [PATCH] net: Make datetime objects timezone aware

According to Django docs (https://django.readthedocs.io/en/stable/topics/i18n/timezones.html) this is the correct way to convert them.
---
 net/models.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/net/models.py b/net/models.py
index 6f955b53c..34b2b8ca5 100644
--- a/net/models.py
+++ b/net/models.py
@@ -1,7 +1,6 @@
 from __future__ import print_function
 from __future__ import absolute_import
 import os
-from datetime import datetime
 import itertools
 
 from urllib.request import urlopen
@@ -11,6 +10,7 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.urls import reverse
+from django.utils import timezone
 
 from astrometry.net import settings
 from astrometry.net.settings import *
@@ -182,7 +182,7 @@ class ProcessSubmissions(models.Model):
     # jobs
 
     def set_watchdog(self):
-        self.watchdog = datetime.now()
+        self.watchdog = timezone.now()
 
     def count_queued_subs(self):
         return self.subs.filter(finished=False,
@@ -201,7 +201,7 @@ def count_running_jobs(self):
                                 job__start_time__isnull=False).count()
 
     def watchdog_ago(self):
-        return datetime.now() - self.watchdog
+        return timezone.now() - self.watchdog
     def watchdog_sec_ago(self):
         dt = self.watchdog_ago()
         sec = dtsec(dt)
@@ -219,7 +219,7 @@ def get_time_string(self, t):
         if t is None:
             return '-'
         t = t.replace(microsecond=0)
-        return t.isoformat() + ' (%i sec ago)' % dtsec(datetime.now() - t)
+        return t.isoformat() + ' (%i sec ago)' % dtsec(timezone.now() - t)
 
 class QueuedSubmission(QueuedThing):
     procsub = models.ForeignKey('ProcessSubmissions', models.CASCADE, related_name='subs')
@@ -826,13 +826,13 @@ def __str__(self):
         return s
 
     def set_queued_time(self):
-        self.queued_time = datetime.now()
+        self.queued_time = timezone.now()
 
     def set_start_time(self):
-        self.start_time = datetime.now()
+        self.start_time = timezone.now()
 
     def set_end_time(self):
-        self.end_time = datetime.now()
+        self.end_time = timezone.now()
 
     def OLD_get_dir(self):
         if self.id < 10000:
@@ -1245,9 +1245,9 @@ def get_scale_bounds(self):
             return None
 
     def set_processing_started(self):
-        self.processing_started = datetime.now()
+        self.processing_started = timezone.now()
     def set_processing_finished(self):
-        self.processing_finished = datetime.now()
+        self.processing_finished = timezone.now()
 
     def save(self, *args, **kwargs):
         pro = get_user_profile(self.user)
@@ -1270,7 +1270,7 @@ def save(self, *args, **kwargs):
         #logmsg('saving submission: license id = %d' % self.license.id)
         #logmsg('saving submission: commentreceiver id = %d' % self.comment_receiver.id)
 
-        now = datetime.now()
+        now = timezone.now()
         return super(Submission, self).save(*args, **kwargs)