Add user type support to profile endpoints

Author: XIYUEKONGLING

OpenBioCardServer/Models/DTOs/Classic/ClassicProfile.cs

@@ -7,6 +7,9 @@ public class ClassicProfile
     [JsonProperty("username")]
     public string Username { get; set; } = string.Empty;
 
+    [JsonProperty("userType")]
+    public string UserType { get; set; } = "personal";
+    
     [JsonProperty("name")]
     public string Name { get; set; } = string.Empty;
 
@@ -57,4 +60,4 @@ public class ClassicProfile
 
     [JsonProperty("gallery")]
     public List<ClassicGalleryItem> Gallery { get; set; } = new();
-}
+}

OpenBioCardServer/Models/DTOs/Classic/ClassicProfilePatch.cs

@@ -11,6 +11,9 @@ public class ClassicProfilePatch
     [JsonProperty("username")]
     public string? Username { get; set; }
 
+    [JsonProperty("userType")]
+    public string? UserType { get; set; }
+    
     [JsonProperty("name")]
     public string? Name { get; set; }
 
@@ -44,10 +47,7 @@ public class ClassicProfilePatch
     [JsonProperty("currentSchoolLink")]
     public string? CurrentSchoolLink { get; set; }
 
-    // 集合类型：
-    // Null = 不更新
-    // Empty List [] = 清空列表
-    
+    // Collections...
     [JsonProperty("contacts")]
     public List<ClassicContact>? Contacts { get; set; }
 

OpenBioCardServer/Models/Enums/AccountType.cs

@@ -2,6 +2,7 @@ namespace OpenBioCardServer.Models.Enums;
 
 public enum AccountType
 {
+    Unknown,
     Personal,
     Company,
     Organization,

OpenBioCardServer/Services/ClassicProfileService.cs

@@ -38,6 +38,7 @@ public ClassicProfileService(
                 var profile = await _context.Profiles
                     .AsNoTracking()
                     .AsSplitQuery()
+                    .Include(p => p.Account)
                     .Include(p => p.Contacts)
                     .Include(p => p.SocialLinks)
                     .Include(p => p.Projects)
@@ -102,6 +103,7 @@ public async Task<bool> UpdateProfileAsync(string username, ClassicProfile reque
         {
             var profile = await _context.Profiles
                 .AsTracking()
+                .Include(p => p.Account)
                 .FirstOrDefaultAsync(p => p.AccountName == username && p.Language == null);
 
             if (profile == null)
@@ -187,6 +189,7 @@ public async Task<bool> PatchProfileAsync(string username, ClassicProfilePatch p
         {
             var profile = await _context.Profiles
                 .AsTracking()
+                .Include(p => p.Account)
                 .FirstOrDefaultAsync(p => p.AccountName == username && p.Language == null);
 
             if (profile == null)

OpenBioCardServer/Utilities/Mappers/ClassicMapper.cs

@@ -14,6 +14,8 @@ public static ClassicProfile ToClassicProfile(ProfileEntity profile)
         return new ClassicProfile
         {
             Username = profile.AccountName,
+            UserType = profile.Account != null ? ToUserTypeString(profile.Account.Type) : ToUserTypeString(AccountType.Personal),
+            
             Name = profile.Nickname ?? string.Empty,
             Pronouns = profile.Pronouns ?? string.Empty,
             Avatar = AssetToString(profile.AvatarType, profile.AvatarText, profile.AvatarData),
@@ -178,6 +180,12 @@ private static ClassicSocialLink ToClassicSocialLink(SocialLinkItemEntity s)
     public static void UpdateProfileFromClassic(ProfileEntity profile, ClassicProfile classic)
     {
         profile.AccountName = classic.Username;
+        
+        if (profile.Account != null)
+        {
+            profile.Account.Type = ParseUserType(classic.UserType);
+        }
+        
         profile.Nickname = classic.Name;
         profile.Pronouns = classic.Pronouns;
 
@@ -367,6 +375,12 @@ public static void UpdateProfileFromPatch(ProfileEntity profile, ClassicProfileP
         // 注意：如果前端传空字符串 ""，这里会更新为空字符串，符合预期（清空字段）
 
         if (patch.Username != null) profile.AccountName = patch.Username;
+        
+        if (patch.UserType != null && profile.Account != null)
+        {
+            profile.Account.Type = ParseUserType(patch.UserType);
+        }
+        
         if (patch.Name != null) profile.Nickname = patch.Name;
         if (patch.Pronouns != null) profile.Pronouns = patch.Pronouns;
 
@@ -405,4 +419,21 @@ public static void UpdateProfileFromPatch(ProfileEntity profile, ClassicProfileP
         if (patch.CurrentSchool != null) profile.CurrentSchool = patch.CurrentSchool;
         if (patch.CurrentSchoolLink != null) profile.CurrentSchoolLink = patch.CurrentSchoolLink;
     }
+    
+    // === Helpers for Account Type ===
+    private static string ToUserTypeString(AccountType type) => type switch
+    {
+        AccountType.Company => "company",
+        AccountType.Organization => "organization",
+        AccountType.Personal => "personal",
+        _ => "personal" // Default Unknown or others to personal
+    };
+    
+    private static AccountType ParseUserType(string? type) => type?.ToLowerInvariant() switch
+    {
+        "company" => AccountType.Company,
+        "organization" => AccountType.Organization,
+        "personal" => AccountType.Personal,
+        _ => AccountType.Personal // Default to Personal as requested
+    };
 }