From 26a453b507e71414123c7ff807cd2519c70ea7b5 Mon Sep 17 00:00:00 2001 From: 2000-Trek Date: Fri, 24 Nov 2023 21:33:32 +0100 Subject: [PATCH 1/3] added gitlab link to the Documentation --- Website/templates/documentation.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Website/templates/documentation.html b/Website/templates/documentation.html index 69b4026..65c408b 100644 --- a/Website/templates/documentation.html +++ b/Website/templates/documentation.html @@ -9,6 +9,7 @@

index page | user and tag list

+

https://hannover.ccc.de/gitlab/anton/matekasse

Documentation

From dcd7a71d83efd7b3311f584b73a082dd76304d90 Mon Sep 17 00:00:00 2001 From: 2000-Trek Date: Fri, 24 Nov 2023 21:34:35 +0100 Subject: [PATCH 2/3] added gitlab link to the Documentation --- Website/templates/documentation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Website/templates/documentation.html b/Website/templates/documentation.html index 65c408b..29df8c7 100644 --- a/Website/templates/documentation.html +++ b/Website/templates/documentation.html @@ -9,7 +9,7 @@

Documentation

From 2d6d14ebba576f693a248b64fae35e41f81f2ec3 Mon Sep 17 00:00:00 2001 From: 2000-Trek Date: Sat, 25 Nov 2023 00:05:33 +0100 Subject: [PATCH 3/3] new log --- Website/__init__.py | 51 +++++++++++++++++++++----------- Website/create_db_restore_log.py | 13 -------- Website/schema.sql | 9 +++++- 3 files changed, 42 insertions(+), 31 deletions(-) delete mode 100644 Website/create_db_restore_log.py diff --git a/Website/__init__.py b/Website/__init__.py index 6179229..34f3383 100644 --- a/Website/__init__.py +++ b/Website/__init__.py @@ -4,17 +4,25 @@ from flask_socketio import SocketIO, join_room, leave_room from flask_session import Session from markupsafe import escape from .db import get_db +from datetime import datetime #flask_config DATABASE = './Website/mate.db' -def create_logs(app): - now = datetime.datetime.now().strftime('%d-%m-%Y-%H-%M-%S') - logging.basicConfig(filename=f"logs/matekasse-{now}.log",filemode='w', format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' ,encoding='utf-8', level=logging.INFO) - app.logger = logging.getLogger('db') +#def create_logs(app): +# now = datetime.datetime.now().strftime('%d-%m-%Y-%H-%M-%S') +# logging.basicConfig(filename=f"logs/matekasse-{now}.log",filemode='w', format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' ,encoding='utf-8', level=logging.INFO) +# app.logger = logging.getLogger('db') +# +# app.logger.info("Website is starting") - app.logger.info("Website is starting") +def log(type=None, userid=None, before=None, after=None): + db = get_db() + c = db.cursor() + c.execute("INSERT or IGNORE INTO transaction_log (timestamp, userid, type, before, after) VALUES (?, ?, ?, ?, ?)", [datetime.now(), userid, type, before, after]) + db.commit() + db.close() def create_app(test_config=None): app = Flask(__name__) @@ -30,8 +38,8 @@ def create_app(test_config=None): os.makedirs(app.instance_path) except OSError: pass - with app.app_context(): - create_logs(app) + #with app.app_context(): + # create_logs(app) Session(app) socketio = SocketIO(app) @@ -93,6 +101,17 @@ def create_app(test_config=None):

''' + text + '' + @app.route("/transactionlist") + def transactionlist(): + db = get_db() + c = db.cursor() + text = "" + c.execute("SELECT * FROM transaction_log ORDER BY ROWID DESC LIMIT 100") + transactionlist = c.fetchall() + for i in transactionlist: + text = text + f"

{i[0]} userid: {i[1]} {i[2]} {i[3]} to {i[4]}

" + return text + @app.route("/list/user", methods=['GET']) def user_info(): db = get_db() @@ -147,8 +166,8 @@ def create_app(test_config=None): c.execute(f"DELETE FROM tags WHERE userid=?", [user_id]) app.logger.info(f"Deleted all tags from user ?", [user_id]) c.execute(f"DELETE FROM users WHERE id=?", [user_id]) - app.logger.info(f"Deleted user ?", [user_id]) db.commit() + log(type="removeuser", userid=user_id, before=user_name) socketio.emit("update", "update") return f'remove user

user and tag list | Documentation

Deleted user {escape(user_name)}

return to the tags and user list

' else: @@ -168,7 +187,7 @@ def create_app(test_config=None): socketio.emit("update", "update") c.execute(f"SELECT * FROM users WHERE username=?", [username]) user = c.fetchone() - app.logger.info(f"Added user id: {user[0]} name: {user[2]}") + log(type="adduser", userid=user[0], after=user[1]) return """ @@ -304,7 +323,7 @@ def create_app(test_config=None): db.commit() c.execute(f"SELECT * FROM users WHERE id = {userid}") user_new = c.fetchone() - app.logger.info(f"Changed the balance from user {user[0]} from {user[2]} to {user_new[2]}") + log(type="balance", userid=user[0], before=user[2], after=user_new[2]) socketio.emit("update", "update") return make_response(json.dumps({"mode":"balance", "username":user[1], "balance":user_new[2]})) else: @@ -327,7 +346,7 @@ def create_app(test_config=None): state = queue_item[1] c.execute(f"SELECT * FROM users WHERE id=?", [user]) - username = c.fetchone()[1] + user_id = c.fetchone()[0] if state == "add": c.execute(f"SELECT * FROM tags WHERE tagid={tag_id}") if c.fetchall() != []: @@ -336,8 +355,7 @@ def create_app(test_config=None): return make_response(json.dumps({"mode":"error","error":"170"})) else: c.execute(f"INSERT OR IGNORE INTO tags (tagid, userid) VALUES ({tag_id}, ?)", [user]) - message = f"Added {tag_id} to {username}" - app.logger.info(message) + log(type="addtag", userid=user_id ,after=tag_id) finished = queue_item db.commit() return make_response(json.dumps({"mode":"message","username":"{}".format(username),"message":"A tag was added"})) @@ -346,8 +364,7 @@ def create_app(test_config=None): tags = c.fetchall() if tags != []: c.execute(f"DELETE FROM tags WHERE (tagid = {tag_id} AND userid = ?)", [user]) - message = f"Removed {tag_id} from {username}" - app.logger.info(message) + log(type="removetag", userid=user_id, before=tag_id) finished = queue_item db.commit() return make_response(json.dumps({"mode":"message","username":"{}".format(username),"message":"A tag was removed"})) @@ -370,7 +387,7 @@ def create_app(test_config=None): db.commit() c.execute(f"SELECT * FROM users WHERE id={tag[1]}") user = c.fetchone() - app.logger.info(f"Changed the balance from user {user[0]} from {balance_old} to {user[2]}") + log(type="balance", userid=user[0], before=balance_old, after=user[2]) socketio.emit("update", "update") return make_response(json.dumps({"mode":"balance", "username":user[1], "balance":user[2]})) else: diff --git a/Website/create_db_restore_log.py b/Website/create_db_restore_log.py deleted file mode 100644 index 70d441c..0000000 --- a/Website/create_db_restore_log.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys -filename = sys.argv[1] -db_log = [] - -with open(filename, 'r') as f: - for line in f: - if "db" in line: - db_log.append(line) - -with open("restore_log", "x") as f: - for i in db_log: - f.write(i) - f.close \ No newline at end of file diff --git a/Website/schema.sql b/Website/schema.sql index 3455b26..55c7d1a 100644 --- a/Website/schema.sql +++ b/Website/schema.sql @@ -6,9 +6,16 @@ CREATE TABLE IF NOT EXISTS "users" ( PRIMARY KEY("id") ); CREATE TABLE IF NOT EXISTS "tags" ( - "tagid" INEGER NOT NULL, + "tagid" INTEGER NOT NULL, "userid" INTEGER, FOREIGN KEY("userid") REFERENCES "users"("id"), PRIMARY KEY("tagid") ); +CREATE TABLE IF NOT EXISTS "transaction_log" ( + "timestamp" INTEGER NOT NULL, + "userid" INTEGER NOT NULL, + "type" TEXT NOT NULL, + "before" TEXT, + "after" TEXT +); COMMIT; \ No newline at end of file