Skip to content

Commit f6e1d98

Browse files
committed
Move the datetime proxy to utils
Also use TZ aware datetimes
1 parent 72e5b32 commit f6e1d98

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

project/holviapp/management/commands/import_holvidata.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@
44

55
import dateutil.parser
66
from django.core.management.base import BaseCommand, CommandError
7+
from django.utils import timezone
78
from holviapp.importer import HolviImporter
89
from holviapp.utils import list_invoices, list_orders
910

10-
11-
def yesterday_proxy():
12-
now_yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
13-
start_yesterday = datetime.datetime.combine(now_yesterday.date(), datetime.datetime.min.time())
14-
return start_yesterday.isoformat()
11+
from asylum.utils import datetime_proxy
1512

1613

1714
class Command(BaseCommand):
1815
help = 'Import transaction data from Holvi API'
1916

2017
def add_arguments(self, parser):
2118
parser.add_argument('--all', action='store_true', help='Import all Holvi transactions (WARNING: this may take forever)')
22-
parser.add_argument('since', type=str, nargs='?', default=yesterday_proxy(), help='Import transactions updated since datetime, defaults to yesterday midnight')
19+
parser.add_argument('since', type=str, nargs='?', default=datetime_proxy(), help='Import transactions updated since datetime, defaults to yesterday midnight')
2320

2421
def handle(self, *args, **options):
2522
if (not options['since']
@@ -28,7 +25,7 @@ def handle(self, *args, **options):
2825
invoice_filters = {}
2926
order_filters = {}
3027
if not options.get('all', False):
31-
since_parsed = dateutil.parser.parse(options['since'])
28+
since_parsed = timezone.make_aware(dateutil.parser.parse(options['since']))
3229
if options['verbosity'] > 1:
3330
print("Importing since %s" % since_parsed.isoformat())
3431
invoice_filters['update_time_from'] = since_parsed.isoformat()

0 commit comments

Comments
 (0)