litteralis: accept tz-aware datetimes (#87415)

passerelle/apps/litteralis/models.py

@@ -22,7 +22,7 @@ import urllib
 import requests
 from django.db import models
 from django.utils import dateparse
-from django.utils.timezone import make_aware
+from django.utils.timezone import is_naive, make_aware
 from django.utils.translation import gettext_lazy as _
 
 from passerelle.base.models import BaseResource, HTTPResource
@@ -127,7 +127,10 @@ class Litteralis(BaseResource, HTTPResource):
             for k, v in data.items():
                 if v:
                     if k.startswith('date'):
-                        res[k] = make_aware(parse_datetime(v)).isoformat()
+                        datetime = parse_datetime(v)
+                        if is_naive(datetime):
+                            datetime = make_aware(datetime, is_dst=False)
+                        res[k] = datetime.isoformat()
                     else:
                         cleaned_payload = clean_payload(v)
                         if cleaned_payload:

passerelle/contrib/toulouse_smart/utils.py

@@ -15,11 +15,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.utils.dateparse import parse_datetime
-from django.utils.timezone import localtime, make_aware, make_naive, utc
+from django.utils.timezone import is_aware, localtime, make_aware, make_naive, utc
 
 
 def localtz_to_utc(date_time_string):
-    aware_dt_in_utc = make_aware(parse_datetime(date_time_string), is_dst=False).astimezone(utc)
+    datetime = parse_datetime(date_time_string)
+    if not is_aware(datetime):
+        datetime = make_aware(datetime, is_dst=False)
+    aware_dt_in_utc = datetime.astimezone(utc)
     return aware_dt_in_utc.isoformat()
 
 

tests/test_toulouse_smart.py

@@ -333,8 +333,8 @@ CREATE_INTERVENTION_PAYLOAD_EXTRA = {
     'lat': 48.833708,
     'lon': 2.323349,
     'cityId': '12345',
-    'interventionCreated': '2021-06-30T18:08:05',
-    'interventionDesired': '2021-06-30T18:08:05',
+    'interventionCreated': '2021-06-30T18:08:05.500931+02:00',
+    'interventionDesired': '2021-06-30T18:08:05.500931+02:00',
     'submitterFirstName': 'John',
     'submitterLastName': 'Doe',
     'submitterMail': 'john.doe@example.com',
@@ -374,8 +374,8 @@ CREATE_INTERVENTION_QUERY = {
     'add_media_url': 'http://testserver/toulouse-smart/test/add-media?uuid=%s' % str(UUID),
     'description': 'coin coin',
     'cityId': '12345',
-    'interventionCreated': '2021-06-30T16:08:05+00:00',
-    'interventionDesired': '2021-06-30T16:08:05+00:00',
+    'interventionCreated': '2021-06-30T16:08:05.500931+00:00',
+    'interventionDesired': '2021-06-30T16:08:05.500931+00:00',
     'submitterFirstName': 'John',
     'submitterLastName': 'Doe',
     'submitterMail': 'john.doe@example.com',