From 9f554a30e9c9cdf181e24641918485f91f489a87 Mon Sep 17 00:00:00 2001 From: Arran Hobson Sayers Date: Tue, 3 Sep 2024 00:27:56 +0100 Subject: [PATCH] Fix linting --- .golangci.yaml | 1 + main.go | 1 - test/testutils/path.go | 2 +- twickets/fetch.go | 2 +- twickets/get_test.go | 3 +- twickets/price.go | 4 +-- twickets/ticket_test.go | 68 ++++++++++++++++++++--------------------- 7 files changed, 40 insertions(+), 41 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 07d9a67..a2ecafd 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -21,6 +21,7 @@ linters-settings: gocritic: enable-all: true disabled-checks: + - commentedOutCode - hugeParam # TODO Reenable this? - rangeValCopy - whyNoLint diff --git a/main.go b/main.go index e432dc3..d8dd4e1 100644 --- a/main.go +++ b/main.go @@ -87,7 +87,6 @@ func processTickets(tickets []twickets.Ticket) { } for _, eventName := range monitoredEventNames { - isMonitored := fuzzy.MatchNormalizedFold(eventName, ticket.Event.Name) || fuzzy.MatchNormalizedFold(ticket.Event.Name, eventName) diff --git a/test/testutils/path.go b/test/testutils/path.go index 235b5e3..054f7e1 100644 --- a/test/testutils/path.go +++ b/test/testutils/path.go @@ -24,7 +24,7 @@ func GetProjectDirectory(t *testing.T) string { } directory = filepath.Dir(directory) } - require.NotEqual(t, directory, "/", "failed find project directory") + require.NotEqual(t, "failed find project directory", directory, "/") return directory } diff --git a/twickets/fetch.go b/twickets/fetch.go index 56ab02d..b3c425c 100644 --- a/twickets/fetch.go +++ b/twickets/fetch.go @@ -32,7 +32,7 @@ func FetchLatestTickets(ctx context.Context, input GetTicketsInput) ([]Ticket, e } defer response.Body.Close() - if response != nil && response.StatusCode >= 300 { + if response.StatusCode >= 300 { return nil, fmt.Errorf("got error response: %s", response.Status) } diff --git a/twickets/get_test.go b/twickets/get_test.go index 744502f..ee2972e 100644 --- a/twickets/get_test.go +++ b/twickets/get_test.go @@ -13,8 +13,7 @@ func TestGetLatestTickets(t *testing.T) { context.Background(), twickets.GetTicketsInput{ Country: twickets.CountryUnitedKingdom, - Regions: []twickets.Region{twickets.RegionLondon}, - MaxNumber: 100, + MaxNumber: 10, }, ) require.NoError(t, err) diff --git a/twickets/price.go b/twickets/price.go index e62709d..4cd4746 100644 --- a/twickets/price.go +++ b/twickets/price.go @@ -73,7 +73,7 @@ func priceString(cost float64, currency Currency) string { currencyString := currency.Symbol() if currencyString == "" { return costString + currency.Value - } else { - return currencyString + costString } + + return currencyString + costString } diff --git a/twickets/ticket_test.go b/twickets/ticket_test.go index 1d76218..1810f28 100644 --- a/twickets/ticket_test.go +++ b/twickets/ticket_test.go @@ -25,42 +25,42 @@ func TestUnmarshalFeedJson(t *testing.T) { require.Len(t, tickets, 4) - require.Equal(t, tickets[0].Event.Name, "Foo Fighters") + require.Equal(t, "Foo Fighters", tickets[0].Event.Name) require.Len(t, tickets[0].Event.Lineup, 3) - require.Equal(t, tickets[0].Event.Lineup[0].Artist.Name, "Foo Fighters") - require.Equal(t, tickets[0].Event.Lineup[1].Artist.Name, "Wet Leg") - require.Equal(t, tickets[0].Event.Lineup[2].Artist.Name, "Shame") - require.Equal(t, tickets[0].Event.Venue.Name, "London Stadium") - require.Equal(t, tickets[0].Tour.Name, "Foo Fighters - Everything Or Nothing At All Tour") - require.Equal(t, tickets[0].TicketQuantity, 3) - require.Equal(t, tickets[0].TotalSellingPrice.String(), "£255.00") - require.Equal(t, tickets[0].TotalTwicketsFee.String(), "£38.25") - require.Equal(t, tickets[0].FaceValuePrice.String(), "£255.00") + require.Equal(t, "Foo Fighters", tickets[0].Event.Lineup[0].Artist.Name) + require.Equal(t, "Wet Leg", tickets[0].Event.Lineup[1].Artist.Name) + require.Equal(t, "Shame", tickets[0].Event.Lineup[2].Artist.Name) + require.Equal(t, "London Stadium", tickets[0].Event.Venue.Name) + require.Equal(t, "Foo Fighters - Everything Or Nothing At All Tour", tickets[0].Tour.Name) + require.Equal(t, 3, tickets[0].TicketQuantity) + require.Equal(t, "£255.00", tickets[0].TotalSellingPrice.String()) + require.Equal(t, "£38.25", tickets[0].TotalTwicketsFee.String()) + require.Equal(t, "£255.00", tickets[0].FaceValuePrice.String()) - require.Equal(t, tickets[1].Event.Name, "Mean Girls") - require.Len(t, tickets[1].Event.Lineup, 0) - require.Equal(t, tickets[1].Event.Venue.Name, "Savoy Theatre") - require.Equal(t, tickets[1].Tour.Name, "Mean Girls") - require.Equal(t, tickets[1].TicketQuantity, 2) - require.Equal(t, tickets[1].TotalSellingPrice.String(), "£130.00") - require.Equal(t, tickets[1].TotalTwicketsFee.String(), "£18.20") - require.Equal(t, tickets[1].FaceValuePrice.String(), "£130.00") + require.Equal(t, "Mean Girls", tickets[1].Event.Name) + require.Empty(t, tickets[1].Event.Lineup) + require.Equal(t, "Savoy Theatre", tickets[1].Event.Venue.Name) + require.Equal(t, "Mean Girls", tickets[1].Tour.Name) + require.Equal(t, 2, tickets[1].TicketQuantity) + require.Equal(t, "£130.00", tickets[1].TotalSellingPrice.String()) + require.Equal(t, "£18.20", tickets[1].TotalTwicketsFee.String()) + require.Equal(t, "£130.00", tickets[1].FaceValuePrice.String()) - require.Equal(t, tickets[2].Event.Name, "South Africa v Wales") - require.Len(t, tickets[2].Event.Lineup, 0) - require.Equal(t, tickets[2].Event.Venue.Name, "Twickenham Stadium") - require.Equal(t, tickets[2].Tour.Name, "South Africa v Wales") - require.Equal(t, tickets[2].TicketQuantity, 4) - require.Equal(t, tickets[2].TotalSellingPrice.String(), "£380.00") - require.Equal(t, tickets[2].TotalTwicketsFee.String(), "£53.20") - require.Equal(t, tickets[2].FaceValuePrice.String(), "£380.00") + require.Equal(t, "South Africa v Wales", tickets[2].Event.Name) + require.Empty(t, tickets[2].Event.Lineup) + require.Equal(t, "Twickenham Stadium", tickets[2].Event.Venue.Name) + require.Equal(t, "South Africa v Wales", tickets[2].Tour.Name) + require.Equal(t, 4, tickets[2].TicketQuantity) + require.Equal(t, "£380.00", tickets[2].TotalSellingPrice.String()) + require.Equal(t, "£53.20", tickets[2].TotalTwicketsFee.String()) + require.Equal(t, "£380.00", tickets[2].FaceValuePrice.String()) - require.Equal(t, tickets[3].Event.Name, "Download Festival 2024") - require.Len(t, tickets[3].Event.Lineup, 0) - require.Equal(t, tickets[3].Event.Venue.Name, "Donington Park") - require.Equal(t, tickets[3].Tour.Name, "Download Festival 2024") - require.Equal(t, tickets[3].TicketQuantity, 1) - require.Equal(t, tickets[3].TotalSellingPrice.String(), "£280.00") - require.Equal(t, tickets[3].TotalTwicketsFee.String(), "£30.80") - require.Equal(t, tickets[3].FaceValuePrice.String(), "£322.00") + require.Equal(t, "Download Festival 2024", tickets[3].Event.Name) + require.Empty(t, tickets[3].Event.Lineup) + require.Equal(t, "Donington Park", tickets[3].Event.Venue.Name) + require.Equal(t, "Download Festival 2024", tickets[3].Tour.Name) + require.Equal(t, 1, tickets[3].TicketQuantity) + require.Equal(t, "£280.00", tickets[3].TotalSellingPrice.String()) + require.Equal(t, "£30.80", tickets[3].TotalTwicketsFee.String()) + require.Equal(t, "£322.00", tickets[3].FaceValuePrice.String()) }