Merge branch 'develop'

Author: portbusy

moneyTrackerBot DockerfilemoneyTrackerBot renamed to Dockerfile

@@ -1,4 +1,18 @@
 # Description
+This is the first version of my telegram bot which allows a simple expenses tracker.
 
-## Installtion
-* First create the `master.txt`  and `token.txt` files, filled respectively with your master chat id and telegram bot token 
+The bot can now take income and outcome and display the current month resume; here is a list of commands:
+* `/listoutcome` print the list of current month outcome
+* `/listincome` print the list of current month income
+* `/delete +/-<income/outcome amount> <comment>` delete the specified entry
+* `/balance` print total income, total outcome and the difference between those 2 (aka balance)
+* `+<income amount> <comment>` add to the income table the amount and the comment associated
+* `-<outcome amount> <comment>` add to the outcome table the amount and the comment associated
+
+## Installation
+* First create the `master.txt`  and `token.txt` files, filled respectively with your master chat id 
+    and telegram bot token
+* `Install docker`
+* Go into the clone folder and run `docker build moneytrakerBot/`
+* Copy the container id
+* Run `docker run <container id>`

README.md

@@ -7,11 +7,6 @@
 logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG)
 
 db = DBHelper()
-f = open("master.txt", "r")
-master = int(f.readline())
-if not master:
-    logging.error("Error occurred, have you filled the master.txt file with your master id?")
-    exit()
 
 
 handler = MessageHandler()
@@ -29,7 +24,8 @@
 # i found those code here https://apps.timwhitlock.info/emoji/tables/unicode :)
 emoji = {
     "moneybag": u'\U0001F4B0',
-    "moneywings": u'\U0001F4B8'
+    "moneywings": u'\U0001F4B8',
+    "openhands": u'\U0001F450'
 }
 
 
@@ -70,16 +66,37 @@ def text_handler(text, chat_id):
         month = datetime.now().strftime("%m")
         rows = db.get_income(month)
         logging.info(rows)
-        message = "Current month income list:\n\n"
-        for r in rows:
-            message = message + str(r).replace("(", "").replace(")", "").replace("'", "") + "\n"
+        if rows:
+            message = "Current month income list:\n\n"
+            for r in rows:
+                message = message + str(r).replace("(", "").replace(")", "").replace("'", "") + "\n"
+            total_income = db.get_total_income(month)
+            message = message+"\n\nTotal income: "+str(total_income)+" €"
+        else:
+            message = "No income to be displayed here " + emoji["openhands"]
     elif text == "/listoutcome":
         month = datetime.now().strftime("%m")
         rows = db.get_outcome(month)
         logging.info(rows)
-        message = "Current month outcome list:\n\n"
-        for r in rows:
-            message = message+str(r).replace("(", "").replace(")", "").replace("'", "")+"\n"
+        if rows:
+            message = "Current month outcome list:\n\n"
+            for r in rows:
+                message = message+str(r).replace("(", "").replace(")", "").replace("'", "")+"\n"
+            total_outcome = db.get_total_income(month)
+            message = message+"\n\nTotal income: "+str(total_outcome)+" €"
+        else:
+            message = "No income to be displayed here " + emoji["openhands"]
+    elif text == "/balance":
+        month = datetime.now().strftime("%m")
+        total_income = db.get_total_income(month)
+        if total_income is None:
+            total_income = 0.0
+        total_outcome = db.get_total_outcome(month)
+        if total_outcome is None:
+            total_outcome = 0.0
+        logging.info(total_outcome)
+        balance = total_income + total_outcome
+        message = "Current month balance: "+str(balance)+" €\n\n\nTotal income: "+str(total_income)+" €\n\nTotal outcome: "+str(total_outcome)+" €"
     handler.send_message(message, chat_id)
 
 

__pycache__/dbHelper.cpython-37.pyc

@@ -44,9 +44,24 @@ def get_income(self, month):
         rows = cur.fetchall()
         return rows
 
+    def get_total_income(self, month):
+        cur = self.conn.cursor()
+        stmt = "SELECT SUM(value) FROM income WHERE strftime('%m', date) = '" + month + "'"
+        cur.execute(stmt)
+        total = cur.fetchone()
+        return total[0]
+
     def get_outcome(self, month):
         cur = self.conn.cursor()
         stmt = "SELECT * FROM outcome WHERE strftime('%m', date) = '"+month+"'"
         cur.execute(stmt)
         rows = cur.fetchall()
         return rows
+
+    def get_total_outcome(self, month):
+        cur = self.conn.cursor()
+        stmt = "SELECT SUM(value) FROM outcome WHERE strftime('%m', date) = '" + month + "'"
+        cur.execute(stmt)
+        total = cur.fetchone()
+        return total[0]
+

__pycache__/messageHandler.cpython-37.pyc

@@ -12,19 +12,30 @@
 if not TOKEN:
     logging.error("Error occurred, have you filled the token.txt file with your bot token?")
     exit()
+
 URL = "https://api.telegram.org/bot{}/".format(TOKEN)
 
+f = open("master.txt", "r")
+master = int(f.readline())
+if not master:
+    logging.error("Error occurred, have you filled the master.txt file with your master id?")
+    exit()
+
 
 class MessageHandler:
 
     def __init__(self):
-        self.master = 58677785
+        self.master = master
         self.allowed = [self.master]
 
     #
     def get_url(self, url):
-        response = requests.get(url)
-        content = response.content.decode("utf8")
+        try:
+            response = requests.get(url)
+            content = response.content.decode("utf8")
+        except requests.exceptions.ConnectionError:
+            logging.info("Max retries exceed")
+            content = ""
         return content
 
     #

bot.py

@@ -1,5 +1,2 @@
-sqlite3
-logging
-datetime
 requests==2.22.0
 urllib3==1.24.2