Merge pull request #179 from rambo/issue-25

Implement "since" to addrecurring management command

Author: rambo

project/asylum/utils.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import calendar
+import datetime
 import importlib
 import random
 
@@ -26,3 +28,19 @@ def get_random_objects(klass, num=1):
         random_index = random.randint(0, count - 1)
         ret.append(klass.objects.all()[random_index])
     return ret
+
+
+# Adapted from http://www.ianlewis.org/en/python-date-range-iterator
+def months(from_date=None, to_date=None):
+    from_date = from_date or datetime.datetime.now().date()
+    while to_date is None or from_date <= to_date:
+        yield from_date
+        from_date = from_date + datetime.timedelta(days=calendar.monthrange(from_date.year, from_date.month)[1])
+    return
+
+
+def datetime_proxy(delta=datetime.timedelta(days=1)):
+    """Used by management commands needing datetime X days ago"""
+    now_yesterday = datetime.datetime.now() - delta
+    start_yesterday = datetime.datetime.combine(now_yesterday.date(), datetime.datetime.min.time())
+    return start_yesterday.isoformat()

project/creditor/management/commands/addrecurring.py

@@ -1,14 +1,33 @@
 # -*- coding: utf-8 -*-
+import datetime
+import itertools
+
+import dateutil.parser
 from creditor.models import RecurringTransaction
 from django.core.management.base import BaseCommand, CommandError
+from django.utils import timezone
+
+from asylum.utils import datetime_proxy, months
 
 
 class Command(BaseCommand):
     help = 'Gets all RecurringTransactions and runs conditional_add_transaction()'
 
+    def add_arguments(self, parser):
+        parser.add_argument('since', type=str, nargs='?', default=datetime_proxy(), help='Run for each month since the date, defaults to yesterday midnight')
+
     def handle(self, *args, **options):
+        since_parsed = timezone.make_aware(dateutil.parser.parse(options['since']))
+        if options['verbosity'] > 2:
+            print("Processing since %s" % since_parsed.isoformat())
+
         for t in RecurringTransaction.objects.all():
-            ret = t.conditional_add_transaction()
-            if ret:
-                if options['verbosity'] > 1:
-                    print("Created transaction %s" % ret)
+            if options['verbosity'] > 2:
+                print("Processing: %s" % t)
+            for month in months(since_parsed, timezone.now()):
+                if options['verbosity'] > 2:
+                    print("  month %s" % month.isoformat())
+                ret = t.conditional_add_transaction(month)
+                if ret:
+                    if options['verbosity'] > 1:
+                        print("Created transaction %s" % ret)

project/holviapp/management/commands/import_holvidata.py

@@ -4,22 +4,19 @@
 
 import dateutil.parser
 from django.core.management.base import BaseCommand, CommandError
+from django.utils import timezone
 from holviapp.importer import HolviImporter
 from holviapp.utils import list_invoices, list_orders
 
-
-def yesterday_proxy():
-    now_yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
-    start_yesterday = datetime.datetime.combine(now_yesterday.date(), datetime.datetime.min.time())
-    return start_yesterday.isoformat()
+from asylum.utils import datetime_proxy
 
 
 class Command(BaseCommand):
     help = 'Import transaction data from Holvi API'
 
     def add_arguments(self, parser):
         parser.add_argument('--all', action='store_true', help='Import all Holvi transactions (WARNING: this may take forever)')
-        parser.add_argument('since', type=str, nargs='?', default=yesterday_proxy(), help='Import transactions updated since datetime, defaults to yesterday midnight')
+        parser.add_argument('since', type=str, nargs='?', default=datetime_proxy(), help='Import transactions updated since datetime, defaults to yesterday midnight')
 
     def handle(self, *args, **options):
         if (not options['since']
@@ -28,7 +25,7 @@ def handle(self, *args, **options):
         invoice_filters = {}
         order_filters = {}
         if not options.get('all', False):
-            since_parsed = dateutil.parser.parse(options['since'])
+            since_parsed = timezone.make_aware(dateutil.parser.parse(options['since']))
             if options['verbosity'] > 1:
                 print("Importing since %s" % since_parsed.isoformat())
             invoice_filters['update_time_from'] = since_parsed.isoformat()