Lots of additions and restructuring

TOOHUCardAPI/Controllers/MethodBasedController.cs

@@ -4,15 +4,37 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using TOOHUCardAPI.Data;
-
+using TOOHUCardAPI.Data.Services;
 using MethodMap = System.Collections.Generic.Dictionary<string, System.Reflection.MethodInfo>;
 namespace TOOHUCardAPI.Controllers
 {
-    public class MethodBasedController : ControllerBase
+    public class MethodBasedController<TChildType> : ControllerBase
     {
         public delegate Task<IActionResult> EndpointHandler(string requestBody);
-        private static Dictionary<Type, MethodMap> MethodMapByType = new Dictionary<Type, MethodMap>();
+
+        /**
+         * The game uses a single endpoint for player data.
+         * The object they send has a method field that's used to decide what's being done
+         * So let's use a single entry point and redirect based on that
+         */
+        [HttpPost]
+        public async Task<IActionResult> EntryPoint([FromBody] object bodyObj)
+        {
+            string body = JsonConvert.SerializeObject(bodyObj);
+            JObject request = JObject.Parse(body);
+            string method = request["method"].ToString();
+            try
+            {
+                return await InvokeEndpointHandlerForMethod<TChildType>(this, method, body);
+            }
+            catch (TooHooException e)
+            {
+                return Ok(e.response);
+            }
+        }
         
         protected Task<IActionResult> InvokeEndpointHandlerForMethod<T>(object _this, string method, string body)
         {
@@ -27,11 +49,12 @@ namespace TOOHUCardAPI.Controllers
 
         private MethodMap GetMethodMapForType<T>()
         {
-            if (!MethodMapByType.ContainsKey(typeof(T)))
+            var methodMapByType = MethodMapService.MethodMapByType;
+            if (!methodMapByType.ContainsKey(typeof(T)))
             {
-                MethodMapByType[typeof(T)] = RegisterEndpointHandlers<T>();
+                methodMapByType[typeof(T)] = RegisterEndpointHandlers<T>();
             }
-            return MethodMapByType[typeof(T)];
+            return methodMapByType[typeof(T)];
         }
 
         private static MethodMap RegisterEndpointHandlers<T>()
@@ -51,6 +74,8 @@ namespace TOOHUCardAPI.Controllers
         }
     }
     
+    
+    
     public class MissingEndpointHandlerException : Exception
     {
         public MissingEndpointHandlerException(string method) : base($"Handler for [{method}] is either missing or incorrectly setup.")

TOOHUCardAPI/Controllers/PlayerBaseDataController.cs

@@ -14,7 +14,7 @@ namespace TOOHUCardAPI.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class PlayerBaseDataController : MethodBasedController
+    public class PlayerBaseDataController : ControllerBase
     {
         private readonly ILogger<PlayerBaseDataController> _logger;
         private readonly UserRepository _userRepository;
@@ -30,7 +30,7 @@ namespace TOOHUCardAPI.Controllers
         [HttpGet]
         public async Task<IActionResult> Get(string id)
         {
-            User user = _userRepository.GetUser(id);
+            User user = await _userRepository.GetUser(id);
             if (user == null)
             {
                 return BadRequest("Invalid user id specified");

TOOHUCardAPI/Controllers/PlayerDataController.cs

@@ -24,7 +24,7 @@ namespace TOOHUCardAPI.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class PlayerDataController : MethodBasedController
+    public class PlayerDataController : MethodBasedController<PlayerDataController>
     {
         private readonly ILogger<PlayerDataController> _logger;
         private readonly UserRepository _userRepository;
@@ -39,25 +39,15 @@ namespace TOOHUCardAPI.Controllers
             _storeService = storeService;
         }
 
-        /**
-         * The game uses a single endpoint for player data.
-         * The object they send has a method field that's used to decide what's being done
-         * So let's use a single entry point and redirect based on that
-         */
-        [HttpPost]
-        public async Task<IActionResult> EntryPoint([FromBody] object bodyObj)
+        [EndpointHandler("save_card_level")]
+        private async Task<IActionResult> SaveCardLevel(string body)
         {
-            string body = JsonConvert.SerializeObject(bodyObj);
-            JObject request = JObject.Parse(body);
-            string method = request["method"].ToString();
-            try
+            PlayerDataSaveCardLevelRequest request = JsonConvert.DeserializeObject<PlayerDataSaveCardLevelRequest>(body);
+            int totalCost = await _storeService.LevelUpCard(request.SteamId, request.CardItemCode, request.LevelIncrease);
+            return Ok(new PlayerDataSaveCardLevelResponse
             {
-                return await InvokeEndpointHandlerForMethod<PlayerDataController>(this, method, body);
-            }
-            catch (TooHooException e)
-            {
-                return Ok(e.response);
-            }
+                TotalCost = totalCost
+            });
         }
 
         [EndpointHandler("day_first_win")]
@@ -76,7 +66,7 @@ namespace TOOHUCardAPI.Controllers
         private async Task<IActionResult> SaveKeyCount(string body)
         {
             PlayerDataSaveKeyCountRequest request = JsonConvert.DeserializeObject<PlayerDataSaveKeyCountRequest>(body);
-            User user = _userRepository.GetUser(request.SteamId);
+            User user = await _userRepository.GetUser(request.SteamId);
             if (user == null)
             {
                 throw new InvalidUserException();
@@ -84,7 +74,7 @@ namespace TOOHUCardAPI.Controllers
 
             user.KeyTotal = request.KeyTotal;
             user.KeyUseCount = request.KeyUseCount;
-            _userRepository.UpdateUser(user);
+            await _userRepository.UpdateUser(user);
             return Ok(new OkResponse());
         }
 
@@ -106,7 +96,7 @@ namespace TOOHUCardAPI.Controllers
         {
             PlayerDataSaveCardGroupRequest request =
                 JsonConvert.DeserializeObject<PlayerDataSaveCardGroupRequest>(body);
-            User user = _userRepository.GetUser(request.SteamId);
+            User user = await _userRepository.GetUser(request.SteamId);
             if (user == null)
             {
                 throw new InvalidUserException();
@@ -118,15 +108,15 @@ namespace TOOHUCardAPI.Controllers
             };
             group.EncodedString = request.GroupData;
             user.EncodedCardGroups = user.EncodedCardGroups.Where(group2 => group.Id != group2.Id).Append(group).ToList();
-            _userRepository.UpdateUser(user);
-            return Ok(new PlayerDataSaveCardGroupResponseObject());
+            await _userRepository.UpdateUser(user);
+            return Ok(new OkResponse());
         }
 
         [EndpointHandler("get")]
         private async Task<IActionResult> Get(string body)
         {
             PlayerDataGetRequestObject requestObject = JsonConvert.DeserializeObject<PlayerDataGetRequestObject>(body);
-            IEnumerable<User> users = requestObject.Ids.Values.Select(val => _userRepository.GetOrCreateUser(val));
+            IEnumerable<User> users = await Task.WhenAll(requestObject.Ids.Values.Select(val => _userRepository.GetOrCreateUser(val)));
             IEnumerable<string> queriedUserSteamIds = requestObject.Ids.Select(i => i.Value);
             IEnumerable<PlayerDataGetResponseObjectPlayer> responsePlayers = users
                 .Where(user => queriedUserSteamIds.Contains(user.SteamId))

TOOHUCardAPI/Controllers/RankDataController.cs

@@ -9,7 +9,10 @@ namespace TOOHUCardAPI.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class RankDataController : ControllerBase
+    public class RankDataController : MethodBasedController<RankDataController>
     {
+        public RankDataController()
+        {
+        }
     }
 }