PFS

record/model.py

@@ -307,7 +307,7 @@ def __init__(self, **kwargs):
         # We creating a new Deposit, the depositid is not known (db autoincrement)
         self.depositid = kwargs.get('depositid', 0)
         self.date = kwargs.get('date', date.today().isoformat())
-        self.username = kwargs.get('username', '')
+        self.username = None # backwards comptability for unit tests
         self.amount = int(kwargs.get('amount'))
         self.method = kwargs.get('method', '')
         self.vsk = kwargs.get('vsk', 0.0)  # percentage
@@ -326,8 +326,8 @@ def invoice(self):
         return "INVLOK" + str(self.depositid).zfill(5)
 
     def mkinvoice(self):
-        fields = [("account", self.username),
-                  ("date", self.date),
+        fields = [("date", self.date),
+                  # ("account", self.username),  # Sorry, PFS! 
                   ("number", self.invoice),
                   ("method", self.method),
                   ("amount", str(self.amount) + " ISK"),
@@ -366,8 +366,8 @@ def new(cls, username, amount, method, **kwargs):
         if not user:
             raise ValueError("Unknown username: {0}".format(username))
         # depositid not known until saved
-        newdep = cls(amount=amount, username=username, method=method, vsk=vsk,
-                     date=_date, fees=fees)
+        newdep = cls(amount=amount, method=method, vsk=vsk, date=_date,
+                     fees=fees)
         newdep.save()
         if deposit:
             user.deposit(amount)
@@ -380,7 +380,7 @@ def new(cls, username, amount, method, **kwargs):
     def get(cls, depositid):
         row = DB.get().select_deposit(depositid)
 
-        return cls(depositid=row[0], invoice=row[1], date=row[2], username=row[3],
+        return cls(depositid=row[0], invoice=row[1], date=row[2], 
                    amount=row[4], method=row[5], vsk=row[6], fees=row[7])
 
 

test/test_model.py

@@ -380,6 +380,16 @@ def test_valid_user_deposit(self):
         model.Deposit.new("validuser", 2000, "testdeposit")
         self.assertEquals(old_credit_isk + 2000, model.User.get("validuser").credit_isk)
 
+    def test_deposit_does_not_reference_username(self):
+        # the test above checks that the user actually gets their money
+        user = model.User.get("validuser")
+        dep = model.Deposit.new(user.username, 2000, "testdeposit")
+        # now lets check the deposit does map to a user
+        dep2 = model.Deposit.get(dep.depositid)
+        self.assertTrue(dep2.username != user.username)
+        self.assertTrue(dep2.username == None)
+
+
     def test_rowid_autoincrement(self):
         dep1 = model.Deposit.new("validuser", 1000, "testdeposit")
         dep2 = model.Deposit.new("validuser", 1000, "testdeposit")