From cc3b6bbf0dd9fc675c2221109325151eec45beb3 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 26 Jun 2024 13:54:55 +0200 Subject: [PATCH] Clean up some code --- server/vbv_lernwelt/core/models.py | 9 ++++----- server/vbv_lernwelt/importer/services.py | 2 +- server/vbv_lernwelt/sso/role_sync/roles.py | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/vbv_lernwelt/core/models.py b/server/vbv_lernwelt/core/models.py index d92a1396..d0baf2c5 100644 --- a/server/vbv_lernwelt/core/models.py +++ b/server/vbv_lernwelt/core/models.py @@ -144,14 +144,13 @@ class User(AbstractUser): return "/static/avatars/myvbv-default-avatar.png" def update_additional_json_data(self, data: Dict[str, Any]): - # Set E-Mail notification settings for new users self.additional_json_data = ( self.additional_json_data | sanitize_json_data_input( - { - **data, - } - ) + { + **data, + } + ) ) @property diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index 7dd59659..4abc1403 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -829,7 +829,7 @@ def create_or_update_trainer(course: Course, data: Dict[str, Any], language="de" course_title = course.title if course else "None" logger.debug( - "create_or_update_trainer2", + "create_or_update_trainer", course=course_title, data=data, label="import", diff --git a/server/vbv_lernwelt/sso/role_sync/roles.py b/server/vbv_lernwelt/sso/role_sync/roles.py index 630222aa..91b678e6 100644 --- a/server/vbv_lernwelt/sso/role_sync/roles.py +++ b/server/vbv_lernwelt/sso/role_sync/roles.py @@ -31,6 +31,7 @@ SSO_ROLES = { }, } +# STAGE # https://sso.test.b.lernetz.host/auth/admin/vbv/console/#/vbv/roles ROLE_IDS = { "myvbv-uberbetriebliche-kurse-member": "0725f2d4-c3f3-48b7-83ec-06acfae630e6", @@ -52,3 +53,5 @@ ROLE_IDS = { "myvbv-intermediarioa-assicurativoa-member": "9fbaaa0f-cf8c-45f2-93f6-7174cb18a982", "myvbv-intermediarioa-assicurativoa-mentor": "46b12e54-682e-44c0-b506-eab820138b66", } + +# TODO: Add production roles IDs