Update viewmodel types

gordon-cs · Jul 3, 2024 · ecaa92d · ecaa92d
1 parent af777bb
commit ecaa92d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/Gordon360/Controllers/RecIM/SeriesController.cs b/Gordon360/Controllers/RecIM/SeriesController.cs
@@ -224,7 +224,7 @@ public async Task<ActionResult<SeriesAutoSchedulerEstimateViewModel>> GetAutoSch
  /// <param name="seriesID"></param>
  [HttpGet]
  [Route("{seriesID}/bracket")]
- public ActionResult<IEnumerable<MatchBracketViewModel>> GetBracket(int seriesID)
+ public ActionResult<IEnumerable<MatchBracketExtendedViewModel>> GetBracket(int seriesID)
  {
  var res = seriesService.GetSeriesBracketInformation(seriesID);
  return Ok(res);

diff --git a/Gordon360/Services/RecIM/SeriesService.cs b/Gordon360/Services/RecIM/SeriesService.cs
@@ -1680,7 +1680,7 @@ private async Task<IEnumerable<MatchBracketViewModel>> CreateEliminationBracket(
  return res;
  }
 
- public IEnumerable<MatchBracketViewModel> GetSeriesBracketInformation(int seriesID)
+ public IEnumerable<MatchBracketExtendedViewModel> GetSeriesBracketInformation(int seriesID)
  {
  /**
  * TODO
@@ -1691,7 +1691,15 @@ public IEnumerable<MatchBracketViewModel> GetSeriesBracketInformation(int series
  var match = context.Match
  .Include(m => m.MatchBracket)
  .Where(m => m.SeriesID == seriesID && m.StatusID != 0)
- .Select(m => (MatchBracketViewModel)m.MatchBracket)
+ .Select(m => new MatchBracketViewModel
+ {
+ MatchID = m.MatchBracket.MatchID,
+ RoundNumber = m.MatchBracket.RoundNumber,
+ RoundOf = m.MatchBracket.RoundOf,
+ SeedIndex = m.MatchBracket.SeedIndex,
+ IsLosers = m.MatchBracket.IsLosers,
+ StartTime = m.StartTime
+ })
  .AsEnumerable()
  .OrderBy(mb => mb.RoundNumber)
  .ThenBy(mb => mb.SeedIndex);
@@ -1749,6 +1757,7 @@ public IEnumerable<MatchBracketViewModel> GetSeriesBracketInformation(int series
  State = state,
  SeedIndex = m.SeedIndex,
  IsLosers = m.IsLosers,
+ StartTime = m.StartTime,
  Team = teamList
  });
  i++;
@@ -1764,6 +1773,7 @@ public IEnumerable<MatchBracketViewModel> GetSeriesBracketInformation(int series
  State = "WALK_OVER",
  SeedIndex = j,
  IsLosers = m.IsLosers,
+ StartTime = m.StartTime,
  Team = Enumerable.Empty<TeamBracketExtendedViewModel>()
  });
  }
@@ -1786,10 +1796,7 @@ public IEnumerable<MatchBracketViewModel> GetSeriesBracketInformation(int series
  }
 
 
- return context.Match
- .Include(m => m.MatchBracket)
- .Where(m => m.SeriesID == seriesID && m.StatusID != 0)
- .Select(m => (MatchBracketViewModel) m.MatchBracket);
+ return combinedList;
  }
 
  public async Task<EliminationRound> ScheduleElimRoundAsync(IEnumerable<Match>? matches)

diff --git a/Gordon360/Services/ServiceInterfaces.cs b/Gordon360/Services/ServiceInterfaces.cs
@@ -281,7 +281,7 @@ public interface ISeriesService
  Task<IEnumerable<MatchViewModel>?> ScheduleMatchesAsync(int seriesID, UploadScheduleRequest request);
  SeriesAutoSchedulerEstimateViewModel GetScheduleMatchesEstimateAsync(int seriesID, UploadScheduleRequest request);
  SeriesScheduleExtendedViewModel GetSeriesScheduleByID(int seriesID);
- IEnumerable<MatchBracketViewModel> GetSeriesBracketInformation(int seriesID);
+ IEnumerable<MatchBracketExtendedViewModel> GetSeriesBracketInformation(int seriesID);
  Task<TeamRecordViewModel> UpdateSeriesTeamRecordAsync(int seriesID, TeamRecordPatchViewModel teamRecord);
  }