Add restore categories

LeaderboardBackend/Controllers/LeaderboardsController.cs

@@ -100,7 +100,7 @@ public async Task<ActionResult<LeaderboardViewModel>> RestoreLeaderboard(
         long id
     )
     {
-        RestoreLeaderboardResult r = await leaderboardService.RestoreLeaderboard(id);
+        RestoreResult<Leaderboard> r = await leaderboardService.RestoreLeaderboard(id);
 
         return r.Match<ActionResult<LeaderboardViewModel>>(
             board => Ok(LeaderboardViewModel.MapFrom(board)),

LeaderboardBackend/Results.cs

@@ -12,7 +12,7 @@ namespace LeaderboardBackend.Result;
 public record Conflict<T>(T Conflicting);
 public readonly record struct EmailFailed;
 public readonly record struct Expired;
-public readonly record struct LeaderboardNeverDeleted;
+public readonly record struct NeverDeleted;
 public readonly record struct UserNotFound;
 public readonly record struct UserBanned;
 
@@ -21,3 +21,6 @@ public partial class DeleteResult : OneOfBase<Success, NotFound, AlreadyDeleted>
 
 [GenerateOneOf]
 public partial class UpdateResult<T> : OneOfBase<Conflict<T>, NotFound, Success>;
+
+[GenerateOneOf]
+public partial class RestoreResult<T> : OneOfBase<T, NotFound, NeverDeleted, Conflict<T>>;

LeaderboardBackend/Services/ICategoryService.cs

@@ -12,6 +12,7 @@ public interface ICategoryService
     Task<CreateCategoryResult> CreateCategory(long leaderboardId, CreateCategoryRequest request);
     Task<Category?> GetCategoryForRun(Run run);
     Task<DeleteResult> DeleteCategory(long id);
+    Task<RestoreResult<Category>> RestoreCategory(long id);
 }
 
 [GenerateOneOf]

LeaderboardBackend/Services/ILeaderboardService.cs

@@ -12,13 +12,10 @@ public interface ILeaderboardService
     Task<Leaderboard?> GetLeaderboardBySlug(string slug);
     Task<List<Leaderboard>> ListLeaderboards(bool includeDeleted);
     Task<CreateLeaderboardResult> CreateLeaderboard(CreateLeaderboardRequest request);
-    Task<RestoreLeaderboardResult> RestoreLeaderboard(long id);
+    Task<RestoreResult<Leaderboard>> RestoreLeaderboard(long id);
     Task<DeleteResult> DeleteLeaderboard(long id);
     Task<UpdateResult<Leaderboard>> UpdateLeaderboard(long id, UpdateLeaderboardRequest request);
 }
 
 [GenerateOneOf]
 public partial class CreateLeaderboardResult : OneOfBase<Leaderboard, Conflict<Leaderboard>>;
-
-[GenerateOneOf]
-public partial class RestoreLeaderboardResult : OneOfBase<Leaderboard, NotFound, LeaderboardNeverDeleted, Conflict<Leaderboard>>;

LeaderboardBackend/Services/Impl/CategoryService.cs

@@ -66,4 +66,11 @@ public async Task<DeleteResult> DeleteCategory(long id)
         await applicationContext.SaveChangesAsync();
         return new Success();
     }
+
+    public async Task<RestoreResult<Category>> RestoreCategory(long id)
+    {
+        Category? category = await applicationContext.Categories.FindAsync(id);
+
+        return new NotFound();
+    }
 }

LeaderboardBackend/Services/Impl/LeaderboardService.cs

@@ -48,7 +48,7 @@ public async Task<CreateLeaderboardResult> CreateLeaderboard(CreateLeaderboardRe
         return lb;
     }
 
-    public async Task<RestoreLeaderboardResult> RestoreLeaderboard(long id)
+    public async Task<RestoreResult<Leaderboard>> RestoreLeaderboard(long id)
     {
         Leaderboard? lb = await applicationContext.Leaderboards.FindAsync(id);
 
@@ -59,7 +59,7 @@ public async Task<RestoreLeaderboardResult> RestoreLeaderboard(long id)
 
         if (lb.DeletedAt == null)
         {
-            return new LeaderboardNeverDeleted();
+            return new NeverDeleted();
         }
 
         lb.DeletedAt = null;