From eb3eb3e7794c6f456a3462027cdfcf34a71e7ace Mon Sep 17 00:00:00 2001 From: Darkstack <1835601+darkstack@users.noreply.github.com> Date: Sun, 20 Mar 2022 21:10:20 +0100 Subject: [PATCH] Calculate the results from the Agnostic data structure --- .../LaDOSE.Entity/Context/LaDOSEDbContext.cs | 7 ++ LaDOSE.Src/LaDOSE.REST/RestService.cs | 2 +- .../ChallongProvider/ChallongeProvider.cs | 4 +- .../Service/ExternalProviderService.cs | 106 ++++++++++++++++-- .../LaDOSE.Service/Service/PlayerService.cs | 12 +- 5 files changed, 119 insertions(+), 12 deletions(-) diff --git a/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs b/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs index 47f9574..fdf2402 100644 --- a/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs +++ b/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs @@ -65,6 +65,13 @@ namespace LaDOSE.Entity.Context .HasForeignKey(pt => pt.TournamentId) ; + modelBuilder.Entity() + .HasOne(e => e.Tournament) + .WithMany(e => e.Results) + .HasForeignKey(pt => pt.TournamentId); + + + //modelBuilder.Entity() // .HasOne(e => e.Player1) // .WithMany(e => e.Sets) diff --git a/LaDOSE.Src/LaDOSE.REST/RestService.cs b/LaDOSE.Src/LaDOSE.REST/RestService.cs index f95c89a..e3d3fb4 100644 --- a/LaDOSE.Src/LaDOSE.REST/RestService.cs +++ b/LaDOSE.Src/LaDOSE.REST/RestService.cs @@ -30,7 +30,7 @@ namespace LaDOSE.REST { Client = new RestClient(url); #if DEBUG - Client.Timeout = 99*1000; + Client.Timeout = 999*1000; #endif this.username = user; this.password = password; diff --git a/LaDOSE.Src/LaDOSE.Service/Provider/ChallongProvider/ChallongeProvider.cs b/LaDOSE.Src/LaDOSE.Service/Provider/ChallongProvider/ChallongeProvider.cs index 68cf4a4..ff2c7dc 100644 --- a/LaDOSE.Src/LaDOSE.Service/Provider/ChallongProvider/ChallongeProvider.cs +++ b/LaDOSE.Src/LaDOSE.Service/Provider/ChallongProvider/ChallongeProvider.cs @@ -252,10 +252,10 @@ namespace LaDOSE.Business.Provider.ChallongProvider { currentevent.Tournaments = new List(); } - var currentTournament = currentevent.Tournaments.FirstOrDefault(e => e.Name == eventGame); + var currentTournament = currentevent.Tournaments.FirstOrDefault(e => e.Name.Contains($"Ranking {eventGame}")); if (currentTournament == null) { - currentTournament = new Tournament(eventGame, tournament.Result.ChallongeId, null) + currentTournament = new Tournament($"Ranking {eventGame}", tournament.Result.ChallongeId, null) { GameId = GameService.GetIdByName(eventGame) }; diff --git a/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs b/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs index a4dc40a..2dee64e 100644 --- a/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs +++ b/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs @@ -158,7 +158,7 @@ namespace LaDOSE.Business.Service } - public async Task ParseSmash(string tournamentSlug) + public async Task ParseSmash(string tournamentSlug) { Event eventExist = GetBySlug(tournamentSlug); if (eventExist == null) @@ -176,14 +176,16 @@ namespace LaDOSE.Business.Service //POKEMON. catch (Exception e) { - return false; + throw new Exception("FUCK !"); } - return true; - } - else - { - throw new Exception("Already Exist"); + return currentEvent; } + //else + //{ + // throw new Exception("Already Exist"); + //} + //NEED TO UPDATE + return eventExist; } @@ -195,7 +197,12 @@ namespace LaDOSE.Business.Service public async Task GetSmashResult(string tournamentSlug) { var parse = await this.ParseSmash(tournamentSlug); - + var test = await GetEventResult(parse.Id); + if (test.Results != null) + { + var test2 = test.Games.Count(); + } + return test; var tournaments = await _smashProvider.GetTournament(tournamentSlug); var players = tournaments.Tournament.Events.Where(e => e.standings != null).SelectMany(e => e.standings.nodes.Select(e => e.player)).ToList(); var distinctp = players.DistinctBy(e => new { e.user.id }).ToList(); @@ -329,5 +336,88 @@ namespace LaDOSE.Business.Service { return this._context.ChallongeTournament.Any(e => e.ChallongeId == idTournament); } + + public async Task GetEventResult(int id) + { + + Event cevent = _context.Event.Include(e=>e.Tournaments).ThenInclude(t=>t.Results).ThenInclude(e=>e.Player).FirstOrDefault(e => e.Id == id); + var players = cevent.Tournaments.SelectMany(e => e.Results.Select(e => e.Player)).Distinct().ToList(); + var games = _context.Game.ToList(); + + TournamentsResult result = new TournamentsResult(); + result.Results = new List(); + result.Games = new List(); + result.Participents = new List(); + players.ForEach(e => + { + var x = new ChallongeParticipent() + { + Name = e.Gamertag, + ChallongeId = e.Id, + Id = e.Id + }; + result.Participents.Add(x); + }); + games.ForEach(e => + { + e.Id = e.SmashId ?? e.Id; + result.Games.Add(e); + }); + + foreach (var tournament in cevent.Tournaments.Where(e => e.Results != null && e.Results.Any()).ToList()) + { + + var tplayer = tournament.Results.Select(e => e.Player).ToList(); + var playerCount = tplayer.Count(); + var lesSacs = tplayer; + var currentRule = TournamentRules.FirstOrDefault(rules => + rules.PlayerMin < playerCount && rules.PlayerMax >= playerCount + ); + if (currentRule == null) + { + throw new Exception("Unable to find rules"); + } + + var first = tournament.Results.First(p => p.Rank == 1); + var second = tournament.Results.First(p => p.Rank == 2); + var thirdFourth = tournament.Results.Where(p => p.Rank == 3 || p.Rank == 4).ToList(); + var Top8 = tournament.Results.Where(p => p.Rank > 4 && p.Rank < 9).ToList(); + var Top16 = tournament.Results.Where(p => p.Rank > 8 && p.Rank <= 16).ToList(); + + result.Results.Add(new Result(first.Player.Gamertag, tournament.Game.Id, tournament.Id, tournament.Name, currentRule.FirstPoint, first.Rank)); + lesSacs.Remove(first.Player); + result.Results.Add(new Result(second.Player.Gamertag, tournament.Game.Id, tournament.Id, tournament.Name, currentRule.SecondPoint, second.Rank)); + lesSacs.Remove(second.Player); + thirdFourth.ForEach(r => + result.Results.Add(new Result(r.Player.Gamertag, tournament.Game.Id, tournament.Id, tournament.Name, + currentRule.ThirdFourthPoint, r.Rank))); + thirdFourth.ForEach(p => lesSacs.Remove(p.Player)); + if (currentRule.Top8Point != 0) + { + Top8.ForEach(r => + result.Results.Add(new Result(r.Player.Gamertag, tournament.Game.Id, tournament.Id, tournament.Name, + currentRule.ThirdFourthPoint, r.Rank))); + Top8.ForEach(p => lesSacs.Remove(p.Player)); + } + + if (currentRule.Top16Point != 0) + { + Top16.ForEach(r => + result.Results.Add( + new Result(r.Player.Gamertag, tournament.Game.Id, tournament.Id, tournament.Name, + currentRule.ThirdFourthPoint, r.Rank))); + Top16.ForEach(p => lesSacs.Remove(p.Player)); + } + + lesSacs.ForEach(r => + result.Results.Add(new Result(r.Gamertag, tournament.Game.Id, tournament.Id, tournament.Name, + currentRule.ThirdFourthPoint, tournament.Results.FirstOrDefault(e=>e.Player == r)?.Rank??999))); + + } + + System.Diagnostics.Trace.WriteLine(result.Results); + + return await Task.FromResult(result); + } } } \ No newline at end of file diff --git a/LaDOSE.Src/LaDOSE.Service/Service/PlayerService.cs b/LaDOSE.Src/LaDOSE.Service/Service/PlayerService.cs index 59564dc..8c84a0a 100644 --- a/LaDOSE.Src/LaDOSE.Service/Service/PlayerService.cs +++ b/LaDOSE.Src/LaDOSE.Service/Service/PlayerService.cs @@ -20,8 +20,18 @@ namespace LaDOSE.Business.Service //var p2 = _context.Player.ToList(); var p = _context.Player.FirstOrDefault(e => e.SmashId == participantUser.user.id); + if (p == null) { + p = _context.Player.FirstOrDefault(e => e.Gamertag.ToUpper() == participantUser.gamerTag.ToUpper()); + if (p != null) + { + if (p.SmashId == null) + { + p.SmashId = participantUser.user.id; + } + return p.Id; + } var entity = new Player() { Gamertag = participantUser.gamerTag, @@ -49,7 +59,7 @@ namespace LaDOSE.Business.Service { challongeParticipent.Name = "UNKNOWPLAYER"; } - var p = _context.Player.FirstOrDefault(e => e.Gamertag == challongeParticipent.Name); + var p = _context.Player.FirstOrDefault(e => e.Gamertag.ToUpper() == challongeParticipent.Name.ToUpper()); if (p == null) { var entity = new Player()