Merge pull request #4 from esecules/esecules-feature2

No repeat transactions when updating transaction list with new items

Author: esecules

src/groupsplit.py

@@ -6,6 +6,7 @@
 import pickle
 import pprint
 import urllib
+import hashlib
 import logging
 import optparse
 import requests
@@ -45,6 +46,11 @@ def split(total, num_people):
     " something doesnt add up here: %d * %d + %d != %d" %(base, num_people, extra, total)
     return base, extra
 
+def do_hash(msg):
+    m = hashlib.md5()
+    m.update(msg)
+    return m.hexdigest()
+
 class Splitwise:
     def __init__(self, api_client='oauth_client.pkl'):
         if os.path.isfile(api_client):
@@ -132,8 +138,12 @@ def post_expense(self, uri):
     def delete_expense(self, expense_id):
         return self.api_call("https://secure.splitwise.com/api/v3.0/delete_expense/%s" % expense_id, 'POST')
 
-    def get_expenses(self, limit=0):
-        resp = self.api_call("https://secure.splitwise.com/api/v3.0/get_expenses?limit=%s" % limit, 'GET')
+    def get_expenses(self, after_date="", limit=0, allow_deleted=True):
+        params = {'limit': limit, "updated_after": after_date}
+        paramsStr = urllib.urlencode(params)
+        resp = self.api_call("https://secure.splitwise.com/api/v3.0/get_expenses?%s" % (paramsStr), 'GET')
+        if not allow_deleted:
+            resp['expenses'] = [exp for exp in resp['expenses'] if exp['deleted_at'] is None]
         return resp['expenses']
 
 class CsvSettings():
@@ -145,6 +155,7 @@ def __init__(self, rows):
         self.amount_col = input("Which column has the amount?")
         self.desc_col = input("Which column has the description?")
         self.has_title_row = raw_input("Does first row have titles? [Y/n]").lower() != 'n'
+        self.newest_transaction = ''
         while True:
             try:
                 self.local_currency = raw_input("What currency were these transactions made in?").upper()
@@ -155,11 +166,19 @@ def __init__(self, rows):
             else:
                 break
         self.remember = raw_input("Remember these settings? [Y/n]").lower() != 'n'
-    
+
+    def __del__(self):
         if self.remember:
             with open("csv_settings.pkl", "wb") as pkl:
                 pickle.dump(self, pkl)
 
+    def record_newest_transaction(self, rows):
+        if self.has_title_row:
+            self.newest_transaction = do_hash(str(rows[1]))
+        else:
+            self.newest_transaction = do_hash(str(rows[0]))
+
+                
 class SplitGenerator():
     def __init__(self, options, args, api):
         csv_file = args[0]
@@ -176,20 +195,26 @@ def __init__(self, options, args, api):
                 self.csv = pickle.load(f)
         else:
             self.csv = CsvSettings(self.rows)
-    
+        
         if self.csv.has_title_row:
             self.rows = self.rows[1:]
 
         self.make_transactions()
+        self.csv.record_newest_transaction(self.rows)
         self.get_group(group_name)
         self.splits = []
         self.ask_for_splits()
 
     def make_transactions(self):
-        self.transactions = [{"date": datetime.strftime(datetime.strptime(r[self.csv.date_col], "%m/%d/%y"), "%Y-%m-%dT%H:%M:%SZ"),
-                              "amount": -1 * Money(r[self.csv.amount_col], self.csv.local_currency),
-                              "desc": re.sub('\s+',' ', r[self.csv.desc_col])}
-                             for r in self.rows if float(r[self.csv.amount_col]) < 0]
+        self.transactions = []
+        for r in self.rows:
+            if not self.options.try_all and do_hash(str(r)) == self.csv.newest_transaction:
+                break
+            if float(r[self.csv.amount_col]) < 0:
+                self.transactions.append({"date": datetime.strftime(datetime.strptime(r[self.csv.date_col], "%m/%d/%y"), "%Y-%m-%dT%H:%M:%SZ"),
+                                          "amount": -1 * Money(r[self.csv.amount_col], self.csv.local_currency),
+                                          "desc": re.sub('\s+',' ', r[self.csv.desc_col])}
+                )
 
     def get_group(self, name):
         num_found = 0
@@ -249,6 +274,7 @@ def main():
     parser.add_option('-d', '--dryrun', default=False, action='store_true', dest='dryrun', help='prints requests instead of sending them')
     parser.add_option('', '--csv-settings', default='csv_settings.pkl', dest='csv_settings', help='supply different csv_settings object (for testing mostly)')
     parser.add_option('', '--api-client', default='oauth_client.pkl', dest='api_client', help='supply different splitwise api client (for testing mostly)')
+    parser.add_option('-a', '--all', default=False, action='store_true', dest='try_all', help='consider all transactions in csv file no matter whether they were already seen')
     options, args = parser.parse_args()
     logger.setLevel(log_levels[options.verbosity])
     splitwise = Splitwise(options.api_client)

src/server.py

@@ -8,12 +8,15 @@ def shutdown_server():
                 raise RuntimeError('Not running with the Werkzeug Server')
         func()
 
-@app.route('/', defaults={'path': ''})
-@app.route('/<path:path>')
-def authorize( path ):
+@app.route('/')
+def authorize():
         print request.args['oauth_verifier']
         shutdown_server()
         return "Thank you, you can close the tab"
 
+@app.route('/test')
+def test():
+        return "Hello!"
+
 if __name__ == "__main__":
     app.run()

test/csv_settings.pkl

@@ -7,18 +7,22 @@ p2
 I01
 sS'has_title_row'
 p3
-I01
-sS'amount_col'
+I00
+sS'newest_transaction'
 p4
+S'220ef2686a3923ceb06e2596ba8b7c4d'
+p5
+sS'amount_col'
+p6
 I1
 sS'desc_col'
-p5
+p7
 I4
 sS'local_currency'
-p6
+p8
 S'CAD'
-p7
+p9
 sS'date_col'
-p8
+p10
 I0
 sb.

test/oauth_client.pkl.enc

@@ -3,10 +3,24 @@
 import subprocess
 from time import sleep
 class ServerTest(unittest.TestCase):
+  def check_server(self):
+    polls = 0
+    while True:
+      try:
+        resp = requests.get("http://localhost:5000/test")
+      except requests.ConnectionError as e:
+        resp = None
+        pass
+      if resp and resp.text == "Hello!":
+        break
+      if polls > 10:
+        self.fail("could not connect to server")
+      polls += 1
+      sleep(1)    
+
   def test_request(self):
     serverProc = subprocess.Popen(['python', '../src/server.py'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    sleep(1)
-    self.assertEqual(None, serverProc.poll())
+    self.check_server()
     test_data = "1234567890asdf"
     resp = requests.get("http://localhost:5000?oauth_verifier=%s" % test_data)
     assert resp.status_code == 200

test/testServer.py

@@ -1,6 +1,8 @@
 import unittest
 import sys
+import csv
 import subprocess
+from datetime import datetime
 from money import Money
 sys.path.append("../src")
 from groupsplit import split, Splitwise
@@ -31,21 +33,46 @@ def test_get_groups(self):
         self.assertGreater(len(self.api.get_groups()), 0)
 
 class SystemTests(unittest.TestCase):
-    def __del__(self):
-        api = Splitwise()
-        for expense in api.get_expenses():
-            api.delete_expense(expense['id'])
+    def __init__(self, *args, **kwargs):
+        super(SystemTests, self).__init__(*args, **kwargs)
+        self.api = Splitwise()
+        self.start_date = datetime.strftime(datetime.utcnow(), "%Y-%m-%dT%H:%M:%SZ")
+        with open('transactions.csv', 'rb') as csvfile:
+            reader = csv.reader(csvfile)
+            self.num_expenses = len([x for x in reader if float(x[1]) < 0])
+
+    def tearDown(self):
+        for expense in self.api.get_expenses(allow_deleted=False):
+            assert(expense['created_by']['last_name'] == 'Sample')
+            self.api.delete_expense(expense['id'])
 
+    def verify_num_expenses(self, num=None):
+        if num is None:
+            num = self.num_expenses
+        self.assertEqual(len(self.api.get_expenses(allow_deleted=False,after_date=self.start_date)), num)
+        
     def test_group_of_2(self):
         proc = subprocess.Popen(['python', '../src/groupsplit.py', 'transactions.csv', 'group_of_2',
                                  '--csv-settings=csv_settings.pkl', '--api-client=oauth_client.pkl',
-                                 '-y'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                                 '-ya'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = proc.communicate()
         self.assertEqual(stderr, '')
+        self.verify_num_expenses()
 
     def test_group_of_3(self):
+        proc = subprocess.Popen(['python', '../src/groupsplit.py', 'transactions.csv', 'group_of_3',
+                                 '--csv-settings=csv_settings.pkl', '--api-client=oauth_client.pkl',
+                                 '-ya'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = proc.communicate()
+        self.assertEqual(stderr, '')
+        self.verify_num_expenses()
+
+    def test_no_double_upload(self):
+        self.test_group_of_3()
         proc = subprocess.Popen(['python', '../src/groupsplit.py', 'transactions.csv', 'group_of_3',
                                  '--csv-settings=csv_settings.pkl', '--api-client=oauth_client.pkl',
                                  '-y'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = proc.communicate()
         self.assertEqual(stderr, '')
+        self.verify_num_expenses()
+