From 240abba62428359edc54390c20166366d5a15db9 Mon Sep 17 00:00:00 2001 From: Eddy Harrington Date: Wed, 20 May 2020 18:40:41 -0700 Subject: [PATCH] migrated codebase to SQL Alchemy --- app.py | 53 ++++++++++--------- helpers.py | 21 ++++++++ templates/account.html | 2 +- templates/categories.html | 4 +- templates/expensehistory.html | 2 +- templates/index.html | 4 +- templates/monthlyreport.html | 2 +- templates/spendingreport.html | 4 +- tendie_account.py | 76 +++++++++++++++------------ tendie_budgets.py | 75 ++++++++++++++++----------- tendie_categories.py | 96 +++++++++++++++++++++-------------- tendie_dashboard.py | 77 +++++++++++++++++----------- tendie_expenses.py | 31 ++++++----- tendie_reports.py | 42 ++++++++------- 14 files changed, 295 insertions(+), 194 deletions(-) diff --git a/app.py b/app.py index 0687a25..6377a1a 100644 --- a/app.py +++ b/app.py @@ -2,7 +2,6 @@ import json import requests import copy -import config import calendar import tendie_dashboard import tendie_expenses @@ -11,9 +10,10 @@ import tendie_reports import tendie_account -from cs50 import SQL from flask import Flask, jsonify, redirect, render_template, request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker from tempfile import mkdtemp from werkzeug.exceptions import default_exceptions, HTTPException, InternalServerError from werkzeug.security import check_password_hash, generate_password_hash @@ -24,6 +24,9 @@ # Configure application app = Flask(__name__) +# Set app key +app.secret_key = os.environ.get("SECRET_KEY") + # Ensure templates are auto-reloaded app.config["TEMPLATES_AUTO_RELOAD"] = True @@ -45,9 +48,9 @@ def after_request(response): # Custom filter app.jinja_env.filters["usd"] = usd -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) @app.route("/register", methods=["GET", "POST"]) @@ -59,7 +62,7 @@ def register(): # Query DB for all existing user names and make sure new username isn't already taken username = request.form.get("username").strip() existingUsers = db.execute( - "SELECT username FROM users WHERE LOWER(username) = :username", username=username.lower()) + "SELECT username FROM users WHERE LOWER(username) = :username", {"username": username.lower()}).fetchone() if existingUsers: return render_template("register.html", username=username) @@ -75,12 +78,14 @@ def register(): # Insert user into the database hashedPass = generate_password_hash(password) now = datetime.now().strftime("%m/%d/%Y %H:%M:%S") - newUserID = db.execute("INSERT INTO users (username, hash, registerDate, lastLogin) VALUES (:username, :hashedPass, :registerDate, :lastLogin)", - username=username, hashedPass=hashedPass, registerDate=now, lastLogin=now) + newUserID = db.execute("INSERT INTO users (username, hash, registerDate, lastLogin) VALUES (:username, :hashedPass, :registerDate, :lastLogin) RETURNING id", + {"username": username, "hashedPass": hashedPass, "registerDate": now, "lastLogin": now}).fetchone()[0] + db.commit() # Create default spending categories for user db.execute("INSERT INTO userCategories (category_id, user_id) VALUES (1, :usersID), (2, :usersID), (3, :usersID), (4, :usersID), (5, :usersID), (6, :usersID), (7, :usersID), (8, :usersID)", - usersID=newUserID) + {"usersID": newUserID}) + db.commit() # Auto-login the user after creating their username session["user_id"] = newUserID @@ -113,7 +118,7 @@ def login(): # Query database for username rows = db.execute("SELECT * FROM users WHERE username = :username", - username=request.form.get("username")) + {"username": request.form.get("username")}).fetchall() # Ensure username exists and password is correct if len(rows) != 1 or not check_password_hash(rows[0]["hash"], request.form.get("password")): @@ -125,7 +130,8 @@ def login(): # Record the login time now = datetime.now().strftime("%m/%d/%Y %H:%M:%S") db.execute( - "UPDATE users SET lastLogin = :lastLogin WHERE id = :usersID", lastLogin=now, usersID=session["user_id"]) + "UPDATE users SET lastLogin = :lastLogin WHERE id = :usersID", {"lastLogin": now, "usersID": session["user_id"]}) + db.commit() # Redirect user to home page return redirect("/") @@ -401,9 +407,6 @@ def createbudget(): # Get the users income income = tendie_account.getIncome(session["user_id"]) - # Get the users current budgets - budgets = tendie_budgets.getBudgets(session["user_id"]) - # Get the users total budgeted amount budgeted = tendie_budgets.getTotalBudgeted(session["user_id"]) @@ -667,6 +670,17 @@ def spendingreport(): return render_template("spendingreport.html", spending_trends_chart=spendingReport["chart"], spending_trends_table=spendingReport["table"], categories=spendingReport["categories"]) +@app.route("/payersreport", methods=["GET"]) +@login_required +def payersreport(): + """View payers spending report""" + + # Generate a data structure that combines the users payers and expense data for chart and table + payersReport = tendie_reports.generatePayersReport(session["user_id"]) + + return render_template("payersreport.html", payers=payersReport) + + @app.route("/account", methods=["GET", "POST"]) @login_required def updateaccount(): @@ -795,17 +809,6 @@ def updateaccount(): return render_template("account.html", username=user["name"], income=user["income"], payers=user["payers"], stats=user["stats"], newIncome=None, addPayer=None, renamedPayer=None, deletedPayer=None, updatedPassword=None) -@app.route("/payersreport", methods=["GET"]) -@login_required -def payersreport(): - """View payers spending report""" - - # Generate a data structure that combines the users payers and expense data for chart and table - payersReport = tendie_reports.generatePayersReport(session["user_id"]) - - return render_template("payersreport.html", payers=payersReport) - - # Handle errors by rendering apology def errorhandler(e): """Handle error""" diff --git a/helpers.py b/helpers.py index 40cb580..8b36212 100644 --- a/helpers.py +++ b/helpers.py @@ -1,6 +1,7 @@ import os import requests import urllib.parse +import decimal from flask import redirect, render_template, request, session from functools import wraps @@ -38,3 +39,23 @@ def decorated_function(*args, **kwargs): def usd(value): """Format value as USD.""" return f"${value:,.2f}" + + +# Converts a list of SQL Alchemy RowProxy objects into a list of dictionary objects with the column name as the key (https://github.com/cs50/python-cs50/blob/develop/src/cs50/sql.py#L328) +# Used for SQL SELECT .fetchall() results +def convertSQLToDict(listOfRowProxy): + # Coerce types + rows = [dict(row) for row in listOfRowProxy] + for row in rows: + for column in row: + + # Coerce decimal.Decimal objects to float objects + # https://groups.google.com/d/msg/sqlalchemy/0qXMYJvq8SA/oqtvMD9Uw-kJ + if type(row[column]) is decimal.Decimal: + row[column] = float(row[column]) + + # Coerce memoryview objects (as from PostgreSQL's bytea columns) to bytes + elif type(row[column]) is memoryview: + row[column] = bytes(row[column]) + + return rows diff --git a/templates/account.html b/templates/account.html index 63963d2..b06e8ba 100644 --- a/templates/account.html +++ b/templates/account.html @@ -191,7 +191,7 @@
- +
diff --git a/templates/categories.html b/templates/categories.html index 303e228..414ffc9 100644 --- a/templates/categories.html +++ b/templates/categories.html @@ -129,9 +129,9 @@

Are you sure you want to delete this category?

diff --git a/templates/expensehistory.html b/templates/expensehistory.html index 18e2711..cb7b7d0 100644 --- a/templates/expensehistory.html +++ b/templates/expensehistory.html @@ -49,7 +49,7 @@

Expense History

{% for result in history %} {{ loop.index }} - {{ result["description"] }} + {{ result["description"] }} {{ result["category"] }} {{ result["date"] }} {{ result["payer"] }} diff --git a/templates/index.html b/templates/index.html index c0512d9..b52efd5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -161,7 +161,7 @@

Last 5 Expenses

{{ expense['description'] }} {{ expense['category'] }} - {{ expense['expenseDate'] }} + {{ expense['expensedate'] }} {{ expense['payer'] }} {{ expense['amount'] | usd }} @@ -336,7 +336,7 @@

Payer Spending

{% if spending_trends %} {% endif %} diff --git a/templates/monthlyreport.html b/templates/monthlyreport.html index e13607c..64f810d 100644 --- a/templates/monthlyreport.html +++ b/templates/monthlyreport.html @@ -57,7 +57,7 @@

Last 12 months of spending

{{ loop.index }} {{ record["description"] }} {{ record["category"] }} - {{ record["expenseDate"] }} + {{ record["expensedate"] }} {{ record["payer"] }} {{ record["amount"] | usd}} diff --git a/templates/spendingreport.html b/templates/spendingreport.html index eda9762..36e3215 100644 --- a/templates/spendingreport.html +++ b/templates/spendingreport.html @@ -91,8 +91,8 @@

Total Paid Per Month By Category

{% if spending_trends_chart or spending_trends_table %} {% endif %} diff --git a/tendie_account.py b/tendie_account.py index 36dd4a5..e6b64fb 100644 --- a/tendie_account.py +++ b/tendie_account.py @@ -1,36 +1,38 @@ -import config +import os -from cs50 import SQL from flask import request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker from werkzeug.security import check_password_hash, generate_password_hash +from helpers import convertSQLToDict - -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) # Get the users account name def getUsername(userID): name = db.execute( - "SELECT username FROM users WHERE id = :usersID", usersID=userID) + "SELECT username FROM users WHERE id = :usersID", {"usersID": userID}).fetchone()[0] - return name[0]["username"] + return name # Get the users total income def getIncome(userID): income = db.execute( - "SELECT income FROM users WHERE id = :usersID", usersID=userID) + "SELECT income FROM users WHERE id = :usersID", {"usersID": userID}).fetchone()[0] - return income[0]["income"] + return float(income) # Update the users income def updateIncome(income, userID): rows = db.execute("UPDATE users SET income = :newIncome WHERE id = :usersID", - newIncome=income, usersID=userID) + {"newIncome": income, "usersID": userID}).rowcount + db.commit() # Return an error message if the record could not be updated if rows != 1: @@ -41,8 +43,10 @@ def updateIncome(income, userID): # Get the users payers def getPayers(userID): - payers = db.execute( - "SELECT name FROM payers WHERE user_id = :usersID ORDER BY name ASC", usersID=userID) + results = db.execute( + "SELECT name FROM payers WHERE user_id = :usersID ORDER BY name ASC", {"usersID": userID}).fetchall() + + payers = convertSQLToDict(results) return payers @@ -61,9 +65,11 @@ def addPayer(name, userID): else: # Insert new payer into DB db.execute("INSERT INTO payers (user_id, name) VALUES (:usersID, :name)", - usersID=userID, name=name) + {"usersID": userID, "name": name}) + db.commit() # TODO lazy fix to make the return type consistent with rename/delete payer and updateincome. # These functions return the # of rows updated/deleted (always being 1) whereas this one is using INSERT and returns the PK value. For now just return the value of 1 as a workaround. + # TODO Fix: use 'db.execute('sql statement').rowcount' to get row number here return 1 @@ -79,11 +85,13 @@ def renamePayer(existingName, newName, userID): # Update existing *expense* records to usse the new name db.execute("UPDATE expenses SET payer = :name WHERE user_id = :usersID AND payer = :oldName", - name=newName, usersID=userID, oldName=existingName) + {"name": newName, "usersID": userID, "oldName": existingName}) + db.commit() # Update the existing *payer* record with the new payers name rows = db.execute( - "UPDATE payers SET name = :name WHERE user_id = :usersID AND name = :oldName", name=newName, usersID=userID, oldName=existingName) + "UPDATE payers SET name = :name WHERE user_id = :usersID AND name = :oldName", {"name": newName, "usersID": userID, "oldName": existingName}).rowcount + db.commit() # Return an error message if the record could not be updated if rows != 1: @@ -100,7 +108,8 @@ def deletePayer(name, userID): # Delete the record rows = db.execute("DELETE FROM payers WHERE name = :name AND user_id = :usersID", - name=name, usersID=userID) + {"name": name, "usersID": userID}).rowcount + db.commit() # Return an error message if the record could not be deleted if rows != 1: @@ -113,8 +122,8 @@ def deletePayer(name, userID): def updatePassword(oldPass, newPass, userID): # Ensure the current password matches the hash in the DB userHash = db.execute( - "SELECT hash FROM users WHERE id = :usersID", usersID=userID) - if not check_password_hash(userHash[0]["hash"], oldPass): + "SELECT hash FROM users WHERE id = :usersID", {"usersID": userID}).fetchone()[0] + if not check_password_hash(userHash, oldPass): return {"apology": "invalid password"} # Generate hash for new password @@ -122,7 +131,8 @@ def updatePassword(oldPass, newPass, userID): # Update the users account to use the new password hash rows = db.execute("UPDATE users SET hash = :hashedPass WHERE id = :usersID", - hashedPass=hashedPass, usersID=userID) + {"hashedPass": hashedPass, "usersID": userID}).rowcount + db.commit() # Return an error message if the password could not be updated if rows != 1: @@ -139,9 +149,9 @@ def payerExistsForUser(payerName, userID): # Query the DB count = db.execute( - "SELECT COUNT(*) AS 'count' FROM payers WHERE user_id = :usersID AND LOWER(name) = :name", usersID=userID, name=payerName.lower()) + "SELECT COUNT(*) AS count FROM payers WHERE user_id = :usersID AND LOWER(name) = :name", {"usersID": userID, "name": payerName.lower()}).fetchone()[0] - if count[0]["count"] > 0: + if count > 0: return True else: return False @@ -156,24 +166,24 @@ def getStatistics(userID): # Get registration date registerDate = db.execute( - "SELECT registerDate FROM users WHERE id = :usersID", usersID=userID) - stats["registerDate"] = registerDate[0]["registerDate"].split()[0] + "SELECT registerDate FROM users WHERE id = :usersID", {"usersID": userID}).fetchone()[0] + stats["registerDate"] = registerDate.split()[0] # Get total expenses totalExpenses = db.execute( - "SELECT COUNT(*) AS 'count' FROM expenses WHERE user_id = :usersID", usersID=userID) - stats["totalExpenses"] = totalExpenses[0]["count"] + "SELECT COUNT(*) AS count FROM expenses WHERE user_id = :usersID", {"usersID": userID}).fetchone()[0] + stats["totalExpenses"] = totalExpenses # Get total budgets totalBudgets = db.execute( - "SELECT COUNT(*) AS 'count' FROM budgets WHERE user_id = :usersID", usersID=userID) - stats["totalBudgets"] = totalBudgets[0]["count"] + "SELECT COUNT(*) AS count FROM budgets WHERE user_id = :usersID", {"usersID": userID}).fetchone()[0] + stats["totalBudgets"] = totalBudgets # Get total categories totalCategories = db.execute( - "SELECT COUNT(*) AS 'count' FROM userCategories INNER JOIN categories ON userCategories.category_id = categories.id WHERE userCategories.user_id = :usersID", - usersID=userID) - stats["totalCategories"] = totalCategories[0]["count"] + "SELECT COUNT(*) AS count FROM userCategories INNER JOIN categories ON userCategories.category_id = categories.id WHERE userCategories.user_id = :usersID", + {"usersID": userID}).fetchone()[0] + stats["totalCategories"] = totalCategories # Get total payers totalPayers = getTotalPayers(userID) @@ -185,9 +195,9 @@ def getStatistics(userID): # Get a count of the total number of payers a user has def getTotalPayers(userID): count = db.execute( - "SELECT COUNT(*) AS 'count' FROM payers WHERE user_id = :usersID", usersID=userID) + "SELECT COUNT(*) AS count FROM payers WHERE user_id = :usersID", {"usersID": userID}).fetchone()[0] - return count[0]["count"] + return count # Get all of the users account info for their 'Your Account' page diff --git a/tendie_budgets.py b/tendie_budgets.py index a2656af..7bba55e 100644 --- a/tendie_budgets.py +++ b/tendie_budgets.py @@ -1,21 +1,25 @@ -import config +import os import re import tendie_categories -from cs50 import SQL from flask import request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker from datetime import datetime +from helpers import convertSQLToDict -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) # Get the users budgets def getBudgets(userID): - budgets = db.execute( - "SELECT id, name, amount FROM budgets WHERE user_id = :usersID ORDER BY name ASC", usersID=userID) + results = db.execute( + "SELECT id, name, amount FROM budgets WHERE user_id = :usersID ORDER BY name ASC", {"usersID": userID}).fetchall() + + budgets = convertSQLToDict(results) if budgets: return budgets @@ -25,8 +29,10 @@ def getBudgets(userID): # Get a users budget by the budget ID def getBudgetByID(budgetID, userID): - budget = db.execute( - "SELECT name, amount, id FROM budgets WHERE user_id = :usersID AND id = :budgetID", usersID=userID, budgetID=budgetID) + results = db.execute( + "SELECT name, amount, id FROM budgets WHERE user_id = :usersID AND id = :budgetID", {"usersID": userID, "budgetID": budgetID}).fetchall() + + budget = convertSQLToDict(results) return budget[0] @@ -34,12 +40,12 @@ def getBudgetByID(budgetID, userID): # Get total amount budgeted def getTotalBudgeted(userID): amount = db.execute( - "SELECT SUM(amount) AS 'amount' FROM budgets WHERE user_id = :usersID", usersID=userID) + "SELECT SUM(amount) AS amount FROM budgets WHERE user_id = :usersID", {"usersID": userID}).fetchone()[0] - if amount[0]["amount"] is None: + if amount is None: return 0 else: - return amount[0]["amount"] + return amount # Generates a budget data structure from the users input when submitting a new or updated budget @@ -102,8 +108,9 @@ def createBudget(budget, userID): return {"apology": "Please enter a unique budget name, not a duplicate."} # Insert new budget into DB - newBudgetID = db.execute("INSERT INTO budgets (name, amount, user_id) VALUES (:budgetName, :budgetAmount, :usersID)", - budgetName=budget["name"], budgetAmount=budget["amount"], usersID=userID) + newBudgetID = db.execute("INSERT INTO budgets (name, amount, user_id) VALUES (:budgetName, :budgetAmount, :usersID) RETURNING id", + {"budgetName": budget["name"], "budgetAmount": budget["amount"], "usersID": userID}).fetchone()[0] + db.commit() # Get category IDs from DB for the new budget categoryIDS = getBudgetCategoryIDS(budget["categories"], userID) @@ -118,8 +125,9 @@ def createBudget(budget, userID): def addCategory(budgetID, categoryIDS): # Insert a record for each category in the new budget for categoryID in categoryIDS: - rows = db.execute("INSERT INTO budgetCategories (budgets_id, category_id, amount) VALUES (:budgetID, :categoryID, :percentAmount)", - budgetID=budgetID, categoryID=categoryID["id"], percentAmount=categoryID["amount"]) + db.execute("INSERT INTO budgetCategories (budgets_id, category_id, amount) VALUES (:budgetID, :categoryID, :percentAmount)", + {"budgetID": budgetID, "categoryID": categoryID["id"], "percentAmount": categoryID["amount"]}) + db.commit() # Update an existing budget @@ -136,11 +144,13 @@ def updateBudget(oldBudgetName, budget, userID): # Update the budget name and amount in DB db.execute("UPDATE budgets SET name = :budgetName, amount = :budgetAmount WHERE id = :oldBudgetID AND user_id = :usersID", - budgetName=budget["name"], budgetAmount=budget["amount"], oldBudgetID=oldBudgetID, usersID=userID) + {"budgetName": budget["name"], "budgetAmount": budget["amount"], "oldBudgetID": oldBudgetID, "usersID": userID}) + db.commit() # Delete existing category records for the budget db.execute("DELETE FROM budgetCategories WHERE budgets_id = :oldBudgetID", - oldBudgetID=oldBudgetID) + {"oldBudgetID": oldBudgetID}) + db.commit() # Get category IDs from DB for the new budget categoryIDS = getBudgetCategoryIDS(budget["categories"], userID) @@ -158,11 +168,11 @@ def getBudgetCategoryIDS(categories, userID): for category in categories: # Get the category ID categoryID = db.execute("SELECT categories.id FROM userCategories INNER JOIN categories ON userCategories.category_id = categories.id WHERE userCategories.user_id = :usersID AND categories.name = :categoryName", - usersID=userID, categoryName=category["name"]) + {"usersID": userID, "categoryName": category["name"]}).fetchone()[0] # Store the category ID and associated percent amount into a dict id_amount = {"id": None, "amount": None} - id_amount["id"] = categoryID[0]["id"] + id_amount["id"] = categoryID id_amount["amount"] = category["percent"] # Add the dictionary to the list of categoryIDs @@ -179,11 +189,13 @@ def deleteBudget(budgetName, userID): if budgetID: # Delete the records for budgetCategories db.execute("DELETE FROM budgetCategories WHERE budgets_id = :budgetID", - budgetID=budgetID) + {"budgetID": budgetID}) + db.commit() # Delete the budget db.execute("DELETE FROM budgets WHERE id = :budgetID", - budgetID=budgetID) + {"budgetID": budgetID}) + db.commit() return budgetName else: @@ -194,24 +206,26 @@ def deleteBudget(budgetName, userID): def getBudgetID(budgetName, userID): # Query the DB for a budget ID based on the user and the supplied budget name budgetID = db.execute("SELECT id FROM budgets WHERE user_id = :usersID AND name = :budgetName", - usersID=userID, budgetName=budgetName) + {"usersID": userID, "budgetName": budgetName}).fetchone()[0] if not budgetID: return None else: - return budgetID[0]["id"] + return budgetID # Get and return a bool based on whether or not a new/updated budget name already exists for the user def isUniqueBudgetName(budgetName, budgetID, userID): if budgetID == None: # Verify the net-new created budget name is not already existing in the users existing budgets - existingBudgets = db.execute( - "SELECT name FROM budgets WHERE user_id = :usersID", usersID=userID) + results = db.execute( + "SELECT name FROM budgets WHERE user_id = :usersID", {"usersID": userID}).fetchall() + existingBudgets = convertSQLToDict(results) else: # Verify the updated budget name is not already existing in the users existing budgets - existingBudgets = db.execute( - "SELECT name FROM budgets WHERE user_id = :usersID AND NOT id = :oldBudgetID", usersID=userID, oldBudgetID=budgetID) + results = db.execute( + "SELECT name FROM budgets WHERE user_id = :usersID AND NOT id = :oldBudgetID", {"usersID": userID, "oldBudgetID": budgetID}).fetchall() + existingBudgets = convertSQLToDict(results) # Loop through all budgets and compare names isUniqueName = True @@ -233,8 +247,9 @@ def getUpdatableBudget(budget, userID): categories = tendie_categories.getSpendCategories(userID) # Get the budget's spend categories and % amount for each category - budgetCategories = db.execute("SELECT DISTINCT categories.name, budgetCategories.amount FROM budgetCategories INNER JOIN categories ON budgetCategories.category_id = categories.id INNER JOIN budgets ON budgetCategories.budgets_id = budgets.id WHERE budgets.id = :budgetsID", - budgetsID=budget["id"]) + results = db.execute("SELECT DISTINCT categories.name, budgetCategories.amount FROM budgetCategories INNER JOIN categories ON budgetCategories.category_id = categories.id INNER JOIN budgets ON budgetCategories.budgets_id = budgets.id WHERE budgets.id = :budgetsID", + {"budgetsID": budget["id"]}).fetchall() + budgetCategories = convertSQLToDict(results) # Add 'categories' as a new key/value pair to the existing budget dict budget["categories"] = [] diff --git a/tendie_categories.py b/tendie_categories.py index 1319fec..89b54eb 100644 --- a/tendie_categories.py +++ b/tendie_categories.py @@ -1,57 +1,71 @@ -import config +import os -from cs50 import SQL from flask import request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker +from helpers import convertSQLToDict -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) # Gets and return the users spend categories def getSpendCategories(userID): - categories = db.execute( - "SELECT categories.id, categories.name FROM userCategories INNER JOIN categories ON userCategories.category_id = categories.id WHERE userCategories.user_id = :usersID", - usersID=userID) + results = db.execute( + "SELECT categories.name FROM usercategories INNER JOIN categories ON usercategories.category_id = categories.id WHERE usercategories.user_id = :usersID", + {"usersID": userID}).fetchall() + + categories = convertSQLToDict(results) return categories # Gets and return the users *inactive* spend categories from their expenses (e.g. they deleted a category and didn't update their expense records that still use the old category name) def getSpendCategories_Inactive(userID): - categories = db.execute( - "SELECT category FROM expenses WHERE user_id = :usersID AND category NOT IN(SELECT categories.name FROM userCategories INNER JOIN categories ON categories.id = userCategories.category_id WHERE user_id = :usersID) GROUP BY category", - usersID=userID) + results = db.execute( + "SELECT category FROM expenses WHERE user_id = :usersID AND category NOT IN(SELECT categories.name FROM usercategories INNER JOIN categories ON categories.id = usercategories.category_id WHERE user_id = :usersID) GROUP BY category", + {"usersID": userID}).fetchall() + + categories = convertSQLToDict(results) return categories # Get and return all spend categories from the category library def getSpendCategoryLibrary(): - categories = db.execute("SELECT id, name FROM categories") + results = db.execute("SELECT id, name FROM categories").fetchall() + + convertSQLToDict(results) + return categories # Get and return the name of a category from the library def getSpendCategoryName(categoryID): name = db.execute( - "SELECT name FROM categories WHERE id = :categoryID", categoryID=categoryID) + "SELECT name FROM categories WHERE id = :categoryID", {"categoryID": categoryID}).fetchone()[0] - return name[0]["name"] + return name # Gets and return the users budgets, and for each budget the categories they've selected def getBudgetsSpendCategories(userID): - budgetsWithCategories = db.execute("SELECT budgets.name AS 'BudgetName', categories.id AS 'CategoryID', categories.name AS 'CategoryName' FROM budgetCategories INNER JOIN budgets on budgetCategories.budgets_id = budgets.id INNER JOIN categories on budgetCategories.category_id = categories.id WHERE budgets.user_id = :usersID ORDER BY budgets.name, categories.name", - usersID=userID) + results = db.execute("SELECT budgets.name AS budgetname, categories.id AS categoryid, categories.name AS categoryname FROM budgetcategories INNER JOIN budgets on budgetcategories.budgets_id = budgets.id INNER JOIN categories on budgetcategories.category_id = categories.id WHERE budgets.user_id = :usersID ORDER BY budgets.name, categories.name", + {"usersID": userID}).fetchall() + + budgetsWithCategories = convertSQLToDict(results) return budgetsWithCategories # Gets and returns the users budgets for a specific category ID def getBudgetsFromSpendCategory(categoryID, userID): - budgets = db.execute("SELECT budgets.id AS 'BudgetID', budgets.name AS 'BudgetName', categories.id AS 'CategoryID', categories.name AS 'CategoryName' FROM budgetCategories INNER JOIN budgets on budgetCategories.budgets_id = budgets.id INNER JOIN categories on budgetCategories.category_id = categories.id WHERE budgets.user_id = :usersID AND budgetCategories.category_id = :categoryID ORDER BY budgets.name, categories.name", usersID=userID, categoryID=categoryID) + results = db.execute("SELECT budgets.id AS budgetid, budgets.name AS budgetname, categories.id AS categoryid, categories.name AS categoryname FROM budgetcategories INNER JOIN budgets on budgetcategories.budgets_id = budgets.id INNER JOIN categories on budgetcategories.category_id = categories.id WHERE budgets.user_id = :usersID AND budgetcategories.category_id = :categoryID ORDER BY budgets.name, categories.name", { + "usersID": userID, "categoryID": categoryID}).fetchall() + + budgets = convertSQLToDict(results) return budgets @@ -60,16 +74,19 @@ def getBudgetsFromSpendCategory(categoryID, userID): def updateSpendCategoriesInBudgets(budgets, oldCategoryID, newCategoryID): for budget in budgets: # Update existing budget record with the new category ID - db.execute("UPDATE budgetCategories SET category_id = :newID WHERE budgets_id = :budgetID AND category_id = :oldID", - newID=newCategoryID, budgetID=budget["BudgetID"], oldID=oldCategoryID) + db.execute("UPDATE budgetcategories SET category_id = :newID WHERE budgets_id = :budgetID AND category_id = :oldID", + {"newID": newCategoryID, "budgetID": budget["budgetid"], "oldID": oldCategoryID}) + db.commit() # Updates budgets where a category needs to be deleted def deleteSpendCategoriesInBudgets(budgets, categoryID): for budget in budgets: # Delete existing budget record with the old category ID - db.execute("DELETE FROM budgetCategories WHERE budgets_id = :budgetID AND category_id = :categoryID", - budgetID=budget["BudgetID"], categoryID=categoryID) + db.execute("DELETE FROM budgetcategories WHERE budgets_id = :budgetID AND category_id = :categoryID", + {"budgetID": budget["budgetid"], "categoryID": categoryID}) + + db.commit() # Generates a ditionary containing all spend categories and the budgets associated with each category @@ -79,14 +96,13 @@ def generateSpendCategoriesWithBudgets(categories, categoryBudgets): # Loop through every category for category in categories: # Build a dictionary to hold category ID + Name, and a list holding all the budgets which have that category selected - categoryWithBudget = {"id": None, "name": None, "budgets": []} - categoryWithBudget["id"] = category["id"] + categoryWithBudget = {"name": None, "budgets": []} categoryWithBudget["name"] = category["name"] # Insert the budget for the spend category if it exists for budget in categoryBudgets: - if category["name"] == budget["CategoryName"]: - categoryWithBudget["budgets"].append(budget["BudgetName"]) + if category["name"] == budget["categoryname"]: + categoryWithBudget["budgets"].append(budget["budgetname"]) # Add the completed dict to the list categoriesWithBudgets.append(categoryWithBudget) @@ -98,7 +114,7 @@ def generateSpendCategoriesWithBudgets(categories, categoryBudgets): def existsInLibrary(newName): # Query the library for a record that matches the name row = db.execute( - "SELECT * FROM categories WHERE LOWER(name) = :name", name=newName.lower()) + "SELECT * FROM categories WHERE LOWER(name) = :name", {"name": newName.lower()}).fetchone() if row: return True @@ -111,29 +127,29 @@ def getCategoryID(categoryName, userID=None): # If no userID is supplied, then it's searching the category library if userID is None: categoryID = db.execute( - "SELECT id FROM categories WHERE LOWER(name) = :name", name=categoryName.lower()) + "SELECT id FROM categories WHERE LOWER(name) = :name", {"name": categoryName.lower()}).fetchone() if not categoryID: return None else: - return categoryID[0]["id"] + return categoryID["id"] # Otherwise search the users selection of categories else: categoryID = db.execute( - "SELECT categories.id FROM userCategories INNER JOIN categories ON userCategories.category_id = categories.id WHERE userCategories.user_id = :usersID AND LOWER(categories.name) = :name", usersID=userID, name=categoryName.lower()) + "SELECT categories.id FROM usercategories INNER JOIN categories ON usercategories.category_id = categories.id WHERE usercategories.user_id = :usersID AND LOWER(categories.name) = :name", {"usersID": userID, "name": categoryName.lower()}).fetchone() if not categoryID: return None else: - return categoryID[0]["id"] + return categoryID["id"] -# Checks if the category name exists in the users seleciton of categories (userCategories table) - if so, just return as False? +# Checks if the category name exists in the users seleciton of categories (usercategories table) - if so, just return as False? def existsForUser(newName, userID): # Query the library for a record that matches the name row = db.execute( - "SELECT categories.id FROM userCategories INNER JOIN categories ON userCategories.category_id = categories.id WHERE userCategories.user_id = :usersID AND LOWER(categories.name) = :name", usersID=userID, name=newName.lower()) + "SELECT categories.id FROM usercategories INNER JOIN categories ON usercategories.category_id = categories.id WHERE usercategories.user_id = :usersID AND LOWER(categories.name) = :name", {"usersID": userID, "name": newName.lower()}).fetchone() if row: return True @@ -145,27 +161,31 @@ def existsForUser(newName, userID): def addCategory_DB(newName): # Create a new record in categories table categoryID = db.execute( - "INSERT INTO categories (name) VALUES (:name)", name=newName) + "INSERT INTO categories (name) VALUES (:name) RETURNING id", {"name": newName}).fetchone()[0] + db.commit() return categoryID # Adds a category to the users account def addCategory_User(categoryID, userID): - db.execute("INSERT INTO userCategories (user_id, category_id) VALUES (:usersID, :categoryID)", - usersID=userID, categoryID=categoryID) + db.execute("INSERT INTO usercategories (user_id, category_id) VALUES (:usersID, :categoryID)", + {"usersID": userID, "categoryID": categoryID}) + db.commit() # Deletes a category from the users account def deleteCategory_User(categoryID, userID): - db.execute("DELETE FROM userCategories WHERE user_id = :usersID AND category_id = :categoryID", - usersID=userID, categoryID=categoryID) + db.execute("DELETE FROM usercategories WHERE user_id = :usersID AND category_id = :categoryID", + {"usersID": userID, "categoryID": categoryID}) + db.commit() # Update just the spend categories of expense records (used for category renaming) def updateExpenseCategoryNames(oldCategoryName, newCategoryName, userID): db.execute("UPDATE expenses SET category = :newName WHERE user_id = :usersID AND category = :oldName", - newName=newCategoryName, usersID=userID, oldName=oldCategoryName) + {"newName": newCategoryName, "usersID": userID, "oldName": oldCategoryName}) + db.commit() # Rename a category diff --git a/tendie_dashboard.py b/tendie_dashboard.py index a886f04..6696ced 100644 --- a/tendie_dashboard.py +++ b/tendie_dashboard.py @@ -1,30 +1,36 @@ -import config +import os import calendar import tendie_budgets -from cs50 import SQL from flask import request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker +from helpers import convertSQLToDict -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) # Get and return the users total spend for the current calendar year def getTotalSpend_Year(userID): - totalSpendYear = db.execute( - "SELECT SUM(amount) AS 'expenses_year' FROM expenses WHERE user_id = :usersID AND expenseDate >= date('now','start of year') AND expenseDate < date('now','start of year','+1 year')", - usersID=userID) + results = db.execute( + "SELECT SUM(amount) AS expenses_year FROM expenses WHERE user_id = :usersID AND date_part('year', date(expensedate)) = date_part('year', CURRENT_DATE)", + {"usersID": userID}).fetchall() + + totalSpendYear = convertSQLToDict(results) return totalSpendYear[0]['expenses_year'] # Get and return the users total spend for the current month def getTotalSpend_Month(userID): - totalSpendMonth = db.execute( - "SELECT SUM(amount) AS 'expenses_month' FROM expenses WHERE user_id = :usersID AND expenseDate < date('now','start of month','+1 month') AND expenseDate >= date('now','start of month')", - usersID=userID) + results = db.execute( + "SELECT SUM(amount) AS expenses_month FROM expenses WHERE user_id = :usersID AND date_part('month', date(expensedate)) = date_part('month', CURRENT_DATE)", + {"usersID": userID}).fetchall() + + totalSpendMonth = convertSQLToDict(results) return totalSpendMonth[0]['expenses_month'] @@ -32,17 +38,21 @@ def getTotalSpend_Month(userID): # Get and return the users total spend for the current week def getTotalSpend_Week(userID): # Query note: Day 0 of a week == Sunday. This query grabs expenses between the *current* weeks Monday and Sunday. - totalSpendWeek = db.execute( - "SELECT SUM(amount) AS 'expenses_week' FROM expenses WHERE user_id = :usersID AND expenseDate <= date('now','weekday 0') AND expenseDate >= date('now','weekday 0','-6 day')", - usersID=userID) + results = db.execute( + "SELECT SUM(amount) AS expenses_week FROM expenses WHERE user_id = :usersID AND date_part('week', date(expensedate)) = date_part('week', CURRENT_DATE)", + {"usersID": userID}).fetchall() + + totalSpendWeek = convertSQLToDict(results) return totalSpendWeek[0]['expenses_week'] # Get and return the users last 5 expenses def getLastFiveExpenses(userID): - lastFiveExpenses = db.execute( - "SELECT description, category, expenseDate, payer, amount FROM expenses WHERE user_id = :usersID ORDER BY submitTime DESC LIMIT 5", usersID=userID) + results = db.execute( + "SELECT description, category, expenseDate, payer, amount FROM expenses WHERE user_id = :usersID ORDER BY submitTime DESC LIMIT 5", {"usersID": userID}).fetchall() + + lastFiveExpenses = convertSQLToDict(results) if lastFiveExpenses: return lastFiveExpenses @@ -64,9 +74,11 @@ def getBudgets(userID): budget["amount"] = record["amount"] # Query the DB for the budgets total spent amount (calculated as the sum of expenses with categories that match the categories selected for the individual budget) - budget_TotalSpent = db.execute( - "SELECT SUM(amount) AS 'spent' FROM expenses WHERE user_id = :usersID AND strftime('%Y',expenseDate) >= strftime('%Y','now') AND strftime('%Y',expenseDate) < strftime('%Y','now','+1 year') AND category IN (SELECT categories.name FROM budgetCategories INNER JOIN categories on budgetCategories.category_id = categories.id WHERE budgetCategories.budgets_id = :budgetID)", - usersID=userID, budgetID=budgetID) + results = db.execute( + "SELECT SUM(amount) AS spent FROM expenses WHERE user_id = :usersID AND date_part('year', date(expensedate)) = date_part('year', CURRENT_DATE) AND category IN (SELECT categories.name FROM budgetcategories INNER JOIN categories on budgetcategories.category_id = categories.id WHERE budgetcategories.budgets_id = :budgetID)", + {"usersID": userID, "budgetID": budgetID}).fetchall() + budget_TotalSpent = convertSQLToDict(results) + if (budget_TotalSpent[0]["spent"] == None): budget["spent"] = 0 else: @@ -91,7 +103,9 @@ def getBudgets(userID): # Gets the last four weeks start dates and end dates (e.g. '2020-04-13' and '2020-04-19') def getLastFourWeekNames(): # Query note: looks back 3 weeks from the current week and *thru* the current week to give a total of 4 weeks of start/end dates - weekNames = db.execute("select date('now','weekday 0','-6 day') AS 'startOfWeek', date('now','weekday 0') AS 'endOfWeek' UNION select date('now','-7 day','weekday 0','-6 day') AS 'startOfWeek', date('now','-7 day','weekday 0') AS 'endOfWeek' UNION select date('now','-14 day','weekday 0','-6 day') AS 'startOfWeek', date('now','-14 day','weekday 0') AS 'endOfWeek' UNION select date('now','-21 day','weekday 0','-6 day') AS 'startOfWeek', date('now','-21 day','weekday 0') AS 'endOfWeek'") + results = db.execute("SELECT date_trunc('week', CURRENT_DATE)::date AS startofweek, (date_trunc('week', CURRENT_DATE) + interval '6 day')::date AS endofweek UNION SELECT date_trunc('week', CURRENT_DATE - interval '1 week')::date AS startofweek, (date_trunc('week', CURRENT_DATE - interval '1 week') + interval '6 day')::date AS endofweek UNION SELECT date_trunc('week', CURRENT_DATE - interval '2 week')::date AS startofweek, (date_trunc('week', CURRENT_DATE - interval '2 week') + interval '6 day')::date AS endofweek UNION SELECT date_trunc('week', CURRENT_DATE - interval '3 week')::date AS startofweek, (date_trunc('week', CURRENT_DATE - interval '3 week') + interval '6 day')::date AS endofweek ORDER BY startofweek ASC").fetchall() + + weekNames = convertSQLToDict(results) return weekNames @@ -103,11 +117,12 @@ def getWeeklySpending(weekNames, userID): # Loop through each week and store the name/amount in a dict for name in weekNames: - week["endOfWeek"] = name["endOfWeek"] - week["startOfWeek"] = name["startOfWeek"] - weekSpending = db.execute( - "SELECT SUM(amount) AS 'amount' FROM expenses WHERE user_id = :usersID AND strftime('%W',expenseDate) = strftime('%W',:weekName)", - usersID=userID, weekName=week["endOfWeek"]) + week["endOfWeek"] = str(name["endofweek"]) + week["startOfWeek"] = str(name["startofweek"]) + results = db.execute( + "SELECT SUM(amount) AS amount FROM expenses WHERE user_id = :usersID AND date_part('week', date(expensedate)) = date_part('week',date(:weekName))", + {"usersID": userID, "weekName": week["endOfWeek"]}).fetchall() + weekSpending = convertSQLToDict(results) # Set the amount to 0 if there are no expenses for a given week if weekSpending[0]["amount"] == None: @@ -136,9 +151,10 @@ def getMonthlySpending(userID): month = {"name": None, "amount": None} # Query note: pulls data for months of the *current* calendar year - spending_month_query = db.execute( - "SELECT LTRIM(strftime('%m',expenseDate),0) AS 'month', SUM(amount) AS 'amount' FROM expenses WHERE user_id = :usersID AND expenseDate > date('now','-11 month','start of month','-1 day') GROUP BY (strftime('%m',expenseDate))", - usersID=userID) + results = db.execute( + "SELECT date_part('month', date(expensedate)) AS month, SUM(amount) AS amount FROM expenses WHERE user_id = :usersID AND date(expensedate) > date_trunc('month',(CURRENT_DATE - interval '11 months')) - interval '1 day' GROUP BY date_part('month', date(expensedate))", + {"usersID": userID}).fetchall() + spending_month_query = convertSQLToDict(results) for record in spending_month_query: month["name"] = calendar.month_abbr[int(record["month"])] @@ -154,8 +170,9 @@ def getSpendingTrends(userID): spending_trends = [] categoryTrend = {"name": None, "proportionalAmount": None, "totalSpent": None, "totalCount": None} - categories = db.execute("SELECT category, COUNT(category) as 'count', SUM(amount) as 'amount' FROM expenses WHERE user_id = :usersID GROUP BY category ORDER BY COUNT(category) DESC", - usersID=userID) + results = db.execute("SELECT category, COUNT(category) as count, SUM(amount) as amount FROM expenses WHERE user_id = :usersID GROUP BY category ORDER BY COUNT(category) DESC", + {"usersID": userID}).fetchall() + categories = convertSQLToDict(results) # Calculate the total amount spent totalSpent = 0 diff --git a/tendie_expenses.py b/tendie_expenses.py index 5b6037c..98da15c 100644 --- a/tendie_expenses.py +++ b/tendie_expenses.py @@ -1,14 +1,16 @@ -import config +import os import calendar -from cs50 import SQL from flask import request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker from datetime import datetime +from helpers import convertSQLToDict -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) # Add expense(s) to the users expense records @@ -53,15 +55,18 @@ def addExpenses(formData, userID): for expense in expenses: now = datetime.now().strftime("%m/%d/%Y %H:%M:%S") db.execute("INSERT INTO expenses (description, category, expenseDate, amount, payer, submitTime, user_id) VALUES (:description, :category, :expenseDate, :amount, :payer, :submitTime, :usersID)", - description=expense["description"], category=expense["category"], expenseDate=expense["date"], amount=expense["amount"], payer=expense["payer"], submitTime=now, usersID=userID) + {"description": expense["description"], "category": expense["category"], "expenseDate": expense["date"], "amount": expense["amount"], "payer": expense["payer"], "submitTime": now, "usersID": userID}) + db.commit() return expenses # Get and return the users lifetime expense history def getHistory(userID): - history = db.execute("SELECT description, category, expenseDate AS 'date', payer, amount, submitTime FROM expenses WHERE user_id = :usersID ORDER BY submitTime ASC", - usersID=userID) + results = db.execute("SELECT description, category, expenseDate AS date, payer, amount, submitTime FROM expenses WHERE user_id = :usersID ORDER BY submitTime ASC", + {"usersID": userID}).fetchall() + + history = convertSQLToDict(results) return history @@ -83,11 +88,11 @@ def getExpense(formData, userID): # Query the DB for the expense unique identifier expenseID = db.execute("SELECT id FROM expenses WHERE user_id = :usersID AND description = :oldDescription AND category = :oldCategory AND expenseDate = :oldDate AND amount = :oldAmount AND payer = :oldPayer AND submitTime = :oldSubmitTime", - usersID=userID, oldDescription=expense["description"], oldCategory=expense["category"], oldDate=expense["date"], oldAmount=expense["amount"], oldPayer=expense["payer"], oldSubmitTime=expense["submitTime"]) + {"usersID": userID, "oldDescription": expense["description"], "oldCategory": expense["category"], "oldDate": expense["date"], "oldAmount": expense["amount"], "oldPayer": expense["payer"], "oldSubmitTime": expense["submitTime"]}).fetchone() # Make sure a record was found for the expense otherwise set as None if expenseID: - expense["id"] = expenseID[0]["id"] + expense["id"] = expenseID[0] else: expense["id"] = None @@ -97,7 +102,8 @@ def getExpense(formData, userID): # Delete an existing expense record for the user def deleteExpense(expense, userID): result = db.execute("DELETE FROM expenses WHERE user_id = :usersID AND id = :oldExpenseID", - usersID=userID, oldExpenseID=expense["id"]) + {"usersID": userID, "oldExpenseID": expense["id"]}) + db.commit() return result @@ -131,7 +137,8 @@ def updateExpense(oldExpense, formData, userID): # Update the existing record now = datetime.now().strftime("%m/%d/%Y %H:%M:%S") result = db.execute("UPDATE expenses SET description = :newDescription, category = :newCategory, expenseDate = :newDate, amount = :newAmount, payer = :newPayer, submitTime = :newSubmitTime WHERE id = :existingExpenseID AND user_id = :usersID", - newDescription=expense["description"], newCategory=expense["category"], newDate=expense["date"], newAmount=expense["amount"], newPayer=expense["payer"], newSubmitTime=now, existingExpenseID=oldExpense["id"], usersID=userID) + {"newDescription": expense["description"], "newCategory": expense["category"], "newDate": expense["date"], "newAmount": expense["amount"], "newPayer": expense["payer"], "newSubmitTime": now, "existingExpenseID": oldExpense["id"], "usersID": userID}).rowcount + db.commit() # Make sure result is not empty (indicating it could not update the expense) if result: diff --git a/tendie_reports.py b/tendie_reports.py index 958dafb..70aef82 100644 --- a/tendie_reports.py +++ b/tendie_reports.py @@ -1,4 +1,4 @@ -import config +import os import calendar import copy import tendie_expenses @@ -6,13 +6,15 @@ import tendie_categories import tendie_budgets -from cs50 import SQL from flask import request, session from flask_session import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker +from helpers import convertSQLToDict -# Configure CS50 Library to use SQLite database -# db = SQL("sqlite:///localhostDBForTesting.db") # can be used for testing locally -db = SQL(config.testingDB) +# Create engine object to manage connections to DB, and scoped session to separate user interactions with DB +engine = create_engine(os.getenv("DATABASE_URL")) +db = scoped_session(sessionmaker(bind=engine)) # Generates data needed for the budget report by looping through each budget and adding expense history where categories match between budgets and expenses @@ -28,8 +30,9 @@ def generateBudgetsReport(userID): if budgetsReport: for record in budgetsReport: budgetID = tendie_budgets.getBudgetID(record["name"], userID) - expenseDetails = db.execute("SELECT expenses.description, expenses.category, expenses.expenseDate, expenses.payer, expenses.amount FROM expenses WHERE user_id = :usersID AND strftime('%Y',expenseDate) >= strftime('%Y','now') AND strftime('%Y',expenseDate) < strftime('%Y','now','+1 year') AND category IN (SELECT categories.name FROM budgetCategories INNER JOIN categories on budgetCategories.category_id = categories.id WHERE budgetCategories.budgets_id = :budgetID)", - usersID=userID, budgetID=budgetID) + results = db.execute("SELECT expenses.description, expenses.category, expenses.expenseDate, expenses.payer, expenses.amount FROM expenses WHERE user_id = :usersID AND date_part('year', date(expensedate)) = date_part('year', CURRENT_DATE) AND category IN (SELECT categories.name FROM budgetcategories INNER JOIN categories on budgetcategories.category_id = categories.id WHERE budgetcategories.budgets_id = :budgetID)", + {"usersID": userID, "budgetID": budgetID}).fetchall() + expenseDetails = convertSQLToDict(results) record["expenses"] = expenseDetails return budgetsReport @@ -42,8 +45,9 @@ def generateMonthlyReport(userID): spending_month_chart = tendie_dashboard.getMonthlySpending(userID) # Get the spending data from DB for the table (individual expenses per month) - spending_month_table = db.execute( - "SELECT description, category, expenseDate, amount, payer FROM expenses WHERE user_id = :usersID AND expenseDate > date('now','-11 month','start of month','-1 day') ORDER BY submitTime ASC", usersID=userID) + results = db.execute( + "SELECT description, category, expensedate, amount, payer FROM expenses WHERE user_id = :usersID AND date(expensedate) > date_trunc('month',(CURRENT_DATE - interval '11 months')) - interval '1 day' ORDER BY submitTime ASC", {"usersID": userID}).fetchall() + spending_month_table = convertSQLToDict(results) # Combine both data points (chart and table) into a single data structure monthlyReport = {"chart": spending_month_chart, @@ -97,18 +101,20 @@ def generateSpendingTrendsReport(userID): spending_trends_table[month] = copy.deepcopy(categories) # Get expense data for each category by month (retrieves the total amount of expenses per category by month, and the total count of expenses per category by month. Assumes there is at least 1 expense for the category) - spending_trends_table_query = db.execute( - "SELECT LTRIM(strftime('%m',expenseDate),0) AS 'monthOfCategoryExpense', category AS 'name', COUNT(category) AS 'count', SUM(amount) AS 'amount' FROM expenses WHERE user_id = :usersID GROUP BY strftime('%m',expenseDate), category ORDER BY COUNT(category) DESC", usersID=userID) + results = db.execute( + "SELECT date_part('month', date(expensedate)) AS monthofcategoryexpense, category AS name, COUNT(category) AS count, SUM(amount) AS amount FROM expenses WHERE user_id = :usersID GROUP BY date_part('month', date(expensedate)), category ORDER BY COUNT(category) DESC", + {"usersID": userID}).fetchall() + spending_trends_table_query = convertSQLToDict(results) # Loop thru each monthly category expense from above DB query and update the data structure that holds all monthly category expenses for categoryExpense in spending_trends_table_query: # Get the key (month) for the data structure monthOfExpense = calendar.month_name[int( - categoryExpense["monthOfCategoryExpense"])] + categoryExpense["monthofcategoryexpense"])] # Traverse the data structure: 1) go to the dict month based on the category expense date, 2) loop thru each dict category until a match in name occurs with the expense, 3) update the dict month/amount/count properties to match the DB record for category in spending_trends_table[monthOfExpense]: if category["name"] == categoryExpense["name"]: - category["expenseMonth"] = categoryExpense["monthOfCategoryExpense"] + category["expenseMonth"] = categoryExpense["monthofcategoryexpense"] category["expenseCount"] = categoryExpense["count"] category["amount"] = categoryExpense["amount"] break @@ -136,12 +142,14 @@ def generateSpendingTrendsReport(userID): def generatePayersReport(userID): # First get all of the payers from expenses table (this may include payers that don't exist anymore for the user (i.e. deleted the payer and didn't update expense records)) - payers = db.execute( - "SELECT payer AS 'name', SUM(amount) AS 'amount' FROM expenses WHERE user_id = :usersID GROUP BY payer ORDER BY amount DESC", usersID=userID) + results_payers = db.execute( + "SELECT payer AS name, SUM(amount) AS amount FROM expenses WHERE user_id = :usersID GROUP BY payer ORDER BY amount DESC", {"usersID": userID}).fetchall() + payers = convertSQLToDict(results_payers) # Now get any payers the user has in their account but haven't expensed anything - nonExpensePayers = db.execute( - "SELECT name FROM payers WHERE user_id = :usersID AND name NOT IN (SELECT payer FROM expenses WHERE expenses.user_id = :usersID)", usersID=userID) + results_nonExpensePayers = db.execute( + "SELECT name FROM payers WHERE user_id = :usersID AND name NOT IN (SELECT payer FROM expenses WHERE expenses.user_id = :usersID)", {"usersID": userID}).fetchall() + nonExpensePayers = convertSQLToDict(results_nonExpensePayers) # Add the non-expense payers to the payers data structure and set their amounts to 0 for payer in nonExpensePayers: