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

fix(achievement): fix test failures from migration 0008 side effects

Browse Source 
GetAllScores used SELECT * which broke when displayed_levels column was
added — now uses explicit column names. DisplayedAchievement handler
panicked on nil achievementService in empty-handler smoke tests — added
nil guard. Updated msg_build_test.go for renamed tactics point fields.
This commit is contained in:
Houmgaor
2026-03-18 12:14:31 +01:00
parent 792dcd5d91
commit 8785ebc21a
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
network/mhfpacket/msg_build_test.go
View File

@@ -654,8 +654,8 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
ackHandle uint32 ackHandle uint32
unk0 uint16 questID uint16
unk1 uint32 tacticsPoints uint32
}{ }{
{"typical", 1, 100, 50000}, {"typical", 1, 100, 50000},
{"zero", 0, 0, 0}, {"zero", 0, 0, 0},
@@ -667,8 +667,8 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfAddUdTacticsPoint{ original := &MsgMhfAddUdTacticsPoint{
AckHandle: tt.ackHandle, AckHandle: tt.ackHandle,
Unk0: tt.unk0, QuestID: tt.questID,
Unk1: tt.unk1, TacticsPoints: tt.tacticsPoints,
} }
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
@@ -685,11 +685,11 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
if parsed.AckHandle != original.AckHandle { if parsed.AckHandle != original.AckHandle {
t.Errorf("AckHandle = 0x%X, want 0x%X", parsed.AckHandle, original.AckHandle) t.Errorf("AckHandle = 0x%X, want 0x%X", parsed.AckHandle, original.AckHandle)
} }
if parsed.Unk0 != original.Unk0 { if parsed.QuestID != original.QuestID {
t.Errorf("Unk0 = %d, want %d", parsed.Unk0, original.Unk0) t.Errorf("QuestID = %d, want %d", parsed.QuestID, original.QuestID)
} }
if parsed.Unk1 != original.Unk1 { if parsed.TacticsPoints != original.TacticsPoints {
t.Errorf("Unk1 = %d, want %d", parsed.Unk1, original.Unk1) t.Errorf("TacticsPoints = %d, want %d", parsed.TacticsPoints, original.TacticsPoints)
} }
}) })
} }

3
server/channelserver/handlers_achievement.go
View File

@@ -152,6 +152,9 @@ func handleMsgMhfAddAchievement(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfPaymentAchievement(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfPaymentAchievement(s *Session, p mhfpacket.MHFPacket) {}
func handleMsgMhfDisplayedAchievement(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfDisplayedAchievement(s *Session, p mhfpacket.MHFPacket) {
if s.server.achievementService == nil {
return
}
if err := s.server.achievementService.MarkDisplayed(s.charID); err != nil { if err := s.server.achievementService.MarkDisplayed(s.charID); err != nil {
s.logger.Warn("Failed to mark achievements as displayed", zap.Error(err)) s.logger.Warn("Failed to mark achievements as displayed", zap.Error(err))
} }

5
server/channelserver/repo_achievement.go
View File

@@ -25,7 +25,10 @@ func (r *AchievementRepository) EnsureExists(charID uint32) error {
// GetAllScores returns all 33 achievement scores for a character. // GetAllScores returns all 33 achievement scores for a character.
func (r *AchievementRepository) GetAllScores(charID uint32) ([33]int32, error) { func (r *AchievementRepository) GetAllScores(charID uint32) ([33]int32, error) {
var scores [33]int32 var scores [33]int32
err := r.db.QueryRow("SELECT * FROM achievements WHERE id=$1", charID).Scan(&scores[0], err := r.db.QueryRow(`SELECT ach0,ach1,ach2,ach3,ach4,ach5,ach6,ach7,ach8,ach9,
ach10,ach11,ach12,ach13,ach14,ach15,ach16,ach17,ach18,ach19,
ach20,ach21,ach22,ach23,ach24,ach25,ach26,ach27,ach28,ach29,
ach30,ach31,ach32 FROM achievements WHERE id=$1`, charID).Scan(
&scores[0], &scores[1], &scores[2], &scores[3], &scores[4], &scores[5], &scores[6], &scores[7], &scores[8], &scores[0], &scores[1], &scores[2], &scores[3], &scores[4], &scores[5], &scores[6], &scores[7], &scores[8],
&scores[9], &scores[10], &scores[11], &scores[12], &scores[13], &scores[14], &scores[15], &scores[16], &scores[9], &scores[10], &scores[11], &scores[12], &scores[13], &scores[14], &scores[15], &scores[16],
&scores[17], &scores[18], &scores[19], &scores[20], &scores[21], &scores[22], &scores[23], &scores[24], &scores[17], &scores[18], &scores[19], &scores[20], &scores[21], &scores[22], &scores[23], &scores[24],