Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-22 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(channelserver): eliminate *sql.Tx from repository interfaces

Browse Source 
Hide transaction management inside repository implementations so
interfaces only expose domain types, enabling clean mocking and
decoupling handlers from PostgreSQL internals.

- Replace BeginTx + UpdateEventQuestStartTime with batch
  UpdateEventQuestStartTimes that manages its own transaction
- Remove tx parameter from CreateApplication, add composite
  CreateApplicationWithMail for atomic scout+mail operations
- Remove SendMailTx from MailRepo (sole caller migrated)
- Remove database/sql import from repo_interfaces.go
This commit is contained in:
Houmgaor
2026-02-21 14:56:59 +01:00
parent 35d8471d59
commit 6fbd294575
10 changed files with 130 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
server/channelserver/repo_guild_test.go
View File

@@ -270,7 +270,7 @@ func TestApplicationWorkflow(t *testing.T) {
applicantID := CreateTestCharacter(t, db, user2, "Applicant")
// Create application
err := repo.CreateApplication(guildID, applicantID, applicantID, GuildApplicationTypeApplied, nil)
err := repo.CreateApplication(guildID, applicantID, applicantID, GuildApplicationTypeApplied)
if err != nil {
t.Fatalf("CreateApplication failed: %v", err)
}
@@ -324,7 +324,7 @@ func TestRejectApplication(t *testing.T) {
user2 := CreateTestUser(t, db, "reject_user")
applicantID := CreateTestCharacter(t, db, user2, "Rejected")
err := repo.CreateApplication(guildID, applicantID, applicantID, GuildApplicationTypeApplied, nil)
err := repo.CreateApplication(guildID, applicantID, applicantID, GuildApplicationTypeApplied)
if err != nil {
t.Fatalf("CreateApplication failed: %v", err)
}
@@ -539,7 +539,7 @@ func TestCancelInvitation(t *testing.T) {
user2 := CreateTestUser(t, db, "invite_user")
char2 := CreateTestCharacter(t, db, user2, "Invited")
if err := repo.CreateApplication(guildID, char2, leaderID, GuildApplicationTypeInvited, nil); err != nil {
if err := repo.CreateApplication(guildID, char2, leaderID, GuildApplicationTypeInvited); err != nil {
t.Fatalf("CreateApplication (invited) failed: %v", err)
}
@@ -562,7 +562,7 @@ func TestListInvitedCharacters(t *testing.T) {
user2 := CreateTestUser(t, db, "scout_user")
char2 := CreateTestCharacter(t, db, user2, "Scouted")
if err := repo.CreateApplication(guildID, char2, leaderID, GuildApplicationTypeInvited, nil); err != nil {
if err := repo.CreateApplication(guildID, char2, leaderID, GuildApplicationTypeInvited); err != nil {
t.Fatalf("CreateApplication failed: %v", err)
}
@@ -602,7 +602,7 @@ func TestGetByCharIDWithApplication(t *testing.T) {
user2 := CreateTestUser(t, db, "app_char_user")
char2 := CreateTestCharacter(t, db, user2, "Applicant2")
if err := repo.CreateApplication(guildID, char2, char2, GuildApplicationTypeApplied, nil); err != nil {
if err := repo.CreateApplication(guildID, char2, char2, GuildApplicationTypeApplied); err != nil {
t.Fatalf("CreateApplication failed: %v", err)
}
@@ -624,7 +624,7 @@ func TestGetMembersApplicants(t *testing.T) {
user2 := CreateTestUser(t, db, "applicant_member_user")
char2 := CreateTestCharacter(t, db, user2, "AppMember")
if err := repo.CreateApplication(guildID, char2, char2, GuildApplicationTypeApplied, nil); err != nil {
if err := repo.CreateApplication(guildID, char2, char2, GuildApplicationTypeApplied); err != nil {
t.Fatalf("CreateApplication failed: %v", err)
}
@@ -1485,3 +1485,39 @@ func TestDisbandCleansUpAlliance(t *testing.T) {
t.Errorf("Expected alliance to be deleted after parent guild disband, got: %+v", alliance)
}
}
// --- CreateApplicationWithMail ---
func TestCreateApplicationWithMail(t *testing.T) {
repo, db, guildID, leaderID := setupGuildRepo(t)
user2 := CreateTestUser(t, db, "scout_mail_user")
char2 := CreateTestCharacter(t, db, user2, "ScoutTarget")
err := repo.CreateApplicationWithMail(
guildID, char2, leaderID, GuildApplicationTypeInvited,
leaderID, char2, "Guild Invite", "You have been invited!")
if err != nil {
t.Fatalf("CreateApplicationWithMail failed: %v", err)
}
// Verify application was created
has, err := repo.HasApplication(guildID, char2)
if err != nil {
t.Fatalf("HasApplication failed: %v", err)
}
if !has {
t.Error("Expected application to exist after CreateApplicationWithMail")
}
// Verify mail was sent
var mailCount int
if err := db.QueryRow(
"SELECT COUNT(*) FROM mail WHERE sender_id=$1 AND recipient_id=$2 AND subject=$3",
leaderID, char2, "Guild Invite").Scan(&mailCount); err != nil {
t.Fatalf("Mail verification query failed: %v", err)
}
if mailCount != 1 {
t.Errorf("Expected 1 mail row, got %d", mailCount)
}
}