From c34a42fba15df4f99d05d8b736fe5acb6b1c2ca9 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Wed, 28 Aug 2024 22:07:55 +0200 Subject: [PATCH] Add `user__sso_id` field to CourseSessionUserAdmin --- server/vbv_lernwelt/course/admin.py | 7 +++++++ server/vbv_lernwelt/course/middleware.py | 8 ++++---- server/vbv_lernwelt/debugtools/decorators.py | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py index 8ec26bb9..1561f191 100644 --- a/server/vbv_lernwelt/course/admin.py +++ b/server/vbv_lernwelt/course/admin.py @@ -65,6 +65,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin): "role", "circles", "optional_attendance", + "user_sso_id", # "created_at", # "updated_at", ] @@ -95,6 +96,12 @@ class CourseSessionUserAdmin(admin.ModelAdmin): user_last_name.short_description = "Last Name" user_last_name.admin_order_field = "user__last_name" + def user_sso_id(self, obj): + return obj.user.sso_id + + user_sso_id.short_description = "SSO ID" + user_sso_id.admin_order_field = "user__sso_id" + def circles(self, obj): return ", ".join([c.title for c in obj.expert.all()]) diff --git a/server/vbv_lernwelt/course/middleware.py b/server/vbv_lernwelt/course/middleware.py index d9814760..479e805a 100644 --- a/server/vbv_lernwelt/course/middleware.py +++ b/server/vbv_lernwelt/course/middleware.py @@ -177,9 +177,9 @@ class GraphQLQueryFilterMiddleware: request._body = json.dumps(body).encode("utf-8") response = self.get_response(request) content = json.loads(response.content) - cache_data["data"]["course"][ - "course_session_users" - ] = content["data"]["course"]["course_session_users"] + cache_data["data"]["course"]["course_session_users"] = ( + content["data"]["course"]["course_session_users"] + ) response.content = json.dumps(cache_data) return response @@ -194,7 +194,7 @@ class GraphQLQueryFilterMiddleware: return response except Exception as e: # Handle any exceptions in parsing or filtering - logger.error(f"Error in GraphQLQueryFilterMiddleware", exc_info=e) + logger.error("Error in GraphQLQueryFilterMiddleware", exc_info=e) # Continue processing the request if not blocked response = self.get_response(request) diff --git a/server/vbv_lernwelt/debugtools/decorators.py b/server/vbv_lernwelt/debugtools/decorators.py index 102707e5..19c61ace 100644 --- a/server/vbv_lernwelt/debugtools/decorators.py +++ b/server/vbv_lernwelt/debugtools/decorators.py @@ -25,7 +25,9 @@ def count_queries(func): # Calculate the execution time execution_time = end_time - start_time - print(f"{func.__name__} executed {query_count} queries in {execution_time:.4f} seconds.") + print( + f"{func.__name__} executed {query_count} queries in {execution_time:.4f} seconds." + ) return result