fix: #dev filter for gamerecord empty

theImmortalCoders · Nov 28, 2024 · 3c3dd65 · 3c3dd65
1 parent 5ef4ed9
commit 3c3dd65
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/rag-2-backend/Infrastructure/Dao/GameRecordDao.cs b/rag-2-backend/Infrastructure/Dao/GameRecordDao.cs
@@ -20,7 +20,7 @@ public class GameRecordDao(DatabaseContext dbContext)
     public virtual async Task<List<GameRecordResponse>> GetRecordsByGameAndUser(
         int gameId,
         int userId,
-        bool? isEmptyRecord,
+        bool? includeEmptyRecords,
         DateTime? endDateFrom,
         DateTime? endDateTo,
         SortDirection sortDirection,
@@ -33,7 +33,7 @@ GameRecordSortByFields sortBy
             .Where(r => r.Game.Id == gameId && r.User.Id == userId)
             .AsQueryable();
 
-        query = FilterGameRecords(isEmptyRecord, endDateFrom, endDateTo, query);
+        query = FilterGameRecords(includeEmptyRecords, endDateFrom, endDateTo, query);
         query = SortGameRecords(sortDirection, sortBy, query);
 
         return await Task.Run(() => query.AsEnumerable()
@@ -111,14 +111,14 @@ public virtual void PerformGameRecordTransaction(Game game, GameRecord gameRecor
     //
 
     private static IQueryable<GameRecord> FilterGameRecords(
-        bool? isEmptyRecord,
+        bool? includeEmptyRecords,
         DateTime? endDateFrom,
         DateTime? endDateTo,
         IQueryable<GameRecord> query
     )
     {
-        if (isEmptyRecord.HasValue)
-            query = query.Where(u => u.IsEmptyRecord == isEmptyRecord);
+        if (includeEmptyRecords is null or false)
+            query = query.Where(u => u.IsEmptyRecord == false);
         if (endDateFrom.HasValue)
             query = query.Where(u => u.Ended >= endDateFrom);
         if (endDateTo.HasValue)

diff --git a/rag-2-backend/Infrastructure/Module/GameRecord/GameRecordController.cs b/rag-2-backend/Infrastructure/Module/GameRecord/GameRecordController.cs
@@ -22,7 +22,7 @@ public class GameRecordController(GameRecordService gameRecordService) : Control
     public async Task<List<GameRecordResponse>> GetRecordsByGame(
         [Required] int gameId,
         [Required] int userId,
-        bool? isEmptyRecord,
+        bool? includeEmptyRecords,
         DateTime? endDateFrom,
         DateTime? endDateTo,
         SortDirection sortDirection = SortDirection.Asc,
@@ -34,7 +34,7 @@ public async Task<List<GameRecordResponse>> GetRecordsByGame(
         return await gameRecordService.GetRecordsByGameAndUser(
             gameId,
             userId,
-            isEmptyRecord,
+            includeEmptyRecords,
             endDateFrom,
             endDateTo,
             sortDirection,

diff --git a/rag-2-backend/Infrastructure/Module/GameRecord/GameRecordService.cs b/rag-2-backend/Infrastructure/Module/GameRecord/GameRecordService.cs
@@ -26,7 +26,7 @@ GameDao gameDao
     public async Task<List<GameRecordResponse>> GetRecordsByGameAndUser(
         int gameId,
         int userId,
-        bool? isEmptyRecord,
+        bool? includeEmptyRecords,
         DateTime? endDateFrom,
         DateTime? endDateTo,
         SortDirection sortDirection,
@@ -42,7 +42,7 @@ string email
         return await gameRecordDao.GetRecordsByGameAndUser(
             gameId,
             userId,
-            isEmptyRecord,
+            includeEmptyRecords,
             endDateFrom,
             endDateTo,
             sortDirection,

diff --git a/rag-2-backend/Infrastructure/Util/HashUtil.cs b/rag-2-backend/Infrastructure/Util/HashUtil.cs
@@ -1,6 +1,6 @@
 namespace rag_2_backend.Infrastructure.Util;
 
-public abstract class HashUtil
+public static class HashUtil
 {
     public static string HashPassword(string password)
     {