From 3c3cf6ebc7624204774c730a4905dac6211ff85c Mon Sep 17 00:00:00 2001 From: Sindre Stephansen Date: Mon, 16 Mar 2020 22:19:25 +0100 Subject: [PATCH] Replace printing with logging in model files --- src/app/models/project.py | 39 ++++++++++++++++++++++---------------- src/app/models/register.py | 6 +++++- src/app/models/session.py | 9 ++++++--- src/app/models/user.py | 13 ++++++++----- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/app/models/project.py b/src/app/models/project.py index 0378bb4..9fbd8c1 100755 --- a/src/app/models/project.py +++ b/src/app/models/project.py @@ -1,6 +1,10 @@ from models.database import db +import logging import mysql.connector +logger = logging.getLogger(__name__) + + def get_categories(): """ Get all categories @@ -14,7 +18,7 @@ def get_categories(): cursor.execute(query) categories = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) categories = [] cursor.fetchall() exit(1) @@ -23,6 +27,7 @@ def get_categories(): db.close() return categories + def set_project(categoryid, userid, project_title, project_description, project_status): """ Store a project in the database @@ -48,7 +53,7 @@ def set_project(categoryid, userid, project_title, project_description, project_ users_projects = get_projects_by_owner(userid) projectid = users_projects[-1][0] except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) projectid = None cursor.fetchall() exit(1) @@ -57,6 +62,7 @@ def set_project(categoryid, userid, project_title, project_description, project_ db.close() return projectid + def get_project_by_id(projectid): """ Retrieve a project by its id @@ -72,7 +78,7 @@ def get_project_by_id(projectid): cursor.execute(query, (projectid,)) project = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) project = [] cursor.fetchall() exit(1) @@ -81,6 +87,7 @@ def get_project_by_id(projectid): db.close() return project[0] + def update_project_status(projectid, status): """ Change the status of a selected project @@ -96,13 +103,14 @@ def update_project_status(projectid, status): cursor.execute(query, (status, projectid)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: cursor.close() db.close() + def get_user_permissions(userid, projectid): """ Get permissions for a selected users in a specific project @@ -120,7 +128,7 @@ def get_user_permissions(userid, projectid): cursor.execute(query, (projectid, userid)) permissions = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -154,7 +162,7 @@ def get_projects_by_status_and_category(categoryid, project_status): cursor.execute(query, (project_status, categoryid)) projects = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) projects = [] cursor.fetchall() exit(1) @@ -178,7 +186,7 @@ def get_projects_by_owner(userid): cursor.execute(query, (userid,)) projects = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) projects = [] cursor.fetchall() exit(1) @@ -206,7 +214,7 @@ def get_projects_by_status_and_owner(userid, project_status): cursor.execute(query, (project_status, userid)) projects = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) projects = [] cursor.fetchall() exit(1) @@ -230,12 +238,11 @@ def get_projects_by_participant_and_status(userid, project_status): cursor = db.cursor() query = ("SELECT * FROM projects, projects_users WHERE projects.project_status = %s AND " + "projects_users.userid = %s AND projects_users.projectid = projects.projectid") - db.connect() try: cursor.execute(query, (project_status, userid)) projects = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) projects = [] cursor.fetchall() exit(1) @@ -266,7 +273,7 @@ def set_task(projectid, task_title, task_description, budget): cursor.execute(query, (projectid, task_title, task_description, budget)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -282,7 +289,7 @@ def update_task_status(taskid, status): cursor.execute(query, (status, taskid)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -305,7 +312,7 @@ def get_tasks_by_project_id(projectid): cursor.execute(query, (projectid,)) tasks = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) tasks = [] cursor.fetchall() exit(1) @@ -331,7 +338,7 @@ def set_task_file(taskid, filename): cursor.execute(query, (taskid, filename)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -353,7 +360,7 @@ def get_task_files(taskid): cursor.execute(query, (str(taskid),)) filenames = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) filenames = [] cursor.fetchall() exit(1) @@ -384,7 +391,7 @@ def set_projects_user(projectid, userid, read_permission="TRUE", cursor.execute(query, (projectid, userid, read_permission, write_permission, modify_permission)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: diff --git a/src/app/models/register.py b/src/app/models/register.py index d416c0b..2be8e1f 100755 --- a/src/app/models/register.py +++ b/src/app/models/register.py @@ -1,6 +1,10 @@ from models.database import db +import logging import mysql.connector +logger = logging.getLogger(__name__) + + def set_user(username, password, full_name, company, email, street_address, city, state, postal_code, country): """ @@ -34,7 +38,7 @@ def set_user(username, password, full_name, company, email, city, state, postal_code, country)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: diff --git a/src/app/models/session.py b/src/app/models/session.py index eb65e25..a92b8a8 100644 --- a/src/app/models/session.py +++ b/src/app/models/session.py @@ -1,6 +1,9 @@ from models.database import db +import logging import mysql.connector +logger = logging.getLogger(__name__) + def set_cookie(userid, token, expiry): """ @@ -16,7 +19,7 @@ def set_cookie(userid, token, expiry): cursor.execute(query, (userid, token, expiry)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -42,7 +45,7 @@ def get_cookie(token): userid = users[0][0] expiry = users[0][1] except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -65,7 +68,7 @@ def delete_cookie(token): cursor.execute(query, (token,)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: diff --git a/src/app/models/user.py b/src/app/models/user.py index 01a7c98..24dd567 100755 --- a/src/app/models/user.py +++ b/src/app/models/user.py @@ -1,6 +1,9 @@ from models.database import db +import logging import mysql.connector +logger = logging.getLogger(__name__) + def get_user(username): """ @@ -20,7 +23,7 @@ def get_user(username): if len(users): user = users[0] except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -41,7 +44,7 @@ def get_users(): cursor.execute(query) users = cursor.fetchall() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) users = [] cursor.fetchall() exit(1) @@ -62,7 +65,7 @@ def set_login_attempts(userid, num, timestamp): cursor.execute(query, (num, timestamp, userid)) db.commit() except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -87,7 +90,7 @@ def get_user_id_by_name(username): if(len(users)): userid = users[0][0] except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: @@ -112,7 +115,7 @@ def get_user_name_by_id(userid): if len(users): username = users[0][0] except mysql.connector.Error as err: - print("Failed executing query: {}".format(err)) + logger.error("Failed executing query: %s", err) cursor.fetchall() exit(1) finally: