mirror of
https://github.com/LBPUnion/ProjectLighthouse.git
synced 2025-07-30 16:58:38 +00:00
Refactor serialization system (#702)
* Initial work for serialization refactor * Experiment with new naming conventions * Mostly implement user and slot serialization. Still needs to be fine tuned to match original implementation Many things are left in a broken state like website features/api endpoints/lbp3 categories * Fix release building * Migrate scores, reviews, and more to new serialization system. Many things are still broken but progress is steadily being made * Fix Api responses and migrate serialization for most types * Make serialization better and fix bugs Fix recursive PrepareSerialization when recursive item is set during root item's PrepareSerialization, items, should be properly indexed in order but it's only tested to 1 level of recursion * Fix review serialization * Fix user serialization producing malformed SQL query * Remove DefaultIfEmpty query * MariaDB doesn't like double nested queries * Fix LBP1 tag counter * Implement lbp3 categories and add better deserialization handling * Implement expression tree caching to speed up reflection and write new serializer tests * Remove Game column from UserEntity and rename DatabaseContextModelSnapshot.cs back to DatabaseModelSnapshot.cs * Make UserEntity username not required * Fix recursive serialization of lists and add relevant unit tests * Actually commit the migration * Fix LocationTests to use new deserialization class * Fix comments not serializing the right author username * Replace all occurrences of StatusCode with their respective ASP.NET named result instead of StatusCode(403) everything is now in the form of Forbid() * Fix SlotBase.ConvertToEntity and LocationTests * Fix compilation error * Give Location a default value in GameUserSlot and GameUser * Reimplement stubbed website functions * Convert grief reports to new serialization system * Update DatabaseModelSnapshot and bump dotnet tool version * Remove unused directives * Fix broken type reference * Fix rated comments on website * Don't include banned users in website comments * Optimize score submission * Fix slot id calculating in in-game comment posting * Move serialization interfaces to types folder and add more documentation * Allow uploading of versus scores
This commit is contained in:
parent
307b2135a3
commit
329ab66043
248 changed files with 4993 additions and 2896 deletions
|
@ -28,15 +28,18 @@ public class SlotEndpoints : ApiEndpointController
|
|||
/// <returns>The slot</returns>
|
||||
/// <response code="200">The slot list, if successful.</response>
|
||||
[HttpGet("slots")]
|
||||
[ProducesResponseType(typeof(List<MinimalSlot>), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(List<ApiSlot>), StatusCodes.Status200OK)]
|
||||
public async Task<IActionResult> GetSlots([FromQuery] int limit = 20, [FromQuery] int skip = 0)
|
||||
{
|
||||
if (skip < 0) skip = 0;
|
||||
if (limit < 0) limit = 0;
|
||||
limit = Math.Min(ServerStatics.PageSize, limit);
|
||||
|
||||
IEnumerable<MinimalSlot> minimalSlots = (await this.database.Slots.OrderByDescending(s => s.FirstUploaded).Skip(skip).Take(limit).ToListAsync()).Select
|
||||
(MinimalSlot.FromSlot);
|
||||
IEnumerable<ApiSlot> minimalSlots = await this.database.Slots.OrderByDescending(s => s.FirstUploaded)
|
||||
.Skip(skip)
|
||||
.Take(limit)
|
||||
.Select(s => ApiSlot.CreateFromEntity(s))
|
||||
.ToListAsync();
|
||||
|
||||
return this.Ok(minimalSlots);
|
||||
}
|
||||
|
@ -49,13 +52,13 @@ public class SlotEndpoints : ApiEndpointController
|
|||
/// <response code="200">The slot, if successful.</response>
|
||||
/// <response code="404">The slot could not be found.</response>
|
||||
[HttpGet("slot/{id:int}")]
|
||||
[ProducesResponseType(typeof(Slot), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ApiSlot), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<IActionResult> GetSlot(int id)
|
||||
{
|
||||
Slot? slot = await this.database.Slots.FirstOrDefaultAsync(u => u.SlotId == id);
|
||||
SlotEntity? slot = await this.database.Slots.FirstOrDefaultAsync(u => u.SlotId == id);
|
||||
if (slot == null) return this.NotFound();
|
||||
|
||||
return this.Ok(slot);
|
||||
return this.Ok(ApiSlot.CreateFromEntity(slot));
|
||||
}
|
||||
}
|
|
@ -2,10 +2,7 @@ using Microsoft.AspNetCore.Mvc;
|
|||
|
||||
namespace LBPUnion.ProjectLighthouse.Servers.API.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[Route("/api/v1")]
|
||||
[Produces("application/json")]
|
||||
public class StatusController : ControllerBase
|
||||
public class StatusController : ApiEndpointController
|
||||
{
|
||||
[AcceptVerbs("GET", "HEAD", Route = "status")]
|
||||
public IActionResult GetStatus() => this.Ok();
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#nullable enable
|
||||
using LBPUnion.ProjectLighthouse.Database;
|
||||
using LBPUnion.ProjectLighthouse.Helpers;
|
||||
using LBPUnion.ProjectLighthouse.Servers.API.Responses;
|
||||
using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
|
||||
using LBPUnion.ProjectLighthouse.Types.Entities.Token;
|
||||
using LBPUnion.ProjectLighthouse.Types.Users;
|
||||
|
@ -29,25 +30,25 @@ public class UserEndpoints : ApiEndpointController
|
|||
/// <response code="200">The user, if successful.</response>
|
||||
/// <response code="404">The user could not be found.</response>
|
||||
[HttpGet("user/{id:int}")]
|
||||
[ProducesResponseType(typeof(User), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ApiUser), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<IActionResult> GetUser(int id)
|
||||
{
|
||||
User? user = await this.database.Users.FirstOrDefaultAsync(u => u.UserId == id);
|
||||
UserEntity? user = await this.database.Users.FirstOrDefaultAsync(u => u.UserId == id);
|
||||
if (user == null) return this.NotFound();
|
||||
|
||||
return this.Ok(user);
|
||||
return this.Ok(ApiUser.CreateFromEntity(user));
|
||||
}
|
||||
|
||||
[HttpGet("username/{username}")]
|
||||
[ProducesResponseType(typeof(User), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ApiUser), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<IActionResult> GetUser(string username)
|
||||
{
|
||||
User? user = await this.database.Users.FirstOrDefaultAsync(u => u.Username == username);
|
||||
UserEntity? user = await this.database.Users.FirstOrDefaultAsync(u => u.Username == username);
|
||||
if (user == null) return this.NotFound();
|
||||
|
||||
return this.Ok(user);
|
||||
return this.Ok(ApiUser.CreateFromEntity(user));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -58,15 +59,16 @@ public class UserEndpoints : ApiEndpointController
|
|||
/// <response code="200">The list of users, if any were found</response>
|
||||
/// <response code="404">No users matched the query</response>
|
||||
[HttpGet("search/user")]
|
||||
[ProducesResponseType(typeof(User), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ApiUser), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public async Task<IActionResult> SearchUsers(string query)
|
||||
{
|
||||
List<User> users = await this.database.Users
|
||||
List<ApiUser> users = await this.database.Users
|
||||
.Where(u => u.PermissionLevel != PermissionLevel.Banned && u.Username.Contains(query))
|
||||
.Where(u => u.ProfileVisibility == PrivacyType.All) // TODO: change check for when user is logged in
|
||||
.OrderByDescending(b => b.UserId)
|
||||
.Take(20)
|
||||
.Select(u => ApiUser.CreateFromEntity(u))
|
||||
.ToListAsync();
|
||||
if (!users.Any()) return this.NotFound();
|
||||
|
||||
|
@ -81,7 +83,7 @@ public class UserEndpoints : ApiEndpointController
|
|||
/// <response code="200">The user's status, if successful.</response>
|
||||
/// <response code="404">The user could not be found.</response>
|
||||
[HttpGet("user/{id:int}/status")]
|
||||
[ProducesResponseType(typeof(UserStatus), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ApiUser), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||
public IActionResult GetUserStatus(int id)
|
||||
{
|
||||
|
@ -102,8 +104,8 @@ public class UserEndpoints : ApiEndpointController
|
|||
|
||||
string authToken = authHeader[(authHeader.IndexOf(' ') + 1)..];
|
||||
|
||||
ApiKey? apiKey = await this.database.APIKeys.FirstOrDefaultAsync(k => k.Key == authToken);
|
||||
if (apiKey == null) return this.StatusCode(403, null);
|
||||
ApiKeyEntity? apiKey = await this.database.APIKeys.FirstOrDefaultAsync(k => k.Key == authToken);
|
||||
if (apiKey == null) return this.Forbid();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(username))
|
||||
{
|
||||
|
@ -111,7 +113,7 @@ public class UserEndpoints : ApiEndpointController
|
|||
if (userExists) return this.BadRequest();
|
||||
}
|
||||
|
||||
RegistrationToken token = new()
|
||||
RegistrationTokenEntity token = new()
|
||||
{
|
||||
Created = DateTime.Now,
|
||||
Token = CryptoHelper.GenerateAuthToken(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue