Changeset 1522 for pykota/trunk/pykota

Timestamp:

06/06/04 00:03:50 (20 years ago)

Author:

jalet

Message:

Payments history is now stored in database

Location:

pykota/trunk/pykota

Files:

• storage.py (modified) (3 diffs)
• storages/ldapstorage.py (modified) (5 diffs)
• storages/sql.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.54  2004/06/05 22:03:49  jalet
+# Payments history is now stored in database
+#
 # Revision 1.53  2004/06/03 23:14:10  jalet
 # Now stores the job's size in bytes in the database.
@@ -230 +233 @@
         self.LifeTimePaid = None
         self.Email = None
+        self.Payments = [] # TODO : maybe handle this smartly for SQL, for now just don't retrieve them
         
     def consumeAccountBalance(self, amount) :     
@@ -238 +242 @@
     def setAccountBalance(self, balance, lifetimepaid) :    
         """Sets the user's account balance in case he pays more money."""
-        self.parent.writeUserAccountBalance(self, balance, lifetimepaid)
-        self.AccountBalance = balance
-        self.LifeTimePaid = lifetimepaid
+        diff = float(lifetimepaid or 0.0) - float(self.LifeTimePaid or 0.0)
+        self.parent.beginTransaction()
+        try :
+            self.parent.writeUserAccountBalance(self, balance, lifetimepaid)
+            self.parent.writeNewPayment(self, diff)
+        except PyKotaStorageError, msg :    
+            self.parent.rollbackTransaction()
+            raise PyKotaStorageError, msg
+        else :    
+            self.parent.commitTransaction()
+            self.AccountBalance = balance
+            self.LifeTimePaid = lifetimepaid
         
     def setLimitBy(self, limitby) :    

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.68  2004/06/05 22:03:50  jalet
+# Payments history is now stored in database
+#
 # Revision 1.67  2004/06/03 23:14:10  jalet
 # Now stores the job's size in bytes in the database.
@@ -257 +260 @@
 import time
 import md5
+from mx import DateTime
 
 from pykota.storage import PyKotaStorageError,BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota
@@ -477 +481 @@
             if user.LimitBy is not None :
                 user.LimitBy = user.LimitBy[0]
-            result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["balancerdn"], username), ["pykotaBalance", "pykotaLifeTimePaid"], base=self.info["balancebase"])
+            result = self.doSearch("(&(objectClass=pykotaAccountBalance)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["balancerdn"], username), ["pykotaBalance", "pykotaLifeTimePaid", "pykotaPayments"], base=self.info["balancebase"])
             if result :
                 fields = result[0][1]
@@ -495 +499 @@
                         user.LifeTimePaid = float(user.LifeTimePaid[0])
                 user.LifeTimePaid = user.LifeTimePaid or 0.0        
+                user.Payments = []
+                for payment in fields.get("pykotaPayments", []) :
+                    (date, amount) = payment.split(" # ")
+                    user.Payments.append((date, amount))
             user.Exists = 1
         return user
@@ -944 +952 @@
         return self.doModify(user.idbalance, fields)         
             
+    def writeNewPayment(self, user, amount) :        
+        """Adds a new payment to the payments history."""
+        payments = []
+        for payment in user.Payments :
+            payments.append("%s # %s" % (payment[0], str(payment[1])))
+        payments.append("%s # %s" % (str(DateTime.now()), str(amount)))
+        fields = {
+                   "pykotaPayments" : payments,
+                 }
+        return self.doModify(user.idbalance, fields)         
+        
     def writeLastJobSize(self, lastjob, jobsize, jobprice) :        
         """Sets the last job's size permanently."""

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.41  2004/06/05 22:03:50  jalet
+# Payments history is now stored in database
+#
 # Revision 1.40  2004/06/03 23:14:11  jalet
 # Now stores the job's size in bytes in the database.
@@ -342 +345 @@
             self.doModify("UPDATE users SET balance=%s WHERE id=%s" % (self.doQuote(newbalance), self.doQuote(user.ident)))
             
+    def writeNewPayment(self, user, amount) :        
+        """Adds a new payment to the payments history."""
+        self.doModify("INSERT INTO payments (userid, amount) VALUES (%s, %s)" % (self.doQuote(user.ident), self.doQuote(amount)))
+        
     def writeLastJobSize(self, lastjob, jobsize, jobprice) :        
         """Sets the last job's size permanently."""

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha17_unofficial"
+__version__ = "1.19alpha18_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""