api: AddUsers

GZTimeWalker · GZTimeWalker · commit 259250a3c766 · 2023-04-18T17:43:11.000+08:00
diff --git a/src/GZCTF/ClientApp/src/Api.ts b/src/GZCTF/ClientApp/src/Api.ts
@@ -323,13 +323,25 @@ export interface UserCreateModel {
    * @minLength 1
    */
   email: string
-  /** 真实姓名 */
+  /**
+   * 真实姓名
+   * @maxLength 7
+   */
   realName?: string | null
-  /** 学号 */
+  /**
+   * 学号
+   * @maxLength 15
+   */
   stdNumber?: string | null
-  /** 联系电话 */
+  /**
+   * 联系电话
+   * @format phone
+   */
   phone?: string | null
-  /** 用户加入的队伍 */
+  /**
+   * 用户加入的队伍
+   * @maxLength 15
+   */
   teamName?: string | null
 }
 
diff --git a/src/GZCTF/Controllers/AdminController.cs b/src/GZCTF/Controllers/AdminController.cs
@@ -129,26 +129,28 @@ select UserInfoModel.FromUserInfo(user)
     /// 使用此接口批量添加用户，需要Admin权限
     /// </remarks>
     /// <response code="200">成功添加</response>
+    /// <response code="400">用户校验失败</response>
     /// <response code="401">未授权用户</response>
     /// <response code="403">禁止访问</response>
     [HttpPost("Users")]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> AddUsers([FromBody] List<UserCreateModel> model, CancellationToken token = default)
+    [ProducesResponseType(typeof(RequestResponse), StatusCodes.Status400BadRequest)]
+    public async Task<IActionResult> AddUsers([FromBody] UserCreateModel[] model, CancellationToken token = default)
     {
         var trans = await teamRepository.BeginTransactionAsync(token);
 
         try
         {
-            var users = new List<(UserInfo, string?)>(model.Count);
-            foreach(var user in model)
+            var users = new List<(UserInfo, string?)>(model.Length);
+            foreach (var user in model)
             {
                 var userInfo = user.ToUserInfo();
                 await userManager.CreateAsync(userInfo, user.Password);
                 users.Add((userInfo, user.TeamName));
             }
 
             var teams = new List<Team>();
-            foreach(var (user, teamName) in users)
+            foreach (var (user, teamName) in users)
             {
                 if (teamName is null)
                     continue;
@@ -165,6 +167,9 @@ public async Task<IActionResult> AddUsers([FromBody] List<UserCreateModel> model
                 }
             }
 
+            await teamRepository.SaveAsync(token);
+            await trans.CommitAsync(token);
+
             return Ok();
         }
         catch
diff --git a/src/GZCTF/Models/Request/Admin/UserCreateModel.cs b/src/GZCTF/Models/Request/Admin/UserCreateModel.cs
@@ -32,21 +32,25 @@ public class UserCreateModel
     /// <summary>
     /// 真实姓名
     /// </summary>
+    [MaxLength(7, ErrorMessage = "真实姓名过长")]
     public string? RealName { get; set; }
 
     /// <summary>
     /// 学号
     /// </summary>
+    [MaxLength(15, ErrorMessage = "学工号过长")]
     public string? StdNumber { get; set; }
 
     /// <summary>
     /// 联系电话
     /// </summary>
+    [Phone(ErrorMessage = "手机号格式错误")]
     public string? Phone { get; set; }
 
     /// <summary>
     /// 用户加入的队伍
     /// </summary>
+    [MaxLength(15, ErrorMessage = "队伍名称过长")]
     public string? TeamName { get; set; }
 
     internal UserInfo ToUserInfo()
diff --git a/src/GZCTF/Program.cs b/src/GZCTF/Program.cs
@@ -230,7 +230,7 @@
     options.InvalidModelStateResponseFactory = context =>
     {
         var errmsg = context.ModelState.Values.FirstOrDefault()?.Errors.FirstOrDefault()?.ErrorMessage;
-        return new JsonResult(new RequestResponse(errmsg ?? "验证失败，请检查输入。"))
+        return new JsonResult(new RequestResponse(errmsg is not null && errmsg.Length > 0 ? errmsg : "校验失败，请检查输入。"))
         {
             StatusCode = 400
         };

Original file line number	Diff line number	Diff line change
`@@ -129,26 +129,28 @@ select UserInfoModel.FromUserInfo(user)`
`129`	`129`	`/// 使用此接口批量添加用户，需要Admin权限`
`130`	`130`	`/// </remarks>`
`131`	`131`	`/// <response code="200">成功添加</response>`
	`132`	`+ /// <response code="400">用户校验失败</response>`
`132`	`133`	`/// <response code="401">未授权用户</response>`
`133`	`134`	`/// <response code="403">禁止访问</response>`
`134`	`135`	`[HttpPost("Users")]`
`135`	`136`	`[ProducesResponseType(StatusCodes.Status200OK)]`
`136`		`- public async Task<IActionResult> AddUsers([FromBody] List<UserCreateModel> model, CancellationToken token = default)`
	`137`	`+ [ProducesResponseType(typeof(RequestResponse), StatusCodes.Status400BadRequest)]`
	`138`	`+ public async Task<IActionResult> AddUsers([FromBody] UserCreateModel[] model, CancellationToken token = default)`
`137`	`139`	`{`
`138`	`140`	`var trans = await teamRepository.BeginTransactionAsync(token);`
`139`	`141`
`140`	`142`	`try`
`141`	`143`	`{`
`142`		`- var users = new List<(UserInfo, string?)>(model.Count);`
`143`		`- foreach(var user in model)`
	`144`	`+ var users = new List<(UserInfo, string?)>(model.Length);`
	`145`	`+ foreach (var user in model)`
`144`	`146`	`{`
`145`	`147`	`var userInfo = user.ToUserInfo();`
`146`	`148`	`await userManager.CreateAsync(userInfo, user.Password);`
`147`	`149`	`users.Add((userInfo, user.TeamName));`
`148`	`150`	`}`
`149`	`151`
`150`	`152`	`var teams = new List<Team>();`
`151`		`- foreach(var (user, teamName) in users)`
	`153`	`+ foreach (var (user, teamName) in users)`
`152`	`154`	`{`
`153`	`155`	`if (teamName is null)`
`154`	`156`	`continue;`
`@@ -165,6 +167,9 @@ public async Task<IActionResult> AddUsers([FromBody] List<UserCreateModel> model`
`165`	`167`	`}`
`166`	`168`	`}`
`167`	`169`
	`170`	`+ await teamRepository.SaveAsync(token);`
	`171`	`+ await trans.CommitAsync(token);`
	`172`	`+`
`168`	`173`	`return Ok();`
`169`	`174`	`}`
`170`	`175`	`catch`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@`
`230`	`230`	`options.InvalidModelStateResponseFactory = context =>`
`231`	`231`	`{`
`232`	`232`	`var errmsg = context.ModelState.Values.FirstOrDefault()?.Errors.FirstOrDefault()?.ErrorMessage;`
`233`		`- return new JsonResult(new RequestResponse(errmsg ?? "验证失败，请检查输入。"))`
	`233`	`+ return new JsonResult(new RequestResponse(errmsg is not null && errmsg.Length > 0 ? errmsg : "校验失败，请检查输入。"))`
`234`	`234`	`{`
`235`	`235`	`StatusCode = 400`
`236`	`236`	`};`