SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(guild): change_role atomic transfer + friend_list

Browse Source 
- ChangeRoleAsync: Leader-only role management with SubLeader cap check.
  Atomic leader transfer loads both member rows + Guild.LeaderViewerId in
  one _db.SaveChangesAsync call (no split saves). Emits ChangeLeader (6)
  or ChangeSubLeader (7) chat events. Same-role is no-op / returns Ok.
- /guild/change_role controller: calls ChangeRoleAsync, returns full updated
  member list (GuildChangeRoleResponse.Members[]).
- /guild/friend_list controller: calls IFriendService.GetFriendsAsync, then
  annotates each friend with is_join_guild from Viewer.GuildId column.
- IGuildRepository.UpdateLeaderViewerIdAsync: added for completeness even
  though the atomic transfer path bypasses it via direct EF mutation.
- Tests: 8 GuildServiceChangeRoleTests (role changes, cap, atomic transfer,
  no-op, permission); 3 GuildChangeRoleFriendListFlowTests (HTTP roundtrip,
  is_join_guild); 2 GuildWireShape tests (literal JSON shape); 1508 pass.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-06-27 14:27:13 -04:00
parent 00fb28681b
commit f2b996a593
7 changed files with 833 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SVSim.Database/Repositories/Guild/GuildRepository.cs
View File

@@ -95,4 +95,12 @@ public sealed class GuildRepository : IGuildRepository
guild.EmblemId = emblemId;
await _db.SaveChangesAsync(ct);
}
public async Task UpdateLeaderViewerIdAsync(int guildId, long newLeaderViewerId, CancellationToken ct = default)
{
var guild = await _db.Guilds.FirstOrDefaultAsync(g => g.GuildId == guildId, ct);
if (guild is null) return;
guild.LeaderViewerId = newLeaderViewerId;
await _db.SaveChangesAsync(ct);
}
}

3
SVSim.Database/Repositories/Guild/IGuildRepository.cs
View File

@@ -33,4 +33,7 @@ public interface IGuildRepository
/// <summary>Overwrites the emblem_id field.</summary>
Task UpdateEmblemAsync(int guildId, long emblemId, CancellationToken ct = default);
/// <summary>Updates LeaderViewerId on the Guild row — used by ChangeRoleAsync atomic leader transfer.</summary>
Task UpdateLeaderViewerIdAsync(int guildId, long newLeaderViewerId, CancellationToken ct = default);
}

56
SVSim.Database/Services/Guild/GuildService.cs
View File

@@ -403,8 +403,60 @@ public sealed class GuildService : IGuildService
return GuildOpResult.Ok;
}
public Task<GuildOpResult> ChangeRoleAsync(long callerViewerId, long targetViewerId, int newRoleId, CancellationToken ct = default)
=> throw new NotImplementedException();
public async Task<GuildOpResult> ChangeRoleAsync(long callerViewerId, long targetViewerId, int newRoleId, CancellationToken ct = default)
{
if (newRoleId is < 0 or > 2) return new(GuildOpResultCode.InvalidRoleTransition);
var newRole = (GuildRole)newRoleId;
var caller = await _members.GetMembershipAsync(callerViewerId, ct);
if (caller is null) return new(GuildOpResultCode.NotInGuild);
if (caller.Role != GuildRole.Leader) return new(GuildOpResultCode.PermissionDenied);
var target = await _members.GetMembershipAsync(targetViewerId, ct);
if (target is null || target.GuildId != caller.GuildId) return new(GuildOpResultCode.TargetNotInGuild);
// No-op: same role.
if (target.Role == newRole) return GuildOpResult.Ok;
// SubLeader cap check.
if (newRole == GuildRole.SubLeader)
{
var subs = await _members.CountByGuildAndRoleAsync(caller.GuildId, GuildRole.SubLeader, ct);
var cfg = _config.Get<GuildConfig>();
if (subs >= cfg.MaxSubLeaderNum) return new(GuildOpResultCode.SubLeaderCapReached);
}
if (newRole == GuildRole.Leader)
{
// Atomic leader transfer: load both member rows and the guild row, mutate all
// in one scope, then save once — no individual repository SaveChanges calls.
var guildRow = await _db.Guilds.FirstOrDefaultAsync(g => g.GuildId == caller.GuildId, ct);
var targetMember = await _db.GuildMembers
.FirstOrDefaultAsync(m => m.GuildId == caller.GuildId && m.ViewerId == targetViewerId, ct);
var callerMember = await _db.GuildMembers
.FirstOrDefaultAsync(m => m.GuildId == caller.GuildId && m.ViewerId == callerViewerId, ct);
if (guildRow is null || targetMember is null || callerMember is null)
return new(GuildOpResultCode.TargetNotInGuild);
targetMember.Role = GuildRole.Leader;
callerMember.Role = GuildRole.Regular;
guildRow.LeaderViewerId = targetViewerId;
await _db.SaveChangesAsync(ct);
await _chat.EmitSystemEventAsync(caller.GuildId, callerViewerId, GuildChatMessageType.ChangeLeader,
body: targetViewerId.ToString(), ct);
}
else
{
await _members.UpdateRoleAsync(caller.GuildId, targetViewerId, newRole, ct);
if (newRole == GuildRole.SubLeader)
await _chat.EmitSystemEventAsync(caller.GuildId, callerViewerId, GuildChatMessageType.ChangeSubLeader,
body: targetViewerId.ToString(), ct);
}
return GuildOpResult.Ok;
}
public Task<IReadOnlyList<Entities.Guild.GuildInvite>> ListPendingInvitesForMeAsync(long viewerId, CancellationToken ct = default)
=> _invites.ListPendingForInviteeAsync(viewerId, ct);