entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

toulouse_smart: accept tz-aware datetimes (#87415)
gitea/passerelle/pipeline/head This commit looks good Details

This commit is contained in:
Frédéric Péters 2024-02-23 15:30:13 +01:00
parent c9001cdda4
commit 51d2b4b314
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
passerelle/contrib/toulouse_smart/utils.py
View File

@ -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()

8
tests/test_toulouse_smart.py
View File

@ -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',