mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-03-22 07:32:32 +01:00
refactor(channelserver): eliminate *sqlx.Rows/*sql.Rows from repository interfaces
Move scan loops from handlers into repository methods so that interfaces return typed slices instead of leaking database cursors. This fixes resource leaks (7 of 12 call sites never closed rows) and makes all 12 methods mockable for unit tests. Affected repos: CafeRepo, ShopRepo, EventRepo, RengokuRepo, DivaRepo, ScenarioRepo, MiscRepo, MercenaryRepo. New structs: DivaEvent, MercenaryLoan, GuildHuntCatUsage. EventRepo.GetEventQuests left as-is (requires broader Server refactor).
This commit is contained in:
@@ -62,15 +62,19 @@ func rengokuIsGuildFiltered(leaderboard uint32) bool {
|
||||
|
||||
// GetRanking returns rengoku scores for the given leaderboard.
|
||||
// For guild-scoped leaderboards (2,3,6,7), guildID filters the results.
|
||||
func (r *RengokuRepository) GetRanking(leaderboard uint32, guildID uint32) (*sqlx.Rows, error) {
|
||||
func (r *RengokuRepository) GetRanking(leaderboard uint32, guildID uint32) ([]RengokuScore, error) {
|
||||
col := rengokuColumnForLeaderboard(leaderboard)
|
||||
var result []RengokuScore
|
||||
var err error
|
||||
if rengokuIsGuildFiltered(leaderboard) {
|
||||
return r.db.Queryx(
|
||||
err = r.db.Select(&result,
|
||||
fmt.Sprintf("SELECT %s AS score %s WHERE guild_id=$1 ORDER BY %s DESC", col, rengokuScoreQueryRepo, col),
|
||||
guildID,
|
||||
)
|
||||
} else {
|
||||
err = r.db.Select(&result,
|
||||
fmt.Sprintf("SELECT %s AS score %s ORDER BY %s DESC", col, rengokuScoreQueryRepo, col),
|
||||
)
|
||||
}
|
||||
return r.db.Queryx(
|
||||
fmt.Sprintf("SELECT %s AS score %s ORDER BY %s DESC", col, rengokuScoreQueryRepo, col),
|
||||
)
|
||||
return result, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user