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 *sqlx.Rows/*sql.Rows from repository interfaces

Browse Source 
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:
Houmgaor
2026-02-21 14:16:58 +01:00
parent a9cca84bc3
commit 2be589beae
17 changed files with 203 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/channelserver/repo_cafe.go
View File

@@ -21,8 +21,9 @@ func (r *CafeRepository) ResetAccepted(charID uint32) error {
}
// GetBonuses returns all cafe bonuses with their claimed status for a character.
func (r *CafeRepository) GetBonuses(charID uint32) (*sqlx.Rows, error) {
return r.db.Queryx(`
func (r *CafeRepository) GetBonuses(charID uint32) ([]CafeBonus, error) {
var result []CafeBonus
err := r.db.Select(&result, `
SELECT cb.id, time_req, item_type, item_id, quantity,
(
SELECT count(*)
@@ -30,11 +31,13 @@ func (r *CafeRepository) GetBonuses(charID uint32) (*sqlx.Rows, error) {
WHERE cb.id = ca.cafe_id AND ca.character_id = $1
)::int::bool AS claimed
FROM cafebonus cb ORDER BY id ASC;`, charID)
return result, err
}
// GetClaimable returns unclaimed cafe bonuses where the character has enough accumulated time.
func (r *CafeRepository) GetClaimable(charID uint32, elapsedSec int64) (*sqlx.Rows, error) {
return r.db.Queryx(`
func (r *CafeRepository) GetClaimable(charID uint32, elapsedSec int64) ([]CafeBonus, error) {
var result []CafeBonus
err := r.db.Select(&result, `
SELECT c.id, time_req, item_type, item_id, quantity
FROM cafebonus c
WHERE (
@@ -46,6 +49,7 @@ func (r *CafeRepository) GetClaimable(charID uint32, elapsedSec int64) (*sqlx.Ro
FROM characters ch
WHERE ch.id = $1
) >= time_req`, charID, elapsedSec)
return result, err
}
// GetBonusItem returns the item type and quantity for a specific cafe bonus.