feat: enhance searching and use string.Contains

GZTimeWalker · Mar 31, 2024 · 43d2154 · 43d2154
1 parent 37d9cb9
commit 43d2154
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/GZCTF/Controllers/AdminController.cs b/src/GZCTF/Controllers/AdminController.cs
@@ -200,17 +200,21 @@ public async Task<IActionResult> AddUsers([FromBody] UserCreateModel[] model, Ca
     /// <response code="403">禁止访问</response>
     [HttpPost("Users/Search")]
     [ProducesResponseType(typeof(ArrayResponse<UserInfoModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchUsers([FromQuery] string hint, CancellationToken token = default) =>
-        Ok((await userManager.Users.Where(item =>
-                    EF.Functions.Like(item.UserName!, $"%{hint}%") ||
-                    EF.Functions.Like(item.StdNumber, $"%{hint}%") ||
-                    EF.Functions.Like(item.Email!, $"%{hint}%") ||
-                    EF.Functions.Like(item.Id.ToString(), $"%{hint}%") ||
-                    EF.Functions.Like(item.RealName, $"%{hint}%")
+    public async Task<IActionResult> SearchUsers([FromQuery] string hint, CancellationToken token = default)
+    {
+        var loweredHint = hint.ToLower();
+        return Ok((await userManager.Users.Where(item =>
+                    item.UserName!.ToLower().Contains(loweredHint) || 
+                    item.StdNumber.ToLower().Contains(loweredHint) ||
+                    item.Email!.ToLower().Contains(loweredHint) ||
+                    item.PhoneNumber!.ToLower().Contains(loweredHint) ||
+                    item.Id.ToString().ToLower().Contains(loweredHint) ||
+                    item.RealName.ToLower().Contains(loweredHint)
                 )
                 .OrderBy(e => e.Id).Take(30).ToArrayAsync(token))
             .Select(UserInfoModel.FromUserInfo)
             .ToResponse());
+    }
 
     /// <summary>
     /// 获取全部队伍信息

diff --git a/src/GZCTF/Repositories/TeamRepository.cs b/src/GZCTF/Repositories/TeamRepository.cs
@@ -59,9 +59,15 @@ public Task DeleteTeam(Team team, CancellationToken token = default)
         Context.Teams.Where(t => t.Members.Any(u => u.Id == user.Id))
             .Include(t => t.Members).ToArrayAsync(token);
 
-    public Task<Team[]> SearchTeams(string hint, CancellationToken token = default) =>
-        Context.Teams.Include(t => t.Members).Where(item => EF.Functions.Like(item.Name, $"%{hint}%"))
-            .OrderBy(t => t.Id).Take(30).ToArrayAsync(token);
+    public Task<Team[]> SearchTeams(string hint, CancellationToken token = default)
+    {
+        var loweredHint = hint.ToLower();
+        var query = int.TryParse(hint, out int id)
+            ? Context.Teams.Include(t => t.Members).Where(item => item.Name.ToLower().Contains(loweredHint) || item.Id == id)
+            : Context.Teams.Include(t => t.Members).Where(item => item.Name.ToLower().Contains(loweredHint));
+
+        return query.OrderBy(t => t.Id).Take(30).ToArrayAsync(token);
+    }
 
     public Task Transfer(Team team, UserInfo user, CancellationToken token = default)
     {