Overhaul Sessioning

src/ezgg_lan_manager/pages/TournamentDetailsPage.py

@@ -11,11 +11,11 @@ from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserSe
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
 from src.ezgg_lan_manager.components.TournamentDetailsInfoRow import TournamentDetailsInfoRow
 from src.ezgg_lan_manager.types.DateUtil import weekday_to_display_text
-from src.ezgg_lan_manager.types.SessionStorage import SessionStorage
 from src.ezgg_lan_manager.types.Team import Team, TeamStatus
 from src.ezgg_lan_manager.types.Tournament import Tournament
 from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, tournament_status_to_display_text, tournament_format_to_display_texts, ParticipantType
 from src.ezgg_lan_manager.types.User import User
+from src.ezgg_lan_manager.types.UserSession import UserSession
 
 logger = logging.getLogger(__name__.split(".")[-1])
 
@@ -53,9 +53,13 @@ class TournamentDetailsPage(Component):
         else:
             await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turniere")
 
-        self.user = await self.session[UserService].get_user(self.session[SessionStorage].user_id)
-        if self.user is not None:
-            self.user_teams = await self.session[TeamService].get_teams_for_user_by_id(self.user.user_id)
+        try:
+            user_id = self.session[UserSession].user_id
+            self.user = await self.session[UserService].get_user(user_id)
+            self.user_teams = await self.session[TeamService].get_teams_for_user_by_id(user_id)
+        except KeyError:
+            self.user = None
+            self.user_teams = []
 
         self.loading_done()
 
@@ -167,7 +171,6 @@ class TournamentDetailsPage(Component):
     def loading_done(self) -> None:
         if self.tournament is None:
             self.tournament = "Turnier konnte nicht gefunden werden"
-        self.session[SessionStorage].subscribe_to_logged_in_or_out_event(str(self.__class__), self.on_populate)
 
     def build(self) -> Component:
         if self.tournament is None: