Skip to content

Commit da78a49

Browse files
Fix nil panic in tests
1 parent deaa7c1 commit da78a49

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

internal/ban/ban_steam_usecase.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (s banSteamUsecase) GetByLastIP(ctx context.Context, lastIP netip.Addr, del
9191
func (s banSteamUsecase) Save(ctx context.Context, ban *domain.BanSteam) error {
9292
oldState := domain.Open
9393
if ban.BanID > 0 {
94-
existing, errExisting := s.GetByBanID(ctx, ban.BanID, false, false)
94+
existing, errExisting := s.GetByBanID(ctx, ban.BanID, true, true)
9595
if errExisting != nil {
9696
slog.Error("Failed to get existing ban", log.ErrAttr(errExisting))
9797

internal/test/main_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"context"
77
"encoding/json"
88
"fmt"
9+
"github.com/leighmacdonald/gbans/internal/notification"
910
"io"
1011
"log/slog"
1112
"net"
@@ -34,7 +35,6 @@ import (
3435
"github.com/leighmacdonald/gbans/internal/match"
3536
"github.com/leighmacdonald/gbans/internal/network"
3637
"github.com/leighmacdonald/gbans/internal/news"
37-
"github.com/leighmacdonald/gbans/internal/notification"
3838
"github.com/leighmacdonald/gbans/internal/patreon"
3939
"github.com/leighmacdonald/gbans/internal/person"
4040
"github.com/leighmacdonald/gbans/internal/report"
@@ -132,13 +132,12 @@ func TestMain(m *testing.M) {
132132
newsUC = news.NewNewsUsecase(news.NewNewsRepository(databaseConn))
133133
serversUC = servers.NewServersUsecase(servers.NewServersRepository(databaseConn))
134134
wikiUC = wiki.NewWikiUsecase(wiki.NewWikiRepository(databaseConn))
135-
135+
notificationUC = notification.NewNotificationUsecase(notification.NewNotificationRepository(databaseConn), discordUC)
136136
patreonUC = patreon.NewPatreonUsecase(patreon.NewPatreonRepository(databaseConn), configUC)
137137
personUC = person.NewPersonUsecase(person.NewPersonRepository(conf, databaseConn), configUC)
138-
wordFilterUC = wordfilter.NewWordFilterUsecase(wordfilter.NewWordFilterRepository(databaseConn), nil)
139-
forumUC = forum.NewForumUsecase(forum.NewForumRepository(databaseConn), nil)
138+
wordFilterUC = wordfilter.NewWordFilterUsecase(wordfilter.NewWordFilterRepository(databaseConn), notificationUC)
139+
forumUC = forum.NewForumUsecase(forum.NewForumRepository(databaseConn), notificationUC)
140140

141-
notificationUC = notification.NewNotificationUsecase(notification.NewNotificationRepository(databaseConn), discordUC)
142141
stateUC = state.NewStateUsecase(eventBroadcaster, state.NewStateRepository(state.NewCollector(serversUC)), configUC, serversUC)
143142

144143
networkUC = network.NewNetworkUsecase(eventBroadcaster, network.NewNetworkRepository(databaseConn), personUC, configUC)

0 commit comments

Comments
 (0)