feat(db): zone edit locks and zone editors

Tables for the one account holding a zone's lock and for each zone's assigned
editors, on MySQL and SQLite, with the interface and the test database.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 18:22:03 -06:00
parent 3072715dc3
commit 0e57b95229
13 changed files with 274 additions and 1 deletions

View File

@@ -455,3 +455,37 @@ TEST(DatabaseUsageSqlite, MeasuresTablesAndKeepsHistory) {
EXPECT_TRUE(g_Db->GetDatabaseUsageTables(1000).empty());
EXPECT_EQ(g_Db->GetDatabaseUsageTotals(0, 5000).size(), 1u);
}
// A zone's lock has one holder, taken in one statement; its editors are a set (docs/ZonePublish.md)
TEST(ZoneEditingSqliteTests, LocksAndEditors) {
auto& db = *g_Db;
EXPECT_FALSE(db.GetZoneLock(1900));
EXPECT_TRUE(db.TakeZoneLock(1900, 5, 1000));
EXPECT_FALSE(db.TakeZoneLock(1900, 6, 1001)); // held: the second taker gets nothing
auto lock = db.GetZoneLock(1900);
ASSERT_TRUE(lock);
EXPECT_EQ(lock->accountId, 5u);
EXPECT_EQ(lock->lockedAt, 1000);
EXPECT_TRUE(db.TakeZoneLock(1901, 6, 1002));
EXPECT_EQ(db.GetZoneLocks().size(), 2u);
EXPECT_TRUE(db.ReleaseZoneLock(1900));
EXPECT_FALSE(db.ReleaseZoneLock(1900));
EXPECT_TRUE(db.TakeZoneLock(1900, 6, 1003));
EXPECT_TRUE(db.ReleaseZoneLock(1900));
EXPECT_TRUE(db.ReleaseZoneLock(1901));
db.AddZoneEditor({ 1900, 5, "admin", 2000 });
db.AddZoneEditor({ 1900, 5, "other", 2001 });
db.AddZoneEditor({ 1900, 6, "admin", 2002 });
db.AddZoneEditor({ 1901, 5, "admin", 2003 });
const auto editors = db.GetZoneEditors(1900);
ASSERT_EQ(editors.size(), 2u);
EXPECT_EQ(editors[0].accountId, 5u);
EXPECT_EQ(editors[0].assignedBy, "admin");
EXPECT_EQ(db.GetZoneEditors(0).size(), 3u);
EXPECT_TRUE(db.IsZoneEditor(1900, 6));
EXPECT_FALSE(db.IsZoneEditor(1901, 6));
EXPECT_TRUE(db.RemoveZoneEditor(1900, 6));
EXPECT_FALSE(db.RemoveZoneEditor(1900, 6));
EXPECT_FALSE(db.IsZoneEditor(1900, 6));
}

View File

@@ -72,6 +72,8 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IGuilds::Event, id, guildId, time, kind, char
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IGuilds::GuildSummary, guild, memberCount, leaderId, leaderName);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IGuilds::GuildPage, total, filtered, guilds);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IApiKeys::ApiKey, id, accountId, name, note, keyHash, keyPrefix, permissions, readOnly, allowedIps, allowedPaths, rateLimit, dailyQuota, createdAt, createdBy, issuedAt, expiresAt, revokedAt, revokedBy, lastUsedAt, lastIp, requestCount, quotaDay, dayCount);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IZoneEditing::ZoneLock, zoneId, accountId, lockedAt);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IZoneEditing::ZoneEditor, zoneId, accountId, assignedBy, assignedAt);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ICharacterSnapshots::CharacterSnapshot, id, characterId, takenAt, reason, actor, size, hash, compressed);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IChatLog::ChatMessage, id, time, channel, senderId, senderName, accountId, recipientId, recipientName, zoneId, instanceId, cloneId, message, blocked, guildId, teamId, filtered);
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IChatLog::WhisperPartner, characterId, name, messages, firstTime, lastTime);
@@ -1414,6 +1416,26 @@ TEST_F(ParitySeeded, ApiKeys) {
Both("RevokeAccountApiKeys", [](GameDatabase& db) { return json{ db.RevokeAccountApiKeys(2, "bob", 1700001100), db.GetApiKeys(2), db.GetApiKeys(1) }; });
}
TEST_F(ParitySeeded, ZoneEditing) {
Both("AddZoneEditor", [](GameDatabase& db) {
db.AddZoneEditor({ 1100, 2, "alice", 1700000000 });
db.AddZoneEditor({ 1100, 2, "again", 1700000050 }); // already one: kept as it was
db.AddZoneEditor({ 1100, 1, "alice", 1700000100 });
db.AddZoneEditor({ 1200, 2, "alice", 1700000200 });
return json{ db.GetZoneEditors(1100), db.GetZoneEditors(0), db.GetZoneEditors(1300), db.IsZoneEditor(1100, 2), db.IsZoneEditor(1200, 1) };
});
Both("TakeZoneLock", [](GameDatabase& db) {
return json{ db.TakeZoneLock(1100, 2, 1700000300), db.TakeZoneLock(1100, 1, 1700000400), db.TakeZoneLock(1200, 1, 1700000500),
db.GetZoneLock(1100), db.GetZoneLock(1300), db.GetZoneLocks() };
});
Both("ReleaseZoneLock", [](GameDatabase& db) {
return json{ db.ReleaseZoneLock(1100), db.ReleaseZoneLock(1100), db.GetZoneLock(1100), db.TakeZoneLock(1100, 1, 1700000600), db.GetZoneLocks() };
});
Both("RemoveZoneEditor", [](GameDatabase& db) {
return json{ db.RemoveZoneEditor(1100, 2), db.RemoveZoneEditor(1100, 2), db.GetZoneEditors(0) };
});
}
TEST_F(ParitySeeded, Moderation) {
Both("InsertPlayerReport", [](GameDatabase& db) {
IModeration::PlayerReport report;