From 472c762de2e0ec05f35dc052604f8095b7752495 Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Thu, 1 Oct 2020 21:52:40 +0300 Subject: [PATCH] List user keycards on user info page --- kdoorweb/kdoorweb/db.py | 4 ++++ kdoorweb/kdoorweb/web.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kdoorweb/kdoorweb/db.py b/kdoorweb/kdoorweb/db.py index 484df2a..dd34a3f 100644 --- a/kdoorweb/kdoorweb/db.py +++ b/kdoorweb/kdoorweb/db.py @@ -152,6 +152,10 @@ class DB: """, keycards) self.db.commit() + def get_user_keycards(self, user_id): + cur = self.db.execute("select id, name, created, disabled from keycards where user_id = ?", (user_id,)) + return cur.fetchall() + @staticmethod def import_ad(json_file): with open(json_file) as fp: diff --git a/kdoorweb/kdoorweb/web.py b/kdoorweb/kdoorweb/web.py index 0c725e4..0e816e5 100644 --- a/kdoorweb/kdoorweb/web.py +++ b/kdoorweb/kdoorweb/web.py @@ -128,7 +128,8 @@ def info(db, user_id): user = db.get_user(user_id) if not user: raise HTTPError(404, "User does not exist") - return {**user, "keycards": []} + keycards = db.get_user_keycards(user_id) + return {**user, "keycards": keycards} @app.route("/log")