Fix crash when searchType is not provided (#28)

Author: man90es

handlers/getAdventurerSearch.go

@@ -19,7 +19,7 @@ func getAdventurerSearch(w http.ResponseWriter, r *http.Request) {
 	query, queryOk := validators.ValidateAdventurerNameQueryParam(r.URL.Query()["query"])
 	region, regionOk := validators.ValidateRegionQueryParam(r.URL.Query()["region"])
 	searchTypeQueryParam := r.URL.Query()["searchType"]
-	searchType := validators.ValidateSearchTypeQueryParam(searchTypeQueryParam)
+	searchType, searchTypeAsString := validators.ValidateSearchTypeQueryParam(searchTypeQueryParam)
 
 	if !queryOk || !regionOk {
 		giveBadRequestResponse(w)
@@ -34,7 +34,7 @@ func getAdventurerSearch(w http.ResponseWriter, r *http.Request) {
 	query = strings.ToLower(query)
 
 	// Look for cached data, then run the scraper if needed
-	data, status, date, expires, found := profileSearchCache.GetRecord([]string{region, query, searchTypeQueryParam[0], fmt.Sprint(page)})
+	data, status, date, expires, found := profileSearchCache.GetRecord([]string{region, query, searchTypeAsString, fmt.Sprint(page)})
 	if !found {
 		data, status = scrapers.ScrapeAdventurerSearch(region, query, searchType, page)
 
@@ -47,7 +47,7 @@ func getAdventurerSearch(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		date, expires = profileSearchCache.AddRecord([]string{region, query, searchTypeQueryParam[0], fmt.Sprint(page)}, data, status)
+		date, expires = profileSearchCache.AddRecord([]string{region, query, searchTypeAsString, fmt.Sprint(page)}, data, status)
 	}
 
 	w.Header().Set("Date", date)

validators/ValidateSearchTypeQueryParam.go

@@ -1,16 +1,13 @@
 package validators
 
-func ValidateSearchTypeQueryParam(query []string) (searchType uint8) {
+func ValidateSearchTypeQueryParam(query []string) (searchType uint8, searchTypeAsString string) {
 	if 1 > len(query) {
-		return 2
+		return 2, "familyName"
 	}
 
 	if query[0] == "characterName" {
-		return map[string]uint8{
-			"characterName": 1,
-			"familyName":    2,
-		}[query[0]]
+		return 1, "characterName"
 	}
 
-	return 2
+	return 2, "familyName"
 }

validators/ValidateSearchTypeQueryParam_test.go

@@ -4,19 +4,20 @@ import "testing"
 
 func TestValidateSearchTypeQueryParam(t *testing.T) {
 	tests := []struct {
-		expected uint8
-		input    []string
+		expectedNum uint8
+		expectedStr string
+		input       []string
 	}{
-		{input: []string{}, expected: 2},
-		{input: []string{"characterName"}, expected: 1},
-		{input: []string{"invalidType"}, expected: 2},
-		{input: []string{"familyName"}, expected: 2},
+		{input: []string{}, expectedNum: 2, expectedStr: "familyName"},
+		{input: []string{"characterName"}, expectedNum: 1, expectedStr: "characterName"},
+		{input: []string{"invalidType"}, expectedNum: 2, expectedStr: "familyName"},
+		{input: []string{"familyName"}, expectedNum: 2, expectedStr: "familyName"},
 	}
 
 	for _, test := range tests {
-		result := ValidateSearchTypeQueryParam(test.input)
-		if result != test.expected {
-			t.Errorf("For input %v, expected %v, but got %v", test.input, test.expected, result)
+		resultNum, resultStr := ValidateSearchTypeQueryParam(test.input)
+		if resultNum != test.expectedNum || resultStr != test.expectedStr {
+			t.Errorf("For input %v, expected %v %v, but got %v %v", test.input, test.expectedNum, test.expectedStr, resultNum, resultStr)
 		}
 	}
 }