adjusting some more code things

Author: tobiasehlert

README.md

@@ -106,7 +106,7 @@ Those are the current existing endpoints.
 - GET `/v3/fansites`
 - GET `/v3/guild/:name`
 - GET `/v3/guilds/:world`
-- GET `/v3/highscores/:world/:category/:vocation`
+- GET `/v3/highscores/:world/:category/:vocation/:page`
 - GET `/v3/house/:world/:house_id`
 - GET `/v3/houses/:world/:town`
 - GET `/v3/killstatistics/:world`

src/HighscoreCategory.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"log"
+	"fmt"
 	"regexp"
 	"strings"
 
@@ -34,20 +34,20 @@ var (
 )
 
 func TibiaBoostableBossesOverviewV3Impl(BoxContentHTML string) (*BoostableBossesOverviewResponse, error) {
+	// Creating empty vars
 	var (
 		BoostedBossName, BoostedBossImage string
 	)
-
 	// Loading HTML data into ReaderHTML for goquery with NewReader
 	ReaderHTML, err := goquery.NewDocumentFromReader(strings.NewReader(BoxContentHTML))
 	if err != nil {
-		log.Fatal(err)
+		return nil, fmt.Errorf("[error] TibiaBoostableBossesOverviewV3Impl failed at goquery.NewDocumentFromReader, err: %s", err)
 	}
 
 	// Getting data from div.InnerTableContainer and then first p
 	InnerTableContainerTMPB, err := ReaderHTML.Find(".InnerTableContainer p").First().Html()
 	if err != nil {
-		log.Fatal(err)
+		return nil, fmt.Errorf("[error] TibiaBoostableBossesOverviewV3Impl failed at ReaderHTML.Find, error: %s", err)
 	}
 
 	// Regex to get data for name for boosted boss
@@ -69,13 +69,16 @@ func TibiaBoostableBossesOverviewV3Impl(BoxContentHTML string) (*BoostableBosses
 	// Creating empty BoostableBossesData var
 	var BoostableBossesData []OverviewBoostableBoss
 
+	var insideError error
+
 	// Running query over each div
-	ReaderHTML.Find(".BoxContent div div").Each(func(index int, s *goquery.Selection) {
+	ReaderHTML.Find(".BoxContent div div").EachWithBreak(func(index int, s *goquery.Selection) bool {
 
 		// Storing HTML into BoostableBossDivHTML
 		BoostableBossDivHTML, err := s.Html()
 		if err != nil {
-			log.Fatal(err)
+			insideError = fmt.Errorf("[error] TibiaBoostableBossesOverviewV3Impl failed at BoostableBossDivHTML, err := s.Html(), err: %s", err)
+			return false
 		}
 
 		// Regex to get data for name, race and img src param for creature
@@ -96,8 +99,14 @@ func TibiaBoostableBossesOverviewV3Impl(BoxContentHTML string) (*BoostableBosses
 				Featured: FeaturedRace,
 			})
 		}
+
+		return true
 	})
 
+	if insideError != nil {
+		return nil, insideError
+	}
+
 	// Build the data-blob
 	return &BoostableBossesOverviewResponse{
 		BoostableBossesContainer{

src/HousesMapping.go

@@ -78,6 +78,10 @@ func TibiaHighscoresV3Impl(world string, category validation.HighscoreCategory,
 		HighscoreTotalHighscores = TibiaDataStringToIntegerV3(subma1[0][2])
 	}
 
+	if currentPage > HighscoreTotalPages {
+		return nil, validation.ErrorHighscorePageTooBig
+	}
+
 	var insideError error
 
 	// Running query over each div

src/TibiaBoostableBossesOverviewV3.go

@@ -78,7 +78,7 @@ func TestCormaya11(t *testing.T) {
 
 	assert.Equal(54026, houseJson.House.Houseid)
 	assert.Equal("Premia", houseJson.House.World)
-	assert.Equal("Edron", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Edron", houseJson.House.Town)
 	assert.Equal("Cormaya 11", houseJson.House.Name)
 	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(2, houseJson.House.Beds)
@@ -120,7 +120,7 @@ func TestCormaya9c(t *testing.T) {
 
 	assert.Equal(54023, houseJson.House.Houseid)
 	assert.Equal("Premia", houseJson.House.World)
-	assert.Equal("Edron", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Edron", houseJson.House.Town)
 	assert.Equal("Cormaya 9c", houseJson.House.Name)
 	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(2, houseJson.House.Beds)
@@ -166,7 +166,7 @@ func TestBeachHomeApartmentsFlat14(t *testing.T) {
 
 	assert.Equal(10214, houseJson.House.Houseid)
 	assert.Equal("Premia", houseJson.House.World)
-	assert.Equal("Thais", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Thais", houseJson.House.Town)
 	assert.Equal("Beach Home Apartments, Flat 14", houseJson.House.Name)
 	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(1, houseJson.House.Beds)
@@ -212,7 +212,7 @@ func TestBeachHomeApartmentsFlat15(t *testing.T) {
 
 	assert.Equal(10215, houseJson.House.Houseid)
 	assert.Equal("Premia", houseJson.House.World)
-	assert.Equal("Thais", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Thais", houseJson.House.Town)
 	assert.Equal("Beach Home Apartments, Flat 15", houseJson.House.Name)
 	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(1, houseJson.House.Beds)

src/TibiaHighscoresV3.go

@@ -1,3 +1,3 @@
 module github.com/TibiaData/tibiadata-api-go/src/static
 
-go 1.18
+go 1.19

src/TibiaHousesHouseV3_test.go

@@ -1,6 +1,6 @@
 module github.com/TibiaData/tibiadata-api-go/src/tibiamapping
 
-go 1.18
+go 1.19
 
 require github.com/go-resty/resty/v2 v2.7.0
 

src/static/go.mod

@@ -82,6 +82,14 @@ var (
 	// Code: 11006
 	ErrorTownDoesNotExist = Error{errors.New("the provided town does not exist")}
 
+	// ErrorHighscorePageInvalid will be sent if the page is not valid
+	// Code: 11007
+	ErrorHighscorePageInvalid = Error{errors.New("the provided page does not exist or is invalid")}
+
+	// ErrorHighscorePageTooBig
+	// Code: 11008
+	ErrorHighscorePageTooBig = Error{errors.New("the provided page is larger than max amount of pages")}
+
 	// ErrorCreatureNameEmpty will be sent if the request contains an empty creature name
 	// Code: 12001
 	ErrorCreatureNameEmpty = Error{errors.New("the provided creature name is an empty string")}
@@ -222,6 +230,10 @@ func (e Error) Code() int {
 		return 11005
 	case ErrorTownDoesNotExist:
 		return 11006
+	case ErrorHighscorePageInvalid:
+		return 11007
+	case ErrorHighscorePageTooBig:
+		return 11008
 	case ErrorCreatureNameEmpty:
 		return 12001
 	case ErrorCreatureNameTooSmall:

src/tibiamapping/go.mod

@@ -1,6 +1,6 @@
 module github.com/TibiaData/tibiadata-api-go/src/validation
 
-go 1.18
+go 1.19
 
 replace github.com/TibiaData/tibiadata-api-go/src/tibiamapping => ../tibiamapping