Refactor DTOs into namespaces and update response types

XIYUEKONGLING · XIYUEKONGLING · commit 0c69ffb251e8 · 2025-12-22T23:45:29.000+08:00
diff --git a/OpenBioCardServer/Controllers/Classic/ClassicAdminController.cs b/OpenBioCardServer/Controllers/Classic/ClassicAdminController.cs
@@ -3,6 +3,8 @@
 using OpenBioCardServer.Constants;
 using OpenBioCardServer.Data;
 using OpenBioCardServer.Models.DTOs.Classic;
+using OpenBioCardServer.Models.DTOs.Classic.Admin;
+using OpenBioCardServer.Models.DTOs.Classic.General;
 using OpenBioCardServer.Models.Entities;
 using OpenBioCardServer.Models.Enums;
 using OpenBioCardServer.Services;
@@ -56,10 +58,10 @@ public async Task<IActionResult> CheckPermission([FromBody] ClassicAdminRequest
                 return StatusCode(403, new ClassicErrorResponse("Insufficient permissions"));
             }
 
-            return Ok(new 
+            return Ok(new ClassicCheckPermissionResponse
             { 
-                success = true, 
-                type = account.Type.ToString().ToLower() 
+                Success = true, 
+                Type = account.Type.ToString().ToLower() 
             });
         }
         catch (Exception ex)
@@ -210,10 +212,10 @@ public async Task<IActionResult> CreateUser([FromBody] ClassicCreateUserRequest
             _logger.LogInformation("Admin {AdminUser} created new user: {NewUser} (Type: {Type})", 
                 request.Username, request.NewUsername, userType);
 
-            return Ok(new 
+            return Ok(new ClassicCreateUserResponse
             { 
-                message = "User created", 
-                token = newToken 
+                Message = "User created", 
+                Token = newToken 
             });
         }
         catch (Exception ex)
@@ -278,7 +280,7 @@ public async Task<IActionResult> DeleteUser(string targetUsername, [FromBody] Cl
             _logger.LogInformation("Admin {AdminUser} deleted user: {TargetUser}", 
                 request.Username, targetUsername);
 
-            return Ok(new { message = "User deleted" });
+            return Ok(new ClassicOkResponse("User deleted"));
         }
         catch (Exception ex)
         {
diff --git a/OpenBioCardServer/Controllers/Classic/ClassicAuthController.cs b/OpenBioCardServer/Controllers/Classic/ClassicAuthController.cs
@@ -4,6 +4,8 @@
 using OpenBioCardServer.Constants;
 using OpenBioCardServer.Data;
 using OpenBioCardServer.Models.DTOs.Classic;
+using OpenBioCardServer.Models.DTOs.Classic.Auth;
+using OpenBioCardServer.Models.DTOs.Classic.General;
 using OpenBioCardServer.Models.Entities;
 using OpenBioCardServer.Models.Enums;
 using OpenBioCardServer.Services;
@@ -216,7 +218,7 @@ public async Task<IActionResult> DeleteAccount([FromBody] ClassicDeleteRequest r
 
             _logger.LogInformation("User deleted their account: {Username}", request.Username);
 
-            return Ok(new ClassicErrorResponse("Account deleted successfully"));
+            return Ok(new ClassicOkResponse("Account deleted successfully"));
         }
         catch (Exception ex)
         {
diff --git a/OpenBioCardServer/Controllers/Classic/ClassicSettingsController.cs b/OpenBioCardServer/Controllers/Classic/ClassicSettingsController.cs
@@ -7,6 +7,9 @@
 using OpenBioCardServer.Data;
 using OpenBioCardServer.Interfaces;
 using OpenBioCardServer.Models.DTOs.Classic;
+using OpenBioCardServer.Models.DTOs.Classic.Admin;
+using OpenBioCardServer.Models.DTOs.Classic.General;
+using OpenBioCardServer.Models.DTOs.Classic.Settings;
 using OpenBioCardServer.Models.Entities;
 using OpenBioCardServer.Models.Enums;
 using OpenBioCardServer.Services;
@@ -183,7 +186,7 @@ public async Task<IActionResult> UpdateSettings([FromBody] ClassicUpdateSettings
 
             _logger.LogInformation("Admin {Username} updated system settings", request.Username);
 
-            return Ok(new { success = true });
+            return Ok(new ClassicSuccessResponse(true));
         }
         catch (Exception ex)
         {
diff --git a/OpenBioCardServer/Controllers/Classic/ClassicUserController.cs b/OpenBioCardServer/Controllers/Classic/ClassicUserController.cs
@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenBioCardServer.Models.DTOs.Classic;
+using OpenBioCardServer.Models.DTOs.Classic.General;
+using OpenBioCardServer.Models.DTOs.Classic.Profile;
 using OpenBioCardServer.Services;
 
 namespace OpenBioCardServer.Controllers.Classic;
@@ -80,7 +82,7 @@ public async Task<IActionResult> UpdateProfile(string username, [FromBody] Class
                 return NotFound(new ClassicErrorResponse("Profile not found"));
             }
 
-            return Ok(new { success = true });
+            return Ok(new ClassicSuccessResponse(true));
         }
         catch (Exception)
         {
@@ -135,7 +137,7 @@ public async Task<IActionResult> ExportData(string username)
     /// Import user data (requires authentication)
     /// </summary>
     [HttpPost("{username}/import")]
-    public async Task<IActionResult> ImportData(string username, [FromBody] ClassicImportExportDto request)
+    public async Task<IActionResult> ImportData(string username, [FromBody] ClassicUserImportDto request)
     {
         var token = GetTokenFromHeader();
         
@@ -165,7 +167,7 @@ public async Task<IActionResult> ImportData(string username, [FromBody] ClassicI
                 return BadRequest(new ClassicErrorResponse("Import failed or username mismatch"));
             }
 
-            return Ok(new { success = true });
+            return Ok(new ClassicSuccessResponse(true));
         }
         catch (Exception ex)
         {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicAdminRequest.cs b/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicAdminRequest.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Admin;
 
 public class ClassicAdminRequest
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicCheckPermissionResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicCheckPermissionResponse.cs
@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace OpenBioCardServer.Models.DTOs.Classic.Admin;
+
+public class ClassicCheckPermissionResponse
+{
+    [JsonProperty("success")]
+    public bool Success { get; set; }
+    
+    [JsonProperty("type")]
+    public string Type { get; set; } = string.Empty;
+}
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicCreateUserRequest.cs b/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicCreateUserRequest.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Admin;
 
 public class ClassicCreateUserRequest
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicCreateUserResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicCreateUserResponse.cs
@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace OpenBioCardServer.Models.DTOs.Classic.Admin;
+
+public class ClassicCreateUserResponse
+{
+    [JsonProperty("message")]
+    public string Message { get; set; } = string.Empty;
+    
+    [JsonProperty("token")]
+    public string Token { get; set; } = string.Empty;
+}
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicUserListResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/Admin/ClassicUserListResponse.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Admin;
 
 public class ClassicUserListResponse
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicDeleteRequest.cs b/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicDeleteRequest.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Auth;
 
 public class ClassicDeleteRequest
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicSignInRequest.cs b/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicSignInRequest.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Auth;
 
 public class ClassicSignInRequest
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicSignUpRequest.cs b/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicSignUpRequest.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Auth;
 
 public class ClassicSignUpRequest
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicTokenResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/Auth/ClassicTokenResponse.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Auth;
 
 public class ClassicTokenResponse
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/General/ClassicOkResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/General/ClassicOkResponse.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+
+namespace OpenBioCardServer.Models.DTOs.Classic.General;
+
+public class ClassicOkResponse
+{
+    [JsonProperty("message")]
+    public string Message { get; set; } = string.Empty;
+
+    public ClassicOkResponse()
+    {
+        
+    }
+
+    public ClassicOkResponse(string message)
+    {
+        Message = message;
+    }
+}
diff --git a/OpenBioCardServer/Models/DTOs/Classic/General/ClassicSuccessResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/General/ClassicSuccessResponse.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+
+namespace OpenBioCardServer.Models.DTOs.Classic.General;
+
+public class ClassicSuccessResponse
+{
+    [JsonProperty("success")]
+    public bool Success { get; set; }
+
+    public ClassicSuccessResponse()
+    {
+        
+    }
+
+    public ClassicSuccessResponse(bool success)
+    {
+        Success = success;
+    }
+}
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Profile/ClassicUserExportDto.cs b/OpenBioCardServer/Models/DTOs/Classic/Profile/ClassicUserExportDto.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Profile;
 
 public class ClassicUserExportDto
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Profile/ClassicUserImportDto.cs b/OpenBioCardServer/Models/DTOs/Classic/Profile/ClassicUserImportDto.cs
@@ -1,8 +1,8 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Profile;
 
-public class ClassicImportExportDto
+public class ClassicUserImportDto
 {
     [JsonProperty("user")]
     public ClassicUserExportDto User { get; set; } = new();
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Settings/ClassicPublicSettingsResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/Settings/ClassicPublicSettingsResponse.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Settings;
 
 public class ClassicPublicSettingsResponse
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Settings/ClassicSystemSettingsResponse.cs b/OpenBioCardServer/Models/DTOs/Classic/Settings/ClassicSystemSettingsResponse.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Settings;
 
 public class ClassicSystemSettingsResponse
 {
diff --git a/OpenBioCardServer/Models/DTOs/Classic/Settings/ClassicUpdateSettingsRequest.cs b/OpenBioCardServer/Models/DTOs/Classic/Settings/ClassicUpdateSettingsRequest.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OpenBioCardServer.Models.DTOs.Classic;
+namespace OpenBioCardServer.Models.DTOs.Classic.Settings;
 
 public class ClassicUpdateSettingsRequest
 {
diff --git a/OpenBioCardServer/Services/ClassicProfileService.cs b/OpenBioCardServer/Services/ClassicProfileService.cs
@@ -2,6 +2,7 @@
 using OpenBioCardServer.Constants;
 using OpenBioCardServer.Data;
 using OpenBioCardServer.Models.DTOs.Classic;
+using OpenBioCardServer.Models.DTOs.Classic.Profile;
 using OpenBioCardServer.Utilities.Mappers;
 using ZiggyCreatures.Caching.Fusion;
 
@@ -51,7 +52,7 @@ public ClassicProfileService(
     /// <summary>
     /// 获取用户完整导出数据 (User + Profile)
     /// </summary>
-    public async Task<ClassicImportExportDto?> GetExportDataAsync(string username, string currentToken)
+    public async Task<ClassicUserImportDto?> GetExportDataAsync(string username, string currentToken)
     {
         var account = await _context.Accounts
             .AsNoTracking()
@@ -62,7 +63,7 @@ public ClassicProfileService(
         var profileDto = await GetProfileAsync(username);
         if (profileDto == null) return null;
 
-        return new ClassicImportExportDto
+        return new ClassicUserImportDto
         {
             User = new ClassicUserExportDto
             {
@@ -77,7 +78,7 @@ public ClassicProfileService(
     /// <summary>
     /// 导入用户数据 (主要更新 Profile)
     /// </summary>
-    public async Task<bool> ImportDataAsync(string username, ClassicImportExportDto data)
+    public async Task<bool> ImportDataAsync(string username, ClassicUserImportDto data)
     {
         // 验证导入的数据是否属于当前用户
         if (!string.Equals(data.User.Username, username, StringComparison.OrdinalIgnoreCase))

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc;`
`2`	`2`	`using OpenBioCardServer.Models.DTOs.Classic;`
	`3`	`+using OpenBioCardServer.Models.DTOs.Classic.General;`
	`4`	`+using OpenBioCardServer.Models.DTOs.Classic.Profile;`
`3`	`5`	`using OpenBioCardServer.Services;`
`4`	`6`
`5`	`7`	`namespace OpenBioCardServer.Controllers.Classic;`
`@@ -80,7 +82,7 @@ public async Task<IActionResult> UpdateProfile(string username, [FromBody] Class`
`80`	`82`	`return NotFound(new ClassicErrorResponse("Profile not found"));`
`81`	`83`	`}`
`82`	`84`
`83`		`- return Ok(new { success = true });`
	`85`	`+ return Ok(new ClassicSuccessResponse(true));`
`84`	`86`	`}`
`85`	`87`	`catch (Exception)`
`86`	`88`	`{`
`@@ -135,7 +137,7 @@ public async Task<IActionResult> ExportData(string username)`
`135`	`137`	`/// Import user data (requires authentication)`
`136`	`138`	`/// </summary>`
`137`	`139`	`[HttpPost("{username}/import")]`
`138`		`- public async Task<IActionResult> ImportData(string username, [FromBody] ClassicImportExportDto request)`
	`140`	`+ public async Task<IActionResult> ImportData(string username, [FromBody] ClassicUserImportDto request)`
`139`	`141`	`{`
`140`	`142`	`var token = GetTokenFromHeader();`
`141`	`143`
`@@ -165,7 +167,7 @@ public async Task<IActionResult> ImportData(string username, [FromBody] ClassicI`
`165`	`167`	`return BadRequest(new ClassicErrorResponse("Import failed or username mismatch"));`
`166`	`168`	`}`
`167`	`169`
`168`		`- return Ok(new { success = true });`
	`170`	`+ return Ok(new ClassicSuccessResponse(true));`
`169`	`171`	`}`
`170`	`172`	`catch (Exception ex)`
`171`	`173`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`	`2`
`3`		`-namespace OpenBioCardServer.Models.DTOs.Classic;`
	`3`	`+namespace OpenBioCardServer.Models.DTOs.Classic.Admin;`
`4`	`4`
`5`	`5`	`public class ClassicAdminRequest`
`6`	`6`	`{`