Start of the Structure of event not tied to Challonge or smash.
Lads und Canzer \o>
This commit is contained in:
@@ -18,12 +18,12 @@ namespace LaDOSE.Api.Controllers
|
|||||||
public class SmashController : Controller
|
public class SmashController : Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
private ITournamentService _service;
|
private IEventService _service;
|
||||||
|
|
||||||
private IMapper _mapper;
|
private IMapper _mapper;
|
||||||
|
|
||||||
// GET
|
// GET
|
||||||
public SmashController(IMapper mapper, ITournamentService service)
|
public SmashController(IMapper mapper, IEventService service)
|
||||||
{
|
{
|
||||||
_mapper = mapper;
|
_mapper = mapper;
|
||||||
_service = service;
|
_service = service;
|
||||||
@@ -36,6 +36,7 @@ namespace LaDOSE.Api.Controllers
|
|||||||
{
|
{
|
||||||
if (!String.IsNullOrEmpty(tournamentSlug))
|
if (!String.IsNullOrEmpty(tournamentSlug))
|
||||||
{
|
{
|
||||||
|
|
||||||
var tournaments = await _service.GetSmashResult(tournamentSlug);
|
var tournaments = await _service.GetSmashResult(tournamentSlug);
|
||||||
|
|
||||||
return Ok(tournaments);
|
return Ok(tournaments);
|
||||||
@@ -43,8 +44,19 @@ namespace LaDOSE.Api.Controllers
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
[HttpGet("AddTournament/{tournamentSlug}")]
|
||||||
|
public async Task<IActionResult> AddSmashTournament(string tournamentSlug)
|
||||||
|
{
|
||||||
|
if (!String.IsNullOrEmpty(tournamentSlug))
|
||||||
|
{
|
||||||
|
var tournaments = await _service.GetSmashResult2(tournamentSlug);
|
||||||
|
|
||||||
|
return Ok(tournaments);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
50
LaDOSE.Src/LaDOSE.Api/Controllers/TestController.cs
Normal file
50
LaDOSE.Src/LaDOSE.Api/Controllers/TestController.cs
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using AutoMapper;
|
||||||
|
using LaDOSE.Business.Interface;
|
||||||
|
using LaDOSE.DTO;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
namespace LaDOSE.Api.Controllers
|
||||||
|
{
|
||||||
|
#if DEBUG
|
||||||
|
[AllowAnonymous]
|
||||||
|
#endif
|
||||||
|
[Produces("application/json")]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
public class TestController : Controller
|
||||||
|
{
|
||||||
|
|
||||||
|
private IEventService _service;
|
||||||
|
|
||||||
|
private IMapper _mapper;
|
||||||
|
|
||||||
|
// GET
|
||||||
|
public TestController(IMapper mapper, IEventService service)
|
||||||
|
{
|
||||||
|
_mapper = mapper;
|
||||||
|
_service = service;
|
||||||
|
}
|
||||||
|
//This may be a get , but i dont know what the RFC State for Get request with Body
|
||||||
|
//As i don't like to populate GET request with body this will be a post (and i think
|
||||||
|
//it will be easier to proxy.
|
||||||
|
[HttpGet("Test/{tournamentSlug}")]
|
||||||
|
public async Task<IActionResult> GetSmashTournament(string tournamentSlug)
|
||||||
|
{
|
||||||
|
if (!String.IsNullOrEmpty(tournamentSlug))
|
||||||
|
{
|
||||||
|
var tournaments = await _service.GetSmashResult(tournamentSlug);
|
||||||
|
|
||||||
|
return Ok(tournaments);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,12 +15,12 @@ namespace LaDOSE.Api.Controllers
|
|||||||
public class TournamentController : Controller
|
public class TournamentController : Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
private ITournamentService _service;
|
private IEventService _service;
|
||||||
|
|
||||||
private IMapper _mapper;
|
private IMapper _mapper;
|
||||||
|
|
||||||
// GET
|
// GET
|
||||||
public TournamentController(IMapper mapper,ITournamentService service)
|
public TournamentController(IMapper mapper, IEventService service)
|
||||||
{
|
{
|
||||||
_mapper = mapper;
|
_mapper = mapper;
|
||||||
_service = service;
|
_service = service;
|
||||||
@@ -49,6 +49,7 @@ namespace LaDOSE.Api.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
var tournamentsResult = await _service.GetTournamentsResult(ids);
|
var tournamentsResult = await _service.GetTournamentsResult(ids);
|
||||||
|
|
||||||
return _mapper.Map<TournamentsResultDTO>(tournamentsResult);
|
return _mapper.Map<TournamentsResultDTO>(tournamentsResult);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,14 +143,16 @@ namespace LaDOSE.Api
|
|||||||
{
|
{
|
||||||
|
|
||||||
services.AddTransient<IChallongeProvider>(p => new ChallongeProvider(this.Configuration["ApiKey:ChallongeApiKey"]));
|
services.AddTransient<IChallongeProvider>(p => new ChallongeProvider(this.Configuration["ApiKey:ChallongeApiKey"]));
|
||||||
services.AddTransient<ISmashProvider>(p => new SmashProvider(this.Configuration["ApiKey:SmashApiKey"]));
|
|
||||||
services.AddScoped<IUserService, UserService>();
|
services.AddScoped<IUserService, UserService>();
|
||||||
services.AddScoped<IGameService, GameService>();
|
services.AddScoped<IGameService, GameService>();
|
||||||
services.AddScoped<IEventService, EventService>();
|
services.AddScoped<IEventService, EventService>();
|
||||||
services.AddScoped<IWordPressService, WordPressService>();
|
services.AddScoped<IWordPressService, WordPressService>();
|
||||||
services.AddScoped<ITodoService, TodoService>();
|
services.AddScoped<ITodoService, TodoService>();
|
||||||
services.AddScoped<ITournamentService, TournamentService>();
|
services.AddScoped<IEventService, EventService>();
|
||||||
|
services.AddScoped<IPlayerService, PlayerService>();
|
||||||
|
services.AddScoped<ISmashProvider>(p => new SmashProvider(p.GetRequiredService<IGameService>(), p.GetRequiredService<IPlayerService>(), this.Configuration["ApiKey:SmashApiKey"]));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -179,6 +179,7 @@ namespace LaDOSE.DesktopApp.ViewModels
|
|||||||
this.RestService = restService;
|
this.RestService = restService;
|
||||||
_selectedTournaments = new ObservableCollection<TournamentDTO>();
|
_selectedTournaments = new ObservableCollection<TournamentDTO>();
|
||||||
Tournaments = new List<TournamentDTO>();
|
Tournaments = new List<TournamentDTO>();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -187,6 +188,7 @@ namespace LaDOSE.DesktopApp.ViewModels
|
|||||||
this.To = DateTime.Now;
|
this.To = DateTime.Now;
|
||||||
this.From = DateTime.Now.AddMonths(-1);
|
this.From = DateTime.Now.AddMonths(-1);
|
||||||
this.SelectRegex = "Ranking";
|
this.SelectRegex = "Ranking";
|
||||||
|
this.Slug = "ranking-1001";
|
||||||
LoadTournaments();
|
LoadTournaments();
|
||||||
base.OnInitialize();
|
base.OnInitialize();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,15 +40,23 @@ namespace LaDOSE.Entity.Context
|
|||||||
|
|
||||||
|
|
||||||
base.OnModelCreating(modelBuilder);
|
base.OnModelCreating(modelBuilder);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//modelBuilder.Entity<Event>()
|
|
||||||
// .HasOne(s => s.Season)
|
|
||||||
// .WithMany(p => p.Event)
|
|
||||||
// .HasForeignKey(fk => fk.SeasonId);
|
|
||||||
|
|
||||||
|
|
||||||
|
modelBuilder.Entity<Event>()
|
||||||
|
.HasMany(s => s.Tournaments);
|
||||||
|
|
||||||
|
|
||||||
|
modelBuilder.Entity<Tournament>()
|
||||||
|
.HasOne(e => e.Game)
|
||||||
|
.WithMany(e=>e.Tournaments)
|
||||||
|
.HasForeignKey(pt=>pt.GameId)
|
||||||
|
;
|
||||||
|
modelBuilder.Entity<Tournament>()
|
||||||
|
.HasOne(e => e.Event)
|
||||||
|
.WithMany(e => e.Tournaments)
|
||||||
|
.HasForeignKey(pt => pt.EventId)
|
||||||
|
;
|
||||||
|
|
||||||
//#region SeasonGame
|
//#region SeasonGame
|
||||||
//modelBuilder.Entity<SeasonGame>()
|
//modelBuilder.Entity<SeasonGame>()
|
||||||
@@ -67,7 +75,7 @@ namespace LaDOSE.Entity.Context
|
|||||||
|
|
||||||
//#region EventGame
|
//#region EventGame
|
||||||
|
|
||||||
//modelBuilder.Entity<EventGame>()
|
//modelBuilder.Entity<T>()
|
||||||
// .HasKey(t => new { t.EventId, t.GameId });
|
// .HasKey(t => new { t.EventId, t.GameId });
|
||||||
|
|
||||||
//modelBuilder.Entity<EventGame>()
|
//modelBuilder.Entity<EventGame>()
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ namespace LaDOSE.Entity
|
|||||||
public int? SmashId { get; set; }
|
public int? SmashId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
public List<Tournament> Tournaments { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
using System.Security.Cryptography.X509Certificates;
|
using System.Security.Cryptography.X509Certificates;
|
||||||
|
|
||||||
namespace LaDOSE.Entity
|
namespace LaDOSE.Entity
|
||||||
@@ -11,19 +12,13 @@ namespace LaDOSE.Entity
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public Player(string name, int? challongeId, int? smashId)
|
|
||||||
{
|
|
||||||
this.Name = name;
|
|
||||||
ChallongeId = challongeId;
|
|
||||||
SmashId = smashId;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public String Gamertag { get; set; }
|
||||||
public String SmashName { get; set; }
|
|
||||||
public String Name { get; set; }
|
public String Name { get; set; }
|
||||||
public int? ChallongeId {get;set;}
|
public int? ChallongeId {get;set;}
|
||||||
public int? SmashId {get;set;}
|
public int? SmashId {get;set;}
|
||||||
|
|
||||||
|
[NotMapped]
|
||||||
public Boolean IsChallonge => ChallongeId.HasValue;
|
public Boolean IsChallonge => ChallongeId.HasValue;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
public int PlayerId { get; set; }
|
public int PlayerId { get; set; }
|
||||||
public Player Player { get; set; }
|
public Player Player { get; set; }
|
||||||
public int IdTournament { get; set; }
|
public int TournamentId { get; set; }
|
||||||
public Tournament Tournament{ get; set; }
|
public Tournament Tournament{ get; set; }
|
||||||
public int Point { get; set; }
|
public int Point { get; set; }
|
||||||
public int Rank { get; set; }
|
public int Rank { get; set; }
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace LaDOSE.Entity
|
namespace LaDOSE.Entity
|
||||||
{
|
{
|
||||||
@@ -15,11 +17,18 @@ namespace LaDOSE.Entity
|
|||||||
SmashId = smashId;
|
SmashId = smashId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int EventId { get; set; }
|
||||||
|
public Event Event { get; set; }
|
||||||
public String Name { get; set; }
|
public String Name { get; set; }
|
||||||
public int ChallongeId {get;set;}
|
public int ChallongeId {get;set;}
|
||||||
public int SmashId {get;set;}
|
public int SmashId {get;set;}
|
||||||
public int? GameId {get;set;}
|
public int? GameId {get;set;}
|
||||||
public Game Game { get; set; }
|
public Game Game { get; set; }
|
||||||
|
|
||||||
|
public List<Result> Results { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -250,7 +250,18 @@ namespace LaDOSE.REST
|
|||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
#region Tournaments
|
||||||
|
|
||||||
|
public TournamentsResultDTO Test(string test)
|
||||||
|
{
|
||||||
|
CheckToken();
|
||||||
|
var restRequest = new RestRequest($"Api/Test/Test/{test}", Method.GET);
|
||||||
|
var restResponse = Client.Get<TournamentsResultDTO>(restRequest);
|
||||||
|
return restResponse.Data;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
#region Tournaments
|
#region Tournaments
|
||||||
|
|
||||||
public List<TournamentDTO> GetTournaments(TimeRangeDTO timeRange)
|
public List<TournamentDTO> GetTournaments(TimeRangeDTO timeRange)
|
||||||
|
|||||||
@@ -1,12 +1,21 @@
|
|||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using LaDOSE.Entity;
|
using LaDOSE.Entity;
|
||||||
|
using LaDOSE.Entity.Challonge;
|
||||||
using LaDOSE.Entity.Wordpress;
|
using LaDOSE.Entity.Wordpress;
|
||||||
|
|
||||||
namespace LaDOSE.Business.Interface
|
namespace LaDOSE.Business.Interface
|
||||||
{
|
{
|
||||||
public interface IEventService : IBaseService<Event>
|
public interface IEventService : IBaseService<Event>
|
||||||
{
|
{
|
||||||
|
Task<List<ChallongeTournament>> GetTournaments(DateTime? start, DateTime? end);
|
||||||
|
|
||||||
|
Task<TournamentsResult> GetTournamentsResult(List<int> ids);
|
||||||
|
Task<TournamentsResult> GetSmashResult(string tournamentSlug);
|
||||||
|
|
||||||
|
Task<TournamentsResult> GetSmashResult2(string tournamentSlug);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,5 +6,6 @@ namespace LaDOSE.Business.Interface
|
|||||||
public interface IGameService : IBaseService<Game>
|
public interface IGameService : IBaseService<Game>
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
10
LaDOSE.Src/LaDOSE.Service/Interface/IPlayerService.cs
Normal file
10
LaDOSE.Src/LaDOSE.Service/Interface/IPlayerService.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
using LaDOSE.Business.Provider.SmashProvider;
|
||||||
|
using LaDOSE.Entity;
|
||||||
|
|
||||||
|
namespace LaDOSE.Business.Interface
|
||||||
|
{
|
||||||
|
public interface IPlayerService : IBaseService<Player>
|
||||||
|
{
|
||||||
|
int GetBySmash(PlayerType playerUser);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
using LaDOSE.Entity;
|
|
||||||
|
|
||||||
namespace LaDOSE.Business.Interface
|
|
||||||
{
|
|
||||||
//public interface ISeasonService : IBaseService<Season>
|
|
||||||
//{
|
|
||||||
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
@@ -2,14 +2,19 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using LaDOSE.Business.Provider.SmashProvider;
|
using LaDOSE.Business.Provider.SmashProvider;
|
||||||
|
using LaDOSE.Entity;
|
||||||
using LaDOSE.Entity.Challonge;
|
using LaDOSE.Entity.Challonge;
|
||||||
|
|
||||||
namespace LaDOSE.Business.Interface
|
namespace LaDOSE.Business.Interface
|
||||||
{
|
{
|
||||||
public interface ISmashProvider
|
public interface ISmashProvider
|
||||||
{
|
{
|
||||||
Task<List<ChallongeTournament>> GetTournaments(DateTime? start, DateTime? end);
|
Task<Event> GetEvent(string slug);
|
||||||
Task<ResponseType> GetTournament(string sludge);
|
Task<List<Tournament>> GetResults(ref List<Tournament> tournaments);
|
||||||
|
Task<Event> ParseEvent(string slug);
|
||||||
|
Task<TournamentResponse> GetTournament(string sludge);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using LaDOSE.Business.Provider.SmashProvider;
|
|
||||||
using LaDOSE.Entity.Challonge;
|
|
||||||
|
|
||||||
namespace LaDOSE.Business.Interface
|
|
||||||
{
|
|
||||||
public interface ITournamentService
|
|
||||||
{
|
|
||||||
Task<List<ChallongeTournament>> GetTournaments(DateTime? start, DateTime? end);
|
|
||||||
|
|
||||||
Task<TournamentsResult> GetTournamentsResult(List<int> ids);
|
|
||||||
Task<TournamentsResult> GetSmashResult(string tournamentSlug);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,59 +1,198 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using GraphQL;
|
using GraphQL;
|
||||||
using GraphQL.Client.Http;
|
using GraphQL.Client.Http;
|
||||||
using GraphQL.Client.Serializer.Newtonsoft;
|
using GraphQL.Client.Serializer.Newtonsoft;
|
||||||
using LaDOSE.Business.Interface;
|
using LaDOSE.Business.Interface;
|
||||||
|
using LaDOSE.Business.Service;
|
||||||
|
using LaDOSE.Entity;
|
||||||
using LaDOSE.Entity.Challonge;
|
using LaDOSE.Entity.Challonge;
|
||||||
|
using Result = LaDOSE.Entity.Result;
|
||||||
|
|
||||||
namespace LaDOSE.Business.Provider.SmashProvider
|
namespace LaDOSE.Business.Provider.SmashProvider
|
||||||
{
|
{
|
||||||
public class SmashProvider : ISmashProvider
|
public class SmashProvider : ISmashProvider
|
||||||
{
|
{
|
||||||
public string ApiKey { get; set; }
|
public string ApiKey { get; set; }
|
||||||
public SmashProvider(string apiKey)
|
//public SmashProvider(string apiKey)
|
||||||
|
//{
|
||||||
|
// this.ApiKey = apiKey;
|
||||||
|
//}
|
||||||
|
public SmashProvider(IGameService gameService, IPlayerService playerService, string apiKey)
|
||||||
{
|
{
|
||||||
this.ApiKey = apiKey;
|
this.ApiKey = apiKey;
|
||||||
|
this.GameService = gameService;
|
||||||
|
this.PlayerService = playerService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<List<ChallongeTournament>> GetTournaments(DateTime? start, DateTime? end)
|
public IPlayerService PlayerService { get; set; }
|
||||||
{
|
|
||||||
var list = new List<ChallongeTournament>();
|
|
||||||
var personAndFilmsRequest = new GraphQLRequest
|
|
||||||
{
|
|
||||||
Query = @"
|
|
||||||
query TournamentsByOwner($perPage: Int!, $ownerId: ID!) {
|
|
||||||
tournaments(query: {
|
|
||||||
perPage: $perPage
|
|
||||||
filter: {
|
|
||||||
ownerId: $ownerId
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
nodes {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
slug
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}",
|
|
||||||
|
|
||||||
OperationName = "PersonAndFilms",
|
public IGameService GameService { get; set; }
|
||||||
|
|
||||||
|
private async Task<T> QuerySmash<T>(GraphQLRequest req)
|
||||||
|
{
|
||||||
|
var graphQLClient = new GraphQLHttpClient("https://api.smash.gg/gql/alpha", new NewtonsoftJsonSerializer());
|
||||||
|
graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
|
||||||
|
|
||||||
|
var graphQLResponse = await graphQLClient.SendQueryAsync<T>(req);
|
||||||
|
if (graphQLResponse.Errors != null)
|
||||||
|
{
|
||||||
|
//EventType not done ?
|
||||||
|
//throw new Exception("Error");
|
||||||
|
}
|
||||||
|
|
||||||
|
return graphQLResponse.Data;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Event> GetEvent(string slug)
|
||||||
|
{
|
||||||
|
|
||||||
|
var query = new GraphQLRequest
|
||||||
|
{
|
||||||
|
Query = @"query TournamentQuery($slug: String) {
|
||||||
|
tournament(slug: $slug){
|
||||||
|
id
|
||||||
|
name,
|
||||||
|
startAt,
|
||||||
|
events {
|
||||||
|
id
|
||||||
|
name,
|
||||||
|
state,
|
||||||
|
videogame {
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
displayName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}",
|
||||||
|
OperationName = "TournamentQuery",
|
||||||
Variables = new
|
Variables = new
|
||||||
{
|
{
|
||||||
|
slug = slug,
|
||||||
ownerId = "161429",
|
|
||||||
perPage = "4"
|
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
var games = GameService.GetAll();
|
||||||
|
var querySmash = QuerySmash<TournamentResponse>(query);
|
||||||
|
List<Tournament> tournaments = querySmash.Result.Tournament.Events.Select(e => new Tournament()
|
||||||
|
{
|
||||||
|
Name = e.name,
|
||||||
|
SmashId = e.id,
|
||||||
|
Game = games.FirstOrDefault(g => g.SmashId == e.videogame.id)
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
|
return new Event
|
||||||
|
{
|
||||||
|
Name = querySmash.Result.Tournament.Name,
|
||||||
|
SmashId = querySmash.Result.Tournament.id,
|
||||||
|
Date = querySmash.Result.Tournament.startAt,
|
||||||
|
Tournaments = tournaments,
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
return Task.FromResult(list);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<ResponseType> GetTournament(string slug)
|
public Task<List<Tournament>> GetResults(ref List<Tournament> tournaments)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
foreach (var tournament in tournaments)
|
||||||
|
{
|
||||||
|
var query = new GraphQLRequest
|
||||||
|
{
|
||||||
|
Query = @"query EventQuery($event: ID,$page:Int) {
|
||||||
|
event(id: $event){
|
||||||
|
standings(query: {page:$page,perPage:20}){
|
||||||
|
pageInfo {
|
||||||
|
total
|
||||||
|
totalPages
|
||||||
|
page
|
||||||
|
perPage
|
||||||
|
sortBy
|
||||||
|
filter
|
||||||
|
},
|
||||||
|
nodes{
|
||||||
|
id,
|
||||||
|
player{
|
||||||
|
id,
|
||||||
|
gamerTag,
|
||||||
|
user {
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
player {
|
||||||
|
id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
placement
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}",
|
||||||
|
OperationName = "EventQuery",
|
||||||
|
Variables = new
|
||||||
|
{
|
||||||
|
page = 1,
|
||||||
|
@event = tournament.SmashId,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var querySmash = QuerySmash<EventResponse>(query);
|
||||||
|
|
||||||
|
if (querySmash.Result.Event.standings.nodes != null)
|
||||||
|
{
|
||||||
|
var standings = querySmash.Result.Event.standings.nodes;
|
||||||
|
if (querySmash.Result.Event.standings.pageInfo.totalPages > 1)
|
||||||
|
{
|
||||||
|
while (querySmash.Result.Event.standings.pageInfo.page <
|
||||||
|
querySmash.Result.Event.standings.pageInfo.totalPages)
|
||||||
|
{
|
||||||
|
query.Variables = new
|
||||||
|
{
|
||||||
|
page = querySmash.Result.Event.standings.pageInfo.page,
|
||||||
|
eventsId = tournament.SmashId,
|
||||||
|
};
|
||||||
|
querySmash = QuerySmash<EventResponse>(query);
|
||||||
|
standings.AddRange(querySmash.Result.Event.standings.nodes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var res= standings.Select(x => new Result()
|
||||||
|
{
|
||||||
|
Tournament = tournament,
|
||||||
|
TournamentId = tournament.Id,
|
||||||
|
|
||||||
|
PlayerId = PlayerService.GetBySmash(x.player),
|
||||||
|
Rank = x.placement
|
||||||
|
}).ToList();
|
||||||
|
tournament.Results = res;
|
||||||
|
}
|
||||||
|
|
||||||
|
//tournament.Results.AddRange();
|
||||||
|
//List<Tournament> tournaments = querySmash.Result.Tournament.Events.Select(e => new Tournament()
|
||||||
|
//{
|
||||||
|
// Name = e.name,
|
||||||
|
// SmashId = e.id,
|
||||||
|
// Game = games.FirstOrDefault(g => g.SmashId == e.videogame.id)
|
||||||
|
//}).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.FromResult(tournaments);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Event> ParseEvent(string slug)
|
||||||
|
{
|
||||||
|
Event e = await this.GetEvent(slug);
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<TournamentResponse> GetTournament(string slug)
|
||||||
|
{
|
||||||
|
|
||||||
var graphQLClient = new GraphQLHttpClient("https://api.smash.gg/gql/alpha", new NewtonsoftJsonSerializer());
|
var graphQLClient = new GraphQLHttpClient("https://api.smash.gg/gql/alpha", new NewtonsoftJsonSerializer());
|
||||||
graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
|
graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
|
||||||
var Event = new GraphQLRequest
|
var Event = new GraphQLRequest
|
||||||
@@ -100,16 +239,16 @@ namespace LaDOSE.Business.Provider.SmashProvider
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
//GraphQLHttpRequest preprocessedRequest = await graphQLClient.Options.PreprocessRequest(Event, graphQLClient);
|
//GraphQLHttpRequest preprocessedRequest = await graphQLClient.Options.PreprocessRequest(EventType, graphQLClient);
|
||||||
//var x = preprocessedRequest.ToHttpRequestMessage(graphQLClient.Options, new NewtonsoftJsonSerializer());
|
//var x = preprocessedRequest.ToHttpRequestMessage(graphQLClient.Options, new NewtonsoftJsonSerializer());
|
||||||
//System.Diagnostics.Trace.WriteLine(x.Content.ReadAsStringAsync().Result);
|
//System.Diagnostics.Trace.WriteLine(x.Content.ReadAsStringAsync().Result);
|
||||||
//var sendAsync = await graphQLClient.HttpClient.SendAsync(x);
|
//var sendAsync = await graphQLClient.HttpClient.SendAsync(x);
|
||||||
//System.Diagnostics.Trace.WriteLine(sendAsync.Content.ReadAsStringAsync().Result);
|
//System.Diagnostics.Trace.WriteLine(sendAsync.Content.ReadAsStringAsync().Result);
|
||||||
|
|
||||||
var graphQLResponse = await graphQLClient.SendQueryAsync<ResponseType>(Event);
|
var graphQLResponse = await graphQLClient.SendQueryAsync<TournamentResponse>(Event);
|
||||||
if (graphQLResponse.Errors != null)
|
if (graphQLResponse.Errors != null)
|
||||||
{
|
{
|
||||||
//Event not done ?
|
//EventType not done ?
|
||||||
//throw new Exception("Error");
|
//throw new Exception("Error");
|
||||||
}
|
}
|
||||||
System.Diagnostics.Trace.Write(graphQLResponse.Data.Tournament.Name);
|
System.Diagnostics.Trace.Write(graphQLResponse.Data.Tournament.Name);
|
||||||
|
|||||||
@@ -1,66 +1,90 @@
|
|||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Converters;
|
||||||
|
|
||||||
namespace LaDOSE.Business.Provider.SmashProvider
|
namespace LaDOSE.Business.Provider.SmashProvider
|
||||||
{
|
{
|
||||||
public class ResponseType
|
public class PageInfoType
|
||||||
{
|
{
|
||||||
public TournamentType Tournament { get; set; }
|
public int total { get; set; }
|
||||||
public class TournamentType
|
public int totalPages { get; set; }
|
||||||
{
|
public int page { get; set; }
|
||||||
public int id { get; set; }
|
public int perPage { get; set; }
|
||||||
|
public string sortBy { get; set; }
|
||||||
|
public string filter { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public string Name { get; set; }
|
public class TournamentType
|
||||||
|
{
|
||||||
|
public int id { get; set; }
|
||||||
|
|
||||||
public List<Event> Events { get; set; }
|
public string Name { get; set; }
|
||||||
|
|
||||||
}
|
[JsonConverter(typeof(UnixDateTimeConverter))]
|
||||||
|
public DateTime startAt { get; set; }
|
||||||
|
public List<EventType> Events { get; set; }
|
||||||
|
|
||||||
public class Event
|
}
|
||||||
{
|
public class VideoGameType
|
||||||
public int id { get; set; }
|
{
|
||||||
|
public int id { get; set; }
|
||||||
|
public string Name { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public string name { get; set; }
|
public class StandingType
|
||||||
public string state { get; set; }
|
{
|
||||||
|
public int id { get; set; }
|
||||||
public VideoGame videogame { get; set; }
|
|
||||||
public Node<Standing> standings { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class VideoGame
|
public int placement { get; set; }
|
||||||
{
|
|
||||||
public int id { get; set; }
|
|
||||||
public string Name { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Node<T>
|
public PlayerType player { get; set; }
|
||||||
{
|
}
|
||||||
public List<T> nodes { get; set; }
|
public class PlayerType
|
||||||
|
{
|
||||||
}
|
public int id { get; set; }
|
||||||
public class Standing
|
public string gamerTag { get; set; }
|
||||||
{
|
public UserType user { get; set; }
|
||||||
public int id { get; set; }
|
}
|
||||||
|
public class UserType
|
||||||
public int placement { get; set; }
|
{
|
||||||
|
public int id { get; set; }
|
||||||
|
public string name { get; set; }
|
||||||
|
|
||||||
public Player player { get; set; }
|
}
|
||||||
}
|
public class EventType
|
||||||
public class Player
|
{
|
||||||
{
|
public int id { get; set; }
|
||||||
public int id { get; set; }
|
|
||||||
public string gamerTag { get; set; }
|
public string name { get; set; }
|
||||||
public User user { get; set; }
|
public string state { get; set; }
|
||||||
}
|
|
||||||
public class User
|
public VideoGameType videogame { get; set; }
|
||||||
{
|
public Node<StandingType> standings { get; set; }
|
||||||
public int id { get; set; }
|
}
|
||||||
public string name { get; set; }
|
|
||||||
|
public class Node<T>
|
||||||
}
|
{
|
||||||
|
public PageInfoType pageInfo { get; set; }
|
||||||
|
public List<T> nodes { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public class TournamentResponse
|
||||||
|
{
|
||||||
|
public TournamentType Tournament { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class EventResponse
|
||||||
|
{
|
||||||
|
public EventType Event { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,43 +1,298 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using LaDOSE.Business.Helper;
|
using LaDOSE.Business.Helper;
|
||||||
using LaDOSE.Business.Interface;
|
using LaDOSE.Business.Interface;
|
||||||
|
using LaDOSE.Business.Provider.SmashProvider;
|
||||||
using LaDOSE.Entity;
|
using LaDOSE.Entity;
|
||||||
|
using LaDOSE.Entity.Challonge;
|
||||||
using LaDOSE.Entity.Context;
|
using LaDOSE.Entity.Context;
|
||||||
using LaDOSE.Entity.Wordpress;
|
using LaDOSE.Entity.Wordpress;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Internal;
|
||||||
|
using Result = LaDOSE.Entity.Challonge.Result;
|
||||||
|
|
||||||
namespace LaDOSE.Business.Service
|
namespace LaDOSE.Business.Service
|
||||||
{
|
{
|
||||||
public class EventService : BaseService<Event>, IEventService
|
public class EventService : BaseService<Event>, IEventService
|
||||||
{
|
{
|
||||||
private IChallongeProvider _challongeProvider;
|
private IChallongeProvider _challongeProvider;
|
||||||
|
|
||||||
public EventService(LaDOSEDbContext context, IChallongeProvider challongeProvider) : base(context)
|
#region Rules
|
||||||
|
private class Rules
|
||||||
{
|
{
|
||||||
this._challongeProvider = challongeProvider;
|
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 int Participation => 1;
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//public override Event GetById(int id)
|
//Rules Definitions (Min Players,Max Players,First Reward,Second Reward,Third / Fourth Reward, Top 8 reward, Top 16 Reward
|
||||||
//{
|
private List<Rules> TournamentRules = new List<Rules>()
|
||||||
// re
|
{
|
||||||
// //return _context.Event.Include(e => e.Season).Include(e => e.Games).ThenInclude(e => e.Game)
|
new Rules(0, 8, 5, 3, 2, 0, 0),
|
||||||
// // .FirstOrDefault(e => e.Id == id);
|
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 override Event Create(Event e)
|
private ISmashProvider _smashProvider;
|
||||||
//{
|
|
||||||
// if (e.Id != 0)
|
#endregion
|
||||||
// {
|
|
||||||
// throw new Exception("Id is invalid");
|
public EventService(LaDOSEDbContext context, IChallongeProvider challongeProvider, ISmashProvider _smashProvider) : base(context)
|
||||||
// }
|
{
|
||||||
|
this._context = context;
|
||||||
|
this._challongeProvider = challongeProvider;
|
||||||
|
this._smashProvider = _smashProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<ChallongeTournament>> GetTournaments(DateTime? start, DateTime? end)
|
||||||
|
{
|
||||||
|
return await _challongeProvider.GetTournaments(start, end);
|
||||||
|
//Useless
|
||||||
|
//foreach (var tournament in tournaments)
|
||||||
|
//{
|
||||||
|
// List<ChallongeParticipent> participents = await _challongeProvider.GetParticipents(tournament.ChallongeId);
|
||||||
|
// tournament.Participents = participents;
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TournamentsResult> GetTournamentsResult(List<int> ids)
|
||||||
|
{
|
||||||
|
TournamentsResult result = new TournamentsResult();
|
||||||
|
result.Results = new List<Result>();
|
||||||
|
var players = _context.WPUser.ToList();
|
||||||
|
var games = _context.Game.ToList();
|
||||||
|
var tournaments = await GetChallongeTournaments(ids,games);
|
||||||
|
|
||||||
|
var allParticipent = tournaments.SelectMany(e => e.Participents).Distinct((a, b) => a.Name == b.Name)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
|
||||||
|
allParticipent.RemoveAll(e => e.Name.StartsWith("[FORFAIT]"));
|
||||||
|
//USELESS
|
||||||
|
//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 playerCount = tournament.Participents.Count;
|
||||||
|
var lesSacs = tournament.Participents;
|
||||||
|
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 > 8 && p.Rank <= 16).ToList();
|
||||||
|
|
||||||
|
result.Results.Add(new Result(first.Name, tournament.Game?.Id??0, tournament.ChallongeId, tournament.Url, currentRule.FirstPoint,first.Rank??0));
|
||||||
|
lesSacs.Remove(first);
|
||||||
|
result.Results.Add(new Result(second.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url, currentRule.SecondPoint, second.Rank ?? 0));
|
||||||
|
lesSacs.Remove(second);
|
||||||
|
thirdFourth.ForEach(r =>
|
||||||
|
result.Results.Add(new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url,
|
||||||
|
currentRule.ThirdFourthPoint, r.Rank ?? 0)));
|
||||||
|
thirdFourth.ForEach(p => lesSacs.Remove(p));
|
||||||
|
if (currentRule.Top8Point != 0)
|
||||||
|
{
|
||||||
|
Top8.ForEach(r =>
|
||||||
|
result.Results.Add(new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url, currentRule.Top8Point, r.Rank ?? 0)));
|
||||||
|
Top8.ForEach(p => lesSacs.Remove(p));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentRule.Top16Point != 0)
|
||||||
|
{
|
||||||
|
Top16.ForEach(r =>
|
||||||
|
result.Results.Add(
|
||||||
|
new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url, currentRule.Top16Point, r.Rank ?? 0)));
|
||||||
|
Top16.ForEach(p => lesSacs.Remove(p));
|
||||||
|
}
|
||||||
|
|
||||||
|
lesSacs.ForEach(r =>
|
||||||
|
result.Results.Add(new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url,
|
||||||
|
currentRule.Participation, r.Rank ?? 0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
result.Games = tournaments.Select(e => e.Game).Distinct((game, game1) => game.Name == game1.Name).Where(e=>e!=null).ToList();
|
||||||
|
if (result.Games == null)
|
||||||
|
{
|
||||||
|
result.Games = new List<Game>();
|
||||||
|
}
|
||||||
|
result.Games.Add(new Game() {Id = 0, Order = 9999,Name = "UNKNOW"});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TournamentsResult> GetSmashResult(string tournamentSlug)
|
||||||
|
{
|
||||||
|
var test = this._smashProvider.GetEvent(tournamentSlug).Result;
|
||||||
|
var testTournaments = test.Tournaments;
|
||||||
|
var getResultEvents = this._smashProvider.GetResults(ref testTournaments).Result;
|
||||||
|
this._context.Event.Add(test);
|
||||||
|
this._context.SaveChanges();
|
||||||
|
|
||||||
|
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();
|
||||||
|
var games = _context.Game.ToList();
|
||||||
|
|
||||||
|
TournamentsResult result = new TournamentsResult();
|
||||||
|
result.Results = new List<Result>();
|
||||||
|
result.Games = new List<Game>();
|
||||||
|
result.Participents = new List<ChallongeParticipent>();
|
||||||
|
distinctp.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 tournaments.Tournament.Events.Where(e=>e.standings!=null).ToList())
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
var playerCount = tournament.standings.nodes.Count;
|
||||||
|
var lesSacs = tournament.standings.nodes;
|
||||||
|
var currentRule = TournamentRules.FirstOrDefault(rules =>
|
||||||
|
rules.PlayerMin < playerCount && rules.PlayerMax >= playerCount
|
||||||
|
);
|
||||||
|
if (currentRule == null)
|
||||||
|
{
|
||||||
|
throw new Exception("Unable to find rules");
|
||||||
|
}
|
||||||
|
|
||||||
|
var first = tournament.standings.nodes.First(p => p.placement == 1);
|
||||||
|
var second = tournament.standings.nodes.First(p => p.placement == 2);
|
||||||
|
var thirdFourth = tournament.standings.nodes.Where(p => p.placement == 3 || p.placement == 4).ToList();
|
||||||
|
var Top8 = tournament.standings.nodes.Where(p => p.placement > 4 && p.placement < 9).ToList();
|
||||||
|
var Top16 = tournament.standings.nodes.Where(p => p.placement > 8 && p.placement <= 16).ToList();
|
||||||
|
|
||||||
|
result.Results.Add(new Result(first.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name, currentRule.FirstPoint, first.placement));
|
||||||
|
lesSacs.Remove(first);
|
||||||
|
result.Results.Add(new Result(second.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name, currentRule.SecondPoint, second.placement));
|
||||||
|
lesSacs.Remove(second);
|
||||||
|
thirdFourth.ForEach(r =>
|
||||||
|
result.Results.Add(new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
||||||
|
currentRule.ThirdFourthPoint, r.placement)));
|
||||||
|
thirdFourth.ForEach(p => lesSacs.Remove(p));
|
||||||
|
if (currentRule.Top8Point != 0)
|
||||||
|
{
|
||||||
|
Top8.ForEach(r =>
|
||||||
|
result.Results.Add(new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
||||||
|
currentRule.ThirdFourthPoint, r.placement)));
|
||||||
|
Top8.ForEach(p => lesSacs.Remove(p));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentRule.Top16Point != 0)
|
||||||
|
{
|
||||||
|
Top16.ForEach(r =>
|
||||||
|
result.Results.Add(
|
||||||
|
new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
||||||
|
currentRule.ThirdFourthPoint, r.placement)));
|
||||||
|
Top16.ForEach(p => lesSacs.Remove(p));
|
||||||
|
}
|
||||||
|
|
||||||
|
lesSacs.ForEach(r =>
|
||||||
|
result.Results.Add(new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
||||||
|
currentRule.ThirdFourthPoint, r.placement)));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return await Task.FromResult(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<TournamentsResult> GetSmashResult2(string tournamentSlug)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Check if the tournament exist in database otherwise call Challonge.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ids">tournaments ids</param>
|
||||||
|
/// <param name="games">List of known games</param>
|
||||||
|
/// <returns>List of the challonge's tournament with participents</returns>
|
||||||
|
private async Task<List<ChallongeTournament>> GetChallongeTournaments(List<int> ids, List<Game> games)
|
||||||
|
{
|
||||||
|
var tournaments = new List<ChallongeTournament>();
|
||||||
|
foreach (var idTournament in ids)
|
||||||
|
{
|
||||||
|
if (!TournamentExist(idTournament))
|
||||||
|
{
|
||||||
|
ChallongeTournament challongeTournament = await _challongeProvider.GetTournament(idTournament);
|
||||||
|
challongeTournament.Participents =
|
||||||
|
await _challongeProvider.GetParticipents(challongeTournament.ChallongeId);
|
||||||
|
|
||||||
|
var game = games.FirstOrDefault(g => challongeTournament.Name.Contains(g.Name));
|
||||||
|
if (game != null) challongeTournament.Game = game;
|
||||||
|
challongeTournament.Sync = DateTime.Now;
|
||||||
|
|
||||||
|
tournaments.Add(challongeTournament);
|
||||||
|
_context.ChallongeTournament.Add(challongeTournament);
|
||||||
|
_context.SaveChanges();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tournaments.Add(_context.ChallongeTournament.Where(e => e.ChallongeId == idTournament)
|
||||||
|
.Include(e => e.Participents).First());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return tournaments;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool TournamentExist(int idTournament)
|
||||||
|
{
|
||||||
|
return this._context.ChallongeTournament.Any(e => e.ChallongeId == idTournament);
|
||||||
|
}
|
||||||
|
|
||||||
// var eventAdded = _context.Event.Add(e);
|
|
||||||
// _context.SaveChanges();
|
|
||||||
// return eventAdded.Entity;
|
|
||||||
//}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
45
LaDOSE.Src/LaDOSE.Service/Service/PlayerService.cs
Normal file
45
LaDOSE.Src/LaDOSE.Service/Service/PlayerService.cs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
using System.Linq;
|
||||||
|
using LaDOSE.Business.Interface;
|
||||||
|
using LaDOSE.Business.Provider.SmashProvider;
|
||||||
|
using LaDOSE.Entity;
|
||||||
|
using LaDOSE.Entity.Context;
|
||||||
|
using Microsoft.EntityFrameworkCore.Internal;
|
||||||
|
|
||||||
|
namespace LaDOSE.Business.Service
|
||||||
|
{
|
||||||
|
public class PlayerService : BaseService<Player>, IPlayerService
|
||||||
|
{
|
||||||
|
|
||||||
|
public PlayerService(LaDOSEDbContext context) : base(context)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public int GetBySmash(PlayerType playerUser)
|
||||||
|
{
|
||||||
|
//var p2 = _context.Player.ToList();
|
||||||
|
|
||||||
|
var p = _context.Player.FirstOrDefault(e => e.SmashId == playerUser.user.id);
|
||||||
|
if (p == null)
|
||||||
|
{
|
||||||
|
var entity = new Player()
|
||||||
|
{
|
||||||
|
Gamertag = playerUser.gamerTag,
|
||||||
|
Name = string.IsNullOrEmpty(playerUser.user.name)? playerUser.gamerTag : playerUser.user.name,
|
||||||
|
SmashId = playerUser.user.id,
|
||||||
|
};
|
||||||
|
_context.Player.Add(entity);
|
||||||
|
_context.SaveChanges();
|
||||||
|
return entity.Id;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p.Gamertag != playerUser.gamerTag)
|
||||||
|
{
|
||||||
|
p.Name = playerUser.gamerTag;
|
||||||
|
_context.SaveChanges();
|
||||||
|
}
|
||||||
|
|
||||||
|
return p.Id;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,290 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using LaDOSE.Business.Helper;
|
|
||||||
using LaDOSE.Business.Interface;
|
|
||||||
using LaDOSE.Business.Provider.SmashProvider;
|
|
||||||
using LaDOSE.Entity;
|
|
||||||
using LaDOSE.Entity.Challonge;
|
|
||||||
using LaDOSE.Entity.Context;
|
|
||||||
using LaDOSE.Entity.Wordpress;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore.Internal;
|
|
||||||
using Result = LaDOSE.Entity.Challonge.Result;
|
|
||||||
|
|
||||||
namespace LaDOSE.Business.Service
|
|
||||||
{
|
|
||||||
public class TournamentService : BaseService<ChallongeTournament>,ITournamentService
|
|
||||||
{
|
|
||||||
private IChallongeProvider _challongeProvider;
|
|
||||||
|
|
||||||
#region Rules
|
|
||||||
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 int Participation => 1;
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Rules Definitions (Min Players,Max Players,First Reward,Second Reward,Third / Fourth Reward, Top 8 reward, Top 16 Reward
|
|
||||||
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),
|
|
||||||
};
|
|
||||||
|
|
||||||
private ISmashProvider _smashProvider;
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
public TournamentService(LaDOSEDbContext context, IChallongeProvider challongeProvider, ISmashProvider _smashProvider) : base(context)
|
|
||||||
{
|
|
||||||
this._context = context;
|
|
||||||
this._challongeProvider = challongeProvider;
|
|
||||||
this._smashProvider = _smashProvider;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<List<ChallongeTournament>> GetTournaments(DateTime? start, DateTime? end)
|
|
||||||
{
|
|
||||||
return await _challongeProvider.GetTournaments(start, end);
|
|
||||||
//Useless
|
|
||||||
//foreach (var tournament in tournaments)
|
|
||||||
//{
|
|
||||||
// List<ChallongeParticipent> participents = await _challongeProvider.GetParticipents(tournament.ChallongeId);
|
|
||||||
// tournament.Participents = participents;
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<TournamentsResult> GetTournamentsResult(List<int> ids)
|
|
||||||
{
|
|
||||||
TournamentsResult result = new TournamentsResult();
|
|
||||||
result.Results = new List<Result>();
|
|
||||||
var players = _context.WPUser.ToList();
|
|
||||||
var games = _context.Game.ToList();
|
|
||||||
var tournaments = await GetChallongeTournaments(ids,games);
|
|
||||||
|
|
||||||
var allParticipent = tournaments.SelectMany(e => e.Participents).Distinct((a, b) => a.Name == b.Name)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
|
|
||||||
allParticipent.RemoveAll(e => e.Name.StartsWith("[FORFAIT]"));
|
|
||||||
//USELESS
|
|
||||||
//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 playerCount = tournament.Participents.Count;
|
|
||||||
var lesSacs = tournament.Participents;
|
|
||||||
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 > 8 && p.Rank <= 16).ToList();
|
|
||||||
|
|
||||||
result.Results.Add(new Result(first.Name, tournament.Game?.Id??0, tournament.ChallongeId, tournament.Url, currentRule.FirstPoint,first.Rank??0));
|
|
||||||
lesSacs.Remove(first);
|
|
||||||
result.Results.Add(new Result(second.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url, currentRule.SecondPoint, second.Rank ?? 0));
|
|
||||||
lesSacs.Remove(second);
|
|
||||||
thirdFourth.ForEach(r =>
|
|
||||||
result.Results.Add(new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url,
|
|
||||||
currentRule.ThirdFourthPoint, r.Rank ?? 0)));
|
|
||||||
thirdFourth.ForEach(p => lesSacs.Remove(p));
|
|
||||||
if (currentRule.Top8Point != 0)
|
|
||||||
{
|
|
||||||
Top8.ForEach(r =>
|
|
||||||
result.Results.Add(new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url, currentRule.Top8Point, r.Rank ?? 0)));
|
|
||||||
Top8.ForEach(p => lesSacs.Remove(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentRule.Top16Point != 0)
|
|
||||||
{
|
|
||||||
Top16.ForEach(r =>
|
|
||||||
result.Results.Add(
|
|
||||||
new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url, currentRule.Top16Point, r.Rank ?? 0)));
|
|
||||||
Top16.ForEach(p => lesSacs.Remove(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
lesSacs.ForEach(r =>
|
|
||||||
result.Results.Add(new Result(r.Name, tournament.Game?.Id ?? 0, tournament.ChallongeId, tournament.Url,
|
|
||||||
currentRule.Participation, r.Rank ?? 0)));
|
|
||||||
}
|
|
||||||
|
|
||||||
result.Games = tournaments.Select(e => e.Game).Distinct((game, game1) => game.Name == game1.Name).Where(e=>e!=null).ToList();
|
|
||||||
if (result.Games == null)
|
|
||||||
{
|
|
||||||
result.Games = new List<Game>();
|
|
||||||
}
|
|
||||||
result.Games.Add(new Game() {Id = 0, Order = 9999,Name = "UNKNOW"});
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<TournamentsResult> GetSmashResult(string tournamentSlug)
|
|
||||||
{
|
|
||||||
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();
|
|
||||||
var games = _context.Game.ToList();
|
|
||||||
|
|
||||||
TournamentsResult result = new TournamentsResult();
|
|
||||||
result.Results = new List<Result>();
|
|
||||||
result.Games = new List<Game>();
|
|
||||||
result.Participents = new List<ChallongeParticipent>();
|
|
||||||
distinctp.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 tournaments.Tournament.Events.Where(e=>e.standings!=null).ToList())
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var playerCount = tournament.standings.nodes.Count;
|
|
||||||
var lesSacs = tournament.standings.nodes;
|
|
||||||
var currentRule = TournamentRules.FirstOrDefault(rules =>
|
|
||||||
rules.PlayerMin < playerCount && rules.PlayerMax >= playerCount
|
|
||||||
);
|
|
||||||
if (currentRule == null)
|
|
||||||
{
|
|
||||||
throw new Exception("Unable to find rules");
|
|
||||||
}
|
|
||||||
|
|
||||||
var first = tournament.standings.nodes.First(p => p.placement == 1);
|
|
||||||
var second = tournament.standings.nodes.First(p => p.placement == 2);
|
|
||||||
var thirdFourth = tournament.standings.nodes.Where(p => p.placement == 3 || p.placement == 4).ToList();
|
|
||||||
var Top8 = tournament.standings.nodes.Where(p => p.placement > 4 && p.placement < 9).ToList();
|
|
||||||
var Top16 = tournament.standings.nodes.Where(p => p.placement > 8 && p.placement <= 16).ToList();
|
|
||||||
|
|
||||||
result.Results.Add(new Result(first.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name, currentRule.FirstPoint, first.placement));
|
|
||||||
lesSacs.Remove(first);
|
|
||||||
result.Results.Add(new Result(second.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name, currentRule.SecondPoint, second.placement));
|
|
||||||
lesSacs.Remove(second);
|
|
||||||
thirdFourth.ForEach(r =>
|
|
||||||
result.Results.Add(new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
|
||||||
currentRule.ThirdFourthPoint, r.placement)));
|
|
||||||
thirdFourth.ForEach(p => lesSacs.Remove(p));
|
|
||||||
if (currentRule.Top8Point != 0)
|
|
||||||
{
|
|
||||||
Top8.ForEach(r =>
|
|
||||||
result.Results.Add(new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
|
||||||
currentRule.ThirdFourthPoint, r.placement)));
|
|
||||||
Top8.ForEach(p => lesSacs.Remove(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentRule.Top16Point != 0)
|
|
||||||
{
|
|
||||||
Top16.ForEach(r =>
|
|
||||||
result.Results.Add(
|
|
||||||
new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
|
||||||
currentRule.ThirdFourthPoint, r.placement)));
|
|
||||||
Top16.ForEach(p => lesSacs.Remove(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
lesSacs.ForEach(r =>
|
|
||||||
result.Results.Add(new Result(r.player.gamerTag, tournament.videogame.id, tournament.id, tournament.name,
|
|
||||||
currentRule.ThirdFourthPoint, r.placement)));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return await Task.FromResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Check if the tournament exist in database otherwise call Challonge.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ids">tournaments ids</param>
|
|
||||||
/// <param name="games">List of known games</param>
|
|
||||||
/// <returns>List of the challonge's tournament with participents</returns>
|
|
||||||
private async Task<List<ChallongeTournament>> GetChallongeTournaments(List<int> ids, List<Game> games)
|
|
||||||
{
|
|
||||||
var tournaments = new List<ChallongeTournament>();
|
|
||||||
foreach (var idTournament in ids)
|
|
||||||
{
|
|
||||||
if (!TournamentExist(idTournament))
|
|
||||||
{
|
|
||||||
ChallongeTournament challongeTournament = await _challongeProvider.GetTournament(idTournament);
|
|
||||||
challongeTournament.Participents =
|
|
||||||
await _challongeProvider.GetParticipents(challongeTournament.ChallongeId);
|
|
||||||
|
|
||||||
var game = games.FirstOrDefault(g => challongeTournament.Name.Contains(g.Name));
|
|
||||||
if (game != null) challongeTournament.Game = game;
|
|
||||||
challongeTournament.Sync = DateTime.Now;
|
|
||||||
|
|
||||||
tournaments.Add(challongeTournament);
|
|
||||||
_context.ChallongeTournament.Add(challongeTournament);
|
|
||||||
_context.SaveChanges();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
tournaments.Add(_context.ChallongeTournament.Where(e => e.ChallongeId == idTournament)
|
|
||||||
.Include(e => e.Participents).First());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return tournaments;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<object> GetSmashTop(string tournamentSlug, string eventId,int playerCount)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
private bool TournamentExist(int idTournament)
|
|
||||||
{
|
|
||||||
return this._context.ChallongeTournament.Any(e => e.ChallongeId == idTournament);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user