Remove unnecessary DB calls in service method

leaderboardsgg · Oct 23, 2024 · d86c90a · d86c90a
1 parent 68e35b6
commit d86c90a
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/LeaderboardBackend/Services/Impl/LeaderboardService.cs b/LeaderboardBackend/Services/Impl/LeaderboardService.cs
@@ -47,7 +47,7 @@ public async Task<CreateLeaderboardResult> CreateLeaderboard(CreateLeaderboardRe
     public async Task<RestoreLeaderboardResult> RestoreLeaderboard(long id)
     {
         Leaderboard? lb = await applicationContext.Leaderboards.FindAsync(id);
-
+    
         if (lb == null)
         {
             return new LeaderboardNotFound();
@@ -58,16 +58,18 @@ public async Task<RestoreLeaderboardResult> RestoreLeaderboard(long id)
             return new LeaderboardNeverDeleted();
         }
 
-        Leaderboard? maybe = await applicationContext.Leaderboards.SingleOrDefaultAsync(board => board.Slug == lb.Slug && board.DeletedAt == null);
+        lb.DeletedAt = null;
 
-        if (maybe != null)
+        try
         {
-            return new RestoreLeaderboardConflict(maybe);
+            await applicationContext.SaveChangesAsync();
+        }
+        catch (DbUpdateException e)
+            when(e.InnerException is PostgresException { SqlState: PostgresErrorCodes.UniqueViolation } pgEx)
+        {
+            Leaderboard conflict = await applicationContext.Leaderboards.SingleAsync(c => c.Slug == lb.Slug && c.DeletedAt == null);
+            return new RestoreLeaderboardConflict(conflict);
         }
-
-        lb.DeletedAt = null;
-
-        await applicationContext.SaveChangesAsync();
 
         return lb;
     }