refactor: move uses from dict func to method to make it easier to upd…

…ate pydantic

backend/src/routes/competitors.py

@@ -87,7 +87,7 @@ async def get_overview_for_competitor(
  if not competitor:
  raise HTTP_404(f"Couldn't find competitor with the id `{id}`")
 
- return CompetitorOverview(**dict(competitor), results=results, league=league)
+ return CompetitorOverview(**competitor.dict(), results=results, league=league)
 
 
 @router.post("/merge", response_model=Message)

backend/src/routes/events.py

@@ -152,7 +152,7 @@ async def get_results_for_event(
  raise HTTP_404(f"Couldn't find event with the id `{id}`")
 
  return EventWithResults(
- **dict(event),
+ **event.dict(),
  results=assign_position_based_on_time(results or []),
  league=league,
  )

backend/src/routes/leagues.py

@@ -48,7 +48,7 @@
 def competitor_to_league_result(
  competitor: Competitor, number_of_events: int = 0
 ) -> LeagueResult:
- league_result = LeagueResult(**competitor.dict())
+ league_result = LeagueResult.parse_obj(competitor)
  league_result.points = [None] * number_of_events
  return league_result
 
@@ -83,7 +83,10 @@ async def get_league(name: str) -> LeagueOverviewAuthenticated:
  raise HTTP_404(f"Couldn't find league with name `{name}`")
 
  return LeagueOverviewAuthenticated(
- **result.dict(), classes=classes, events=events, groups=groups
+ **result.dict(),
+ classes=classes,
+ events=events,
+ groups=groups,
  )
 
 

backend/src/routes/upload.py

@@ -62,7 +62,8 @@ async def process_upload_file(
  else:
  result.competitor = await Competitors.create(
  NewCompetitor(
- **dict(full_result), competitor_pool=event.competitor_pool
+ **dict(full_result),
+ competitor_pool=event.competitor_pool,
  )
  )