Add fields to ImportFile

Author: simhnna

silverstrike/forms.py

@@ -8,7 +8,7 @@
 class ImportUploadForm(forms.ModelForm):
     class Meta:
         model = models.ImportFile
-        fields = ['file']
+        fields = ['file', 'account', 'importer']
     account = forms.ModelChoiceField(queryset=models.Account.objects.personal().active())
     importer = forms.ChoiceField(choices=enumerate(importers.IMPORTER_NAMES))
 

silverstrike/migrations/0010_auto_20210107_1550.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.1.5 on 2021-01-07 15:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('silverstrike', '0009_auto_20190204_1925'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='importfile',
+            name='account',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='silverstrike.account'),
+        ),
+        migrations.AddField(
+            model_name='importfile',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='importfile',
+            name='importer',
+            field=models.PositiveIntegerField(null=True),
+        ),
+    ]

silverstrike/models.py

@@ -292,6 +292,9 @@ class Budget(models.Model):
 class ImportFile(models.Model):
     uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     file = models.FileField(upload_to='imports')
+    created_at = models.DateTimeField(auto_now_add=True)
+    account = models.ForeignKey(Account, models.SET_NULL, null=True)
+    importer = models.PositiveIntegerField(null=True)
 
 
 class RecurringTransactionManager(models.Manager):

silverstrike/urls.py

@@ -130,7 +130,7 @@
 
     path('import/', import_views.ImportView.as_view(), name='import'),
     path('import/upload/', import_views.ImportUploadView.as_view(), name='import_upload'),
-    path('import/process/<uuid:uuid>/<int:account>/<int:importer>/',
+    path('import/process/<uuid:uuid>/',
          import_views.ImportProcessView.as_view(), name='import_process'),
 
     path('import/firefly/', import_views.ImportFireflyView.as_view(), name='import_firefly'),

silverstrike/views/imports.py

@@ -39,10 +39,8 @@ class ImportUploadView(LoginRequiredMixin, generic.edit.CreateView):
 
     def form_valid(self, form):
         self.object = form.save()
-        account = form.cleaned_data['account']
-        importer = form.cleaned_data['importer']
         return HttpResponseRedirect(
-            reverse('import_process', args=[self.object.pk, account.pk, importer]))
+            reverse('import_process', args=[self.object.pk]))
 
 
 class ImportProcessView(LoginRequiredMixin, generic.TemplateView):
@@ -51,7 +49,7 @@ class ImportProcessView(LoginRequiredMixin, generic.TemplateView):
     def get_context_data(self, **kwargs):
         context = super(ImportProcessView, self).get_context_data(**kwargs)
         file = models.ImportFile.objects.get(uuid=self.kwargs['uuid'])
-        importer = self.kwargs['importer']
+        importer = file.importer
         iban_accounts = dict()
         names = dict()
         for a in models.Account.objects.all():
@@ -102,7 +100,7 @@ def get_context_data(self, **kwargs):
 
     def post(self, request, *args, **kwargs):
         file = models.ImportFile.objects.get(uuid=self.kwargs['uuid'])
-        importer = self.kwargs['importer']
+        importer = file.importer
         data = importers.IMPORTERS[importer].import_transactions(file.file.path)
         for i in range(len(data)):
             title = request.POST.get('title-{}'.format(i), '')
@@ -127,19 +125,19 @@ def post(self, request, *args, **kwargs):
             if account.account_type == models.Account.AccountType.PERSONAL:
                 transaction.transaction_type = models.Transaction.TRANSFER
                 if amount < 0:
-                    transaction.src_id = self.kwargs['account']
+                    transaction.src_id = file.account_id
                     transaction.dst = account
                 else:
                     transaction.src = account
-                    transaction.dst_id = self.kwargs['account']
+                    transaction.dst_id = file.account_id
             elif account.account_type == models.Account.AccountType.FOREIGN:
                 if amount < 0:
                     transaction.transaction_type = models.Transaction.WITHDRAW
-                    transaction.src_id = self.kwargs['account']
+                    transaction.src_id = file.account_id
                     transaction.dst = account
                 else:
                     transaction.transaction_type = models.Transaction.DEPOSIT
-                    transaction.dst_id = self.kwargs['account']
+                    transaction.dst_id = file.account_id
                     transaction.src = account
             transaction.title = title
             transaction.date = date
@@ -154,7 +152,7 @@ def post(self, request, *args, **kwargs):
                 amount=amount,
                 date=book_date,
                 transaction=transaction,
-                account_id=self.kwargs['account'],
+                account_id=file.account_id,
                 opposing_account=account
                 )
             models.Split.objects.create(
@@ -163,7 +161,7 @@ def post(self, request, *args, **kwargs):
                 date=date,
                 transaction=transaction,
                 account=account,
-                opposing_account_id=self.kwargs['account']
+                opposing_account_id=file.account_id
                 )
         return HttpResponseRedirect('/')