The big refactor.

1 files changed, 5 insertions, 8 deletions

diff --git a/talerbank/app/models.py b/talerbank/app/models.py
index 2c4d44d..1b84fe9 100644
--- a/talerbank/app/models.py
+++ b/talerbank/app/models.py
@@ -13,6 +13,7 @@
 #  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 #
 #  @author Marcello Stanisci
+#  @author Florian Dold
 
 from __future__ import unicode_literals
 from django.contrib.auth.models import User
@@ -27,14 +28,10 @@ class BankAccount(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
 
 
-class History(models.Model):
+class BankTransaction(models.Model):
     amount = models.FloatField(default=0)
     currency = models.CharField(max_length=12)
-    direction = models.CharField(max_length=4)
-    counterpart = models.ForeignKey(BankAccount,
-                                    on_delete=models.CASCADE,
-				    related_name="counterpart_account")
-    subject = models.CharField(default="not given", max_length=200)
+    debit_account = models.ForeignKey(BankAccount, on_delete=models.CASCADE, related_name="debit_account")
+    credit_account = models.ForeignKey(BankAccount, on_delete=models.CASCADE, related_name="credit_account")
+    subject = models.CharField(default="(no subject given)", max_length=200)
     date = models.DateTimeField(auto_now=True)
-    account = models.ForeignKey(BankAccount, on_delete=models.CASCADE)
-    # NOTE: by default, UTC timezone is used.