More additions, lucky card based on day, redo of migrations because i messed up
This commit is contained in:
@@ -4,6 +4,8 @@ using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using TOOHUCardAPI.Data.Services;
|
||||
using TOOHUCardAPI.DTO;
|
||||
|
||||
namespace TOOHUCardAPI.Controllers
|
||||
@@ -12,10 +14,21 @@ namespace TOOHUCardAPI.Controllers
|
||||
[ApiController]
|
||||
public class GameConfigController : ControllerBase
|
||||
{
|
||||
private readonly GameConfigurationService _gameConfigurationService;
|
||||
private readonly ILogger<GameConfigController> _logger;
|
||||
|
||||
public GameConfigController(GameConfigurationService gameConfigurationService, ILogger<GameConfigController> logger)
|
||||
{
|
||||
_gameConfigurationService = gameConfigurationService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<GameConfigResponse> GetGameConfig()
|
||||
{
|
||||
return new GameConfigResponse();
|
||||
var response = await _gameConfigurationService.GetGameConfiguration();
|
||||
_logger.LogInformation("Game config fetched");
|
||||
return response;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ namespace TOOHUCardAPI.Controllers
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> Get(string id)
|
||||
public async Task<IActionResult> Get(long id)
|
||||
{
|
||||
User user = await _userRepository.GetUser(id);
|
||||
|
||||
|
||||
@@ -115,15 +115,15 @@ namespace TOOHUCardAPI.Controllers
|
||||
{
|
||||
PlayerDataGetRequestObject requestObject = JsonConvert.DeserializeObject<PlayerDataGetRequestObject>(body);
|
||||
IEnumerable<User> users = await Task.WhenAll(requestObject.Ids.Values.Select(val => _userService.LoginUser(val)));
|
||||
IEnumerable<string> queriedUserSteamIds = requestObject.Ids.Select(i => i.Value);
|
||||
IEnumerable<long> queriedUserSteamIds = requestObject.Ids.Select(i => i.Value);
|
||||
IEnumerable<PlayerDataGetResponseObjectPlayer> responsePlayers = users
|
||||
.Where(user => queriedUserSteamIds.Contains(user.SteamId))
|
||||
.Select(user => user.ToGetResponse(_mapper));
|
||||
Dictionary<string, PlayerDataGetResponseObjectPlayer> playersStatic = requestObject.Ids
|
||||
Dictionary<int, PlayerDataGetResponseObjectPlayer> playersStatic = requestObject.Ids
|
||||
.Select(pair =>
|
||||
KeyValuePair.Create(pair.Key, responsePlayers.FirstOrDefault(resp => resp.SteamId == pair.Value)))
|
||||
.ToDictionary(kv => kv.Key, kv => kv.Value);
|
||||
Dictionary<string, Dictionary<string, object>> dynamicResponses = playersStatic
|
||||
Dictionary<int, Dictionary<string, object>> dynamicResponses = playersStatic
|
||||
.Select(kv =>
|
||||
{
|
||||
var obj = JsonConvert.DeserializeObject<Dictionary<string, object>>(JsonConvert.SerializeObject(kv.Value));
|
||||
|
||||
@@ -4,6 +4,10 @@ using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using TOOHUCardAPI.Data.Enums;
|
||||
using TOOHUCardAPI.Data.Services;
|
||||
using TOOHUCardAPI.DTO;
|
||||
|
||||
namespace TOOHUCardAPI.Controllers
|
||||
{
|
||||
@@ -11,8 +15,46 @@ namespace TOOHUCardAPI.Controllers
|
||||
[ApiController]
|
||||
public class RankDataController : MethodBasedController<RankDataController>
|
||||
{
|
||||
public RankDataController()
|
||||
private readonly ILogger<RankDataController> _logger;
|
||||
private readonly RankService _rankService;
|
||||
private readonly StoreService _storeService;
|
||||
private readonly UserService _userService;
|
||||
|
||||
public RankDataController(ILogger<RankDataController> logger, RankService rankService, StoreService storeService, UserService userService)
|
||||
{
|
||||
_logger = logger;
|
||||
_rankService = rankService;
|
||||
_storeService = storeService;
|
||||
_userService = userService;
|
||||
}
|
||||
|
||||
private RankType ParseRankType(string rankType)
|
||||
{
|
||||
if (rankType == null || rankType.Length > 1)
|
||||
{
|
||||
return RankType.All;
|
||||
}
|
||||
|
||||
char identifier = rankType.ToCharArray()[0];
|
||||
if (identifier == (char) RankType.Single)
|
||||
{
|
||||
return RankType.Single;
|
||||
}
|
||||
|
||||
if (identifier == (char) RankType.Team)
|
||||
{
|
||||
return RankType.Team;
|
||||
}
|
||||
|
||||
return RankType.All;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetRankData(string rank_type)
|
||||
{
|
||||
RankType parsedRankType = ParseRankType(rank_type);
|
||||
|
||||
return Ok(new OkResponse());
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user