nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix class name 9h

Browse Source
This commit is contained in:
Akira Miyata
2025-01-23 16:11:46 +09:00
parent 8123f04ccc
commit 2840b17038
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rog/services/csv_processor.py
View File

@ -6,6 +6,7 @@ from django.contrib.auth.hashers import make_password
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import transaction from django.db import transaction
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from django.utils import timezone as django_timezone
import csv import csv
from ..models import CustomUser, Team, Member, NewCategory, Entry, NewEvent2 from ..models import CustomUser, Team, Member, NewCategory, Entry, NewEvent2
@ -251,34 +252,26 @@ class EntryCSVProcessor:
entry_date = None entry_date = None
if 'entry_date' in row and row['entry_date']: if 'entry_date' in row and row['entry_date']:
try: try:
# 様々な日付形式に対応 date_formats = ['%Y/%m/%d %H:%M', '%Y/%m/%d', '%Y-%m-%d %H:%M', '%Y-%m-%d']
date_formats = [
'%Y/%m/%d %H:%M',
'%Y/%m/%d',
'%Y-%m-%d %H:%M',
'%Y-%m-%d'
]
for date_format in date_formats: for date_format in date_formats:
try: try:
entry_date = datetime.strptime(row['entry_date'], date_format) naive_date = datetime.strptime(row['entry_date'], date_format)
entry_date = django_timezone.make_aware(naive_date)
break break
except ValueError: except ValueError:
continue continue
if entry_date is None: if entry_date is None:
raise ValueError(f"Could not parse date: {row['entry_date']}") entry_date = event.start_datetime
# タイムゾーン対応
entry_date = timezone.make_aware(entry_date)
except Exception as e: except Exception as e:
print(f"Date parsing error: {str(e)}") print(f"Date parsing error: {str(e)}")
entry_date = event.start_datetime entry_date = event.start_datetime
else: else:
entry_date = event.start_datetime entry_date = event.start_datetime
if entry_date is None: if entry_date is None:
raise ValueError("Could not determine entry date") raise ValueError("Could not determine entry date")
print(f'エントリー日付：{entry_date}') print(f'エントリー日付：{entry_date}')