From e029b918e80addad3a944c9f4bbc3bfe37338246 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Mon, 27 Nov 2023 18:57:13 -0800 Subject: fix: sort API dates by time - causes some ridiculous graphs if you don't --- backend/app.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'backend') diff --git a/backend/app.py b/backend/app.py index 5e2be6d..5c39182 100644 --- a/backend/app.py +++ b/backend/app.py @@ -31,10 +31,11 @@ def api_subscribers(): def api_subscribers_channel(channel_name): server = SQLHandler(CONFIG["SQL"]["host"], CONFIG["SQL"]["user"], CONFIG["SQL"]["password"], CONFIG["SQL"]["database"]) data = server.execute_query("SELECT * FROM subscriber_data_historical WHERE name = %s", (channel_name,)) + sorted_data = sorted(data, key=lambda row: row[5].strftime("%Y-%m-%d")) labels = [] data_points = [] seen_dates = set() - for row in data: + for row in sorted_data: date_string = row[5].strftime("%Y-%m-%d") if date_string in seen_dates: continue @@ -48,10 +49,11 @@ def api_subscribers_channel(channel_name): def api_subscribers_channel_7d(channel_name): server = SQLHandler(CONFIG["SQL"]["host"], CONFIG["SQL"]["user"], CONFIG["SQL"]["password"], CONFIG["SQL"]["database"]) data = server.execute_query("SELECT * FROM subscriber_data_historical WHERE name = %s", (channel_name,)) + sorted_data = sorted(data, key=lambda row: row[5].strftime("%Y-%m-%d")) labels = [] data_points = [] seen_dates = set() - for row in data: + for row in sorted_data: date_string = row[5].strftime("%Y-%m-%d") if date_string in seen_dates: continue @@ -106,6 +108,13 @@ def get_channel_information(channel_name): channel_data["next_milestone"] = "N/A" return jsonify(channel_data) +@app.route("/api/announcement") +def api_announcement(): + """ + Can be used to show a particular message/error on the NEXT interface + """ + announcement_data = {"message": "None", "show_message": False} # stub TODO + @app.errorhandler(404) def not_found(error): return jsonify(error=str(error)), 404 -- cgit v1.2.3