darkstack/LaDOSE
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Quick and Dirty Tournament Result / List

Browse Source
This commit is contained in:
Darkstack
2019-05-30 00:42:12 +02:00
parent 9b148fa571
commit 102a6af8e0
14 changed files with 407 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
LaDOSE.Src/LaDOSE.Api/Controllers/TournamentController.cs
View File

@@ -13,13 +13,12 @@ namespace LaDOSE.Api.Controllers
[Route("api/[controller]")]
public class TournamentController : Controller
{
public IGameService GameService { get; }
private IWordPressService _service;
private ITournamentService _service;
// GET
public TournamentController(IWordPressService service, IGameService gameService)
public TournamentController(ITournamentService service)
{
GameService = gameService;
_service = service;
}
@@ -29,6 +28,21 @@ namespace LaDOSE.Api.Controllers
var tournaments = await _service.GetTournaments(DateTime.Now.AddMonths(-2), null);
return AutoMapper.Mapper.Map<List<TournamentDTO>>(tournaments);
return null;
}
[HttpPost("GetResults")]
public async Task<TournamentsResultDTO> GetResults([FromBody] List<int> ids)
{
if (ids == null)
{
throw new Exception("Invalid arguments");
}
var tournamentsResult = await _service.GetTournamentsResult(ids);
return AutoMapper.Mapper.Map<TournamentsResultDTO>(tournamentsResult);
}
}
}

9
LaDOSE.Src/LaDOSE.Api/Startup.cs
View File

@@ -119,11 +119,15 @@ namespace LaDOSE.Api
cfg.CreateMap<WPUser, LaDOSE.DTO.WPUserDTO>();
cfg.CreateMap<WPUser, LaDOSE.DTO.WPUserDTO>();
cfg.CreateMap<WPEvent, LaDOSE.DTO.WPEventDTO>();
cfg.CreateMap<Result, LaDOSE.DTO.ResultDTO>();
cfg.CreateMap<TournamentsResult, LaDOSE.DTO.TournamentsResultDTO>();
cfg.CreateMap<Participent, LaDOSE.DTO.ParticipentDTO>();
cfg.CreateMap<Tournament, LaDOSE.DTO.TournamentDTO>();
cfg.CreateMap<ApplicationUser, LaDOSE.DTO.ApplicationUserDTO>();
cfg.CreateMap<WPBooking, LaDOSE.DTO.WPBookingDTO>().ForMember(e=>e.Meta,opt=>opt.MapFrom(s=>s.Meta.CleanWpMeta()));
cfg.CreateMapTwoWay<Game, LaDOSE.DTO.GameDTO>();
cfg.CreateMapTwoWay<Participent, LaDOSE.DTO.ParticipentDTO>();
cfg.CreateMapTwoWay<Tournament, LaDOSE.DTO.TournamentDTO>();
cfg.CreateMapTwoWay<Todo, LaDOSE.DTO.TodoDTO>();
});
@@ -139,6 +143,7 @@ namespace LaDOSE.Api
services.AddScoped<ISeasonService, SeasonService>();
services.AddScoped<IWordPressService, WordPressService>();
services.AddScoped<ITodoService, TodoService>();
services.AddScoped<ITournamentService, TournamentService>();
}

7
LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs
View File

@@ -38,8 +38,7 @@ namespace LaDOSE.DesktopApp.ViewModels
var restService = IoC.Get<RestService>();
restService.UpdatedJwtEvent += TokenUpdate;
restService.Connect(uri, user, password);
var wordPressViewModel = new WordPressViewModel(IoC.Get<RestService>());
ActivateItem(wordPressViewModel);
base.OnInitialize();
@@ -52,7 +51,7 @@ namespace LaDOSE.DesktopApp.ViewModels
public BitmapFrame AppIcon { get; set; }
public void LoadEvent()
{
ActivateItem(new WordPressViewModel(IoC.Get<RestService>()));
@@ -64,7 +63,7 @@ namespace LaDOSE.DesktopApp.ViewModels
public void TournamentResult()
{
ActivateItem(new TournamentResultViewModel());
ActivateItem(new TournamentResultViewModel(IoC.Get<RestService>()));
}
}
}

89
LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs
View File

@@ -1,4 +1,10 @@
using Caliburn.Micro;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using Caliburn.Micro;
using LaDOSE.DTO;
using LaDOSE.REST;
namespace LaDOSE.DesktopApp.ViewModels
{
@@ -7,5 +13,86 @@ namespace LaDOSE.DesktopApp.ViewModels
public class TournamentResultViewModel : Screen
{
public override string DisplayName => "Tournament Result";
private RestService RestService { get; set; }
public TournamentResultViewModel(RestService restService)
{
this.RestService = restService;
_selectedTournaments = new ObservableCollection<TournamentDTO>();
Tournaments = new List<TournamentDTO>();
}
private ObservableCollection<TournamentDTO> _selectedTournaments;
private TournamentsResultDTO _results;
public List<TournamentDTO> Tournaments { get; set; }
public TournamentsResultDTO Results
{
get => _results;
set
{
_results = value;
NotifyOfPropertyChange(() => Results);
}
}
public ObservableCollection<TournamentDTO> SelectedTournaments
{
get { return _selectedTournaments; }
set
{
_selectedTournaments = value;
NotifyOfPropertyChange(() => SelectedTournaments);
}
}
private GameDTO _selectedGame;
public GameDTO SelectedGame
{
get { return _selectedGame; }
set
{
_selectedGame = value;
//TODO: QUICK AND DIRTY
var resultForGame = this.Results.Results.Where(e => e.GameId == SelectedGame.Id).ToList();
First = resultForGame.OrderByDescending(e=>e.Point).First().Player;
NotifyOfPropertyChange(() => SelectedGame);
}
}
private String _first;
public String First
{
get { return _first; }
set
{
_first = value;
NotifyOfPropertyChange(() => First);
}
}
protected override void OnInitialize()
{
LoadTournaments();
base.OnInitialize();
}
public void LoadTournaments()
{
var tournamentDtos = this.RestService.GetTournaments().ToList();
this.Tournaments = tournamentDtos;
NotifyOfPropertyChange("Tournaments");
}
public void Select()
{
var tournamentsIds = SelectedTournaments.Select(e => e.Id).ToList();
var resultsDto = this.RestService.GetResults(tournamentsIds);
this.Results = resultsDto;
}
}
}

77
LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml
View File

@@ -13,13 +13,86 @@
d:DesignHeight="450" d:DesignWidth="800">
<Grid Row="2" Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button Grid.Row="0" x:Name="LoadTournaments">Update</Button>
<ListView Grid.Row="1" ItemsSource="{Binding Tournaments}" x:Name="TournamentList" Margin="0,0,0,5"
IsTextSearchEnabled="True" TextSearch.TextPath="Name" behaviors:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding SelectedTournaments}"
SelectionMode="Multiple">
<ListView.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Id}" />
<TextBlock Margin="5,0,0,0" Text="{Binding Name}" />
<TextBlock > - </TextBlock>
<TextBlock Margin="5,0,0,0" Text="{Binding Game.Name}" />
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>
</Grid>
</ListView>
<Grid Row="2">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="2*" />
</Grid.ColumnDefinitions>
<Button Grid.Row="0" Grid.ColumnSpan="3" x:Name="Select">Select</Button>
<StackPanel Grid.Row="1" Grid.ColumnSpan="3" Orientation="Horizontal">
<TextBlock> Jeux :</TextBlock>
<TextBlock Margin="5,0,0,0" Text="{Binding Results.Games.Count}" />
</StackPanel>
<ListView Grid.Row="2" ItemsSource="{Binding Results.Games}" Margin="5,5,5,5"
IsTextSearchEnabled="True" TextSearch.TextPath="Name" SelectedItem="{Binding SelectedGame, UpdateSourceTrigger=PropertyChanged}">
<ListView.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Id}" />
<TextBlock Margin="5,0,0,0" Text="{Binding Name}" />
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal">
<TextBlock> Participents :</TextBlock>
<TextBlock Margin="5,0,0,0" Text="{Binding Results.Participents.Count}" />
</StackPanel>
<ListView Grid.Row="2" Grid.Column="1" ItemsSource="{Binding Results.Participents}" Margin="5,5,5,5"
IsTextSearchEnabled="True" TextSearch.TextPath="Name">
<ListView.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock Margin="5,0,0,0" Text="{Binding Name}" />
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<StackPanel Grid.Row="2" Grid.Column="2">
<TextBlock>Resultat :</TextBlock>
<StackPanel Orientation="Horizontal">
<TextBlock> First : </TextBlock>
<TextBlock Text="{Binding First,UpdateSourceTrigger=PropertyChanged}"> </TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock> Second :</TextBlock>
</StackPanel>
</StackPanel>
</Grid>
</Grid>
</UserControl>

2
LaDOSE.Src/LaDOSE.Entity/Challonge/Tournament.cs
View File

@@ -6,7 +6,7 @@ namespace LaDOSE.Entity.Challonge
{
public int Id { get; set; }
public string Name { get; set; }
public string Game { get; set; }
public Game Game { get; set; }
public List<Participent> Participents { get; set; }
}
}

32
LaDOSE.Src/LaDOSE.Entity/Challonge/TournamentsResult.cs Normal file
View File

@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
namespace LaDOSE.Entity.Challonge
{
public class TournamentsResult
{
public List<Participent> Participents { get; set; }
public List<Game> Games{ get; set; }
public List<Result> Results { get; set; }
}
public class Result
{
public Result(string player, int gameId, int point)
{
Player = player;
GameId = gameId;
Point = point;
}
public Result()
{
}
public int GameId { get; set; }
public string Player { get; set; }
public int Point { get; set; }
}
}

17
LaDOSE.Src/LaDOSE.REST/RestService.cs
View File

@@ -250,7 +250,24 @@ namespace LaDOSE.REST
#endregion
#region Tournaments
public List<TournamentDTO> GetTournaments()
{
CheckToken();
var restRequest = new RestRequest("/api/Tournament/GetTournaments", Method.GET);
var restResponse = Client.Get<List<TournamentDTO>>(restRequest);
return restResponse.Data;
}
public TournamentsResultDTO GetResults(List<int> ids)
{
CheckToken();
return Post<List<int>,TournamentsResultDTO>("Api/Tournament/GetResults", ids);
}
#endregion
}
}

3
LaDOSE.Src/LaDOSE.Service/Interface/IChallongeProvider.cs
View File

@@ -14,6 +14,7 @@ namespace LaDOSE.Business.Interface
Task<ParticipantResult> AddPlayer(int tournamentId, string userName);
Task<List<Tournament>> GetTournaments(DateTime? start, DateTime? end);
Task<List<Participent>> GetParticipents(int tournamentId);
Task<List<Participent>> GetParticipents(int idTournament);
Task<Tournament> GetTournament(int idTournament);
}
}

14
LaDOSE.Src/LaDOSE.Service/Interface/ITournamentService.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using LaDOSE.Entity.Challonge;
namespace LaDOSE.Business.Interface
{
public interface ITournamentService
{
Task<List<Tournament>> GetTournaments(DateTime? start, DateTime? end);
Task<TournamentsResult> GetTournamentsResult(List<int> ids);
}
}

9
LaDOSE.Src/LaDOSE.Service/Interface/IWordPressService.cs
View File

@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks;
using LaDOSE.Entity;
using LaDOSE.Entity.Challonge;
using LaDOSE.Entity.Wordpress;
namespace LaDOSE.Business.Interface
@@ -18,6 +16,7 @@ namespace LaDOSE.Business.Interface
Task<string> GetLastChallonge();
Task<List<Tournament>> GetTournaments(DateTime? start, DateTime? end);
}
}
}

22
LaDOSE.Src/LaDOSE.Service/Provider/ChallongeProvider.cs
View File

@@ -68,21 +68,35 @@ namespace LaDOSE.Business.Provider
return tournaments;
}
public async Task<List<Participent>> GetParticipents(int tournamentId)
public async Task<List<Participent>> GetParticipents(int idTournament)
{
var participentResults = new ParticipantsQuery().call(ApiCaller);
var participentResults = await new ParticipantsQuery(){tournamentID = idTournament }.call(ApiCaller);
List<Participent> participants = new List<Participent>();
participentResults.Result.ForEach(w => participants.Add(new Participent()
participentResults.ForEach(w => participants.Add(new Participent()
{
Id = w.id,
Name = w.name,
Rank = w.final_rank,
IsMember = false,
IsMember = true,
}));
return participants;
}
public async Task<Tournament> GetTournament(int idTournament)
{
var tournamentResult = await new TournamentQuery(idTournament).call(ApiCaller);
return new Tournament()
{
Id = tournamentResult.id,
Name = tournamentResult.name,
Participents = new List<Participent>()
};
}
public async Task<string> GetLastTournament()
{
string dernierTournois = null;

126
LaDOSE.Src/LaDOSE.Service/Service/TournamentService.cs Normal file
View File

@@ -0,0 +1,126 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using LaDOSE.Business.Interface;
using LaDOSE.Entity.Challonge;
using LaDOSE.Entity.Context;
using LaDOSE.Entity.Wordpress;
using Microsoft.EntityFrameworkCore.Internal;
namespace LaDOSE.Business.Service
{
public class TournamentService : ITournamentService
{
private class Rules
{
public int PlayerMin { get; set; }
public int PlayerMax { get; set; }
public int FirstPoint { get; set; }
public int SecondPoint { get; set; }
public int ThirdFourthPoint { get; set; }
public int Top8Point { get; set; }
public int Top16Point { get; set; }
public Rules(int playerMin, int playerMax, int firstPoint, int secondPoint, int thirdFourthPoint, int top8Point, int top16Point)
{
PlayerMin = playerMin;
PlayerMax = playerMax;
FirstPoint = firstPoint;
SecondPoint = secondPoint;
ThirdFourthPoint = thirdFourthPoint;
Top8Point = top8Point;
Top16Point = top16Point;
}
}
private LaDOSEDbContext _context;
private IChallongeProvider _challongeProvider;
private List<Rules> TournamentRules = new List<Rules>()
{
new Rules(0,8,5,3,2,0,0),
new Rules(8,16,8,5,3,2,0),
new Rules(16,32,12,8,5,3,2),
new Rules(32,Int32.MaxValue,18,12,8,5,3),
};
public TournamentService(LaDOSEDbContext context, IChallongeProvider challongeProvider)
{
this._context = context;
this._challongeProvider = challongeProvider;
}
public async Task<List<Tournament>> GetTournaments(DateTime? start, DateTime? end)
{
List<WPUser> wpUsers = _context.WPUser.ToList();
var tournaments = await _challongeProvider.GetTournaments(start, end);
foreach (var tournament in tournaments)
{
List<Participent> participents = await _challongeProvider.GetParticipents(tournament.Id);
tournament.Participents = participents;
}
return tournaments;
}
public async Task<TournamentsResult> GetTournamentsResult(List<int> ids)
{
TournamentsResult result = new TournamentsResult();
result.Results = new List<Result>();
var tournaments = new List<Tournament>();
foreach (var idTournament in ids)
{
var tournament = await _challongeProvider.GetTournament(idTournament);
tournament.Participents = await _challongeProvider.GetParticipents(tournament.Id);
tournaments.Add(tournament);
}
var games = _context.Game.ToList();
var players = _context.WPUser.ToList();
var allParticipent = tournaments.SelectMany(e => e.Participents).Distinct((a, b) => a.Name == b.Name).ToList();
foreach (var participent in allParticipent)
{
var player = players.FirstOrDefault(e => e.Name.Contains(participent.Name));
if (player!=null)
{
participent.IsMember = true;
}
}
result.Participents = allParticipent;
foreach (var tournament in tournaments)
{
var game = games.First(g => tournament.Name.Contains(g.Name));
tournament.Game = game;
var playerCount = tournament.Participents.Count;
var currentRule = TournamentRules.FirstOrDefault(rules =>
rules.PlayerMin < playerCount && rules.PlayerMax >= playerCount
);
if (currentRule == null)
{
throw new Exception("Unable to find rules");
}
var first = tournament.Participents.First(p => p.Rank == 1);
var second = tournament.Participents.First(p => p.Rank == 2);
var thirdFourth = tournament.Participents.Where(p => p.Rank == 3 || p.Rank == 4).ToList();
var Top8 = tournament.Participents.Where(p => p.Rank >4 && p.Rank<9).ToList();
var Top16 = tournament.Participents.Where(p => p.Rank >9 && p.Rank<=16).ToList();
result.Results.Add(new Result(first.Name,tournament.Game.Id,currentRule.FirstPoint));
result.Results.Add(new Result(second.Name,tournament.Game.Id,currentRule.SecondPoint));
thirdFourth.ForEach(r=> result.Results.Add(new Result(r.Name, tournament.Game.Id, currentRule.ThirdFourthPoint)));
Top8.ForEach(r=> result.Results.Add(new Result(r.Name, tournament.Game.Id, currentRule.Top8Point)));
Top16.ForEach(r=> result.Results.Add(new Result(r.Name, tournament.Game.Id, currentRule.Top16Point)));
}
result.Games = tournaments.Select(e => e.Game).ToList();
return result;
}
}
}

13
LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs
View File

@@ -10,7 +10,6 @@ using ChallongeCSharpDriver.Core.Results;
using LaDOSE.Business.Helper;
using LaDOSE.Business.Interface;
using LaDOSE.Entity;
using LaDOSE.Entity.Challonge;
using LaDOSE.Entity.Context;
using LaDOSE.Entity.Wordpress;
using Microsoft.EntityFrameworkCore;
@@ -165,19 +164,9 @@ namespace LaDOSE.Business.Service
var lastTournament = await _challongeProvider.GetLastTournament();
return lastTournament;
}
public async Task<List<Tournament>> GetTournaments(DateTime? start, DateTime? end)
{
var tournaments = await _challongeProvider.GetTournaments(start,end);
foreach (var tournament in tournaments)
{
List<Participent> participents = await _challongeProvider.GetParticipents(tournament.Id);
tournament.Participents = participents;
}
return tournaments;
}
private string FormatCurrentEventName(string currentEventName)
{