Decrease minimum character search name query parameter length to 2 for SA region (#32)

Author: man90es

handlers/getAdventurerSearch.go

@@ -15,17 +15,22 @@ import (
 var profileSearchCache = cache.NewCache[[]models.Profile]()
 
 func getAdventurerSearch(w http.ResponseWriter, r *http.Request) {
-	page := validators.ValidatePageQueryParam(r.URL.Query()["page"])
-	query, queryOk := validators.ValidateAdventurerNameQueryParam(r.URL.Query()["query"])
 	region, regionOk := validators.ValidateRegionQueryParam(r.URL.Query()["region"])
-	searchTypeQueryParam := r.URL.Query()["searchType"]
-	searchType, searchTypeAsString := validators.ValidateSearchTypeQueryParam(searchTypeQueryParam)
+	if !regionOk {
+		giveBadRequestResponse(w)
+		return
+	}
 
-	if !queryOk || !regionOk {
+	query, queryOk := validators.ValidateAdventurerNameQueryParam(r.URL.Query()["query"], region)
+	if !queryOk {
 		giveBadRequestResponse(w)
 		return
 	}
 
+	page := validators.ValidatePageQueryParam(r.URL.Query()["page"])
+	searchTypeQueryParam := r.URL.Query()["searchType"]
+	searchType, searchTypeAsString := validators.ValidateSearchTypeQueryParam(searchTypeQueryParam)
+
 	if ok := giveMaintenanceResponse(w, region); ok {
 		return
 	}

validators/ValidateAdventurerNameQueryParam.go

@@ -7,12 +7,18 @@ import (
 
 // The naming policies in BDO are fucked up
 // This function only checks the length and allowed symbols
-func ValidateAdventurerNameQueryParam(query []string) (name string, ok bool) {
+func ValidateAdventurerNameQueryParam(query []string, region string) (name string, ok bool) {
 	if 1 > len(query) {
 		return "", false
 	}
 
-	if len(query[0]) < 3 || len(query[0]) > 16 {
+	minLength := map[string]int{
+		"SA": 2,
+		"NA": 3,
+		"EU": 3,
+	}[region]
+
+	if len(query[0]) < minLength || len(query[0]) > 16 {
 		return query[0], false
 	}
 

validators/ValidateAdventurerNameQueryParam_test.go

@@ -7,25 +7,29 @@ func TestValidateAdventurerNameQueryParam(t *testing.T) {
 		expectedName string
 		expectedOk   bool
 		input        []string
+		region       string
 	}{
-		{input: []string{"1Number"}, expectedName: "1Number", expectedOk: true}, // Starts with a number
-		{input: []string{"Adventurer_123"}, expectedName: "Adventurer_123", expectedOk: true},
-		{input: []string{"JohnDoe"}, expectedName: "JohnDoe", expectedOk: true},
-		{input: []string{"Name1", "Name2"}, expectedName: "Name1", expectedOk: true},
-		{input: []string{"고대신"}, expectedName: "고대신", expectedOk: true}, // Adventurer name with Korean characters
+		{input: []string{"1Number"}, region: "EU", expectedName: "1Number", expectedOk: true}, // Starts with a number
+		{input: []string{"Adventurer_123"}, region: "EU", expectedName: "Adventurer_123", expectedOk: true},
+		{input: []string{"JohnDoe"}, region: "EU", expectedName: "JohnDoe", expectedOk: true},
+		{input: []string{"Name1", "Name2"}, region: "EU", expectedName: "Name1", expectedOk: true},
+		{input: []string{"고대신"}, region: "EU", expectedName: "고대신", expectedOk: true}, // Adventurer name with Korean characters
 
-		{input: []string{""}, expectedName: "", expectedOk: false},                                                     // Empty adventurer name
-		{input: []string{"Ad"}, expectedName: "Ad", expectedOk: false},                                                 // Too short
-		{input: []string{"Adventurer With Spaces"}, expectedName: "Adventurer With Spaces", expectedOk: false},         // Contains spaces
-		{input: []string{"AdventurerNameTooLong12345"}, expectedName: "AdventurerNameTooLong12345", expectedOk: false}, // Too long
-		{input: []string{"Name$"}, expectedName: "Name$", expectedOk: false},                                           // Contains an invalid symbol
-		{input: []string{}, expectedName: "", expectedOk: false},
+		{input: []string{""}, region: "EU", expectedName: "", expectedOk: false},                                                     // Empty adventurer name
+		{input: []string{"Ad"}, region: "EU", expectedName: "Ad", expectedOk: false},                                                 // Too short
+		{input: []string{"Adventurer With Spaces"}, region: "EU", expectedName: "Adventurer With Spaces", expectedOk: false},         // Contains spaces
+		{input: []string{"AdventurerNameTooLong12345"}, region: "EU", expectedName: "AdventurerNameTooLong12345", expectedOk: false}, // Too long
+		{input: []string{"Name$"}, region: "EU", expectedName: "Name$", expectedOk: false},                                           // Contains an invalid symbol
+		{input: []string{}, region: "EU", expectedName: "", expectedOk: false},
+
+		{input: []string{""}, region: "SA", expectedName: "", expectedOk: false},
+		{input: []string{"Ad"}, region: "SA", expectedName: "Ad", expectedOk: true},
 	}
 
 	for _, test := range tests {
-		name, ok := ValidateAdventurerNameQueryParam(test.input)
+		name, ok := ValidateAdventurerNameQueryParam(test.input, test.region)
 		if name != test.expectedName || ok != test.expectedOk {
-			t.Errorf("Input: %v, Expected: %v %v, Got: %v %v", test.input, test.expectedName, test.expectedOk, name, ok)
+			t.Errorf("Input: %v %v, Expected: %v %v, Got: %v %v", test.input, test.region, test.expectedName, test.expectedOk, name, ok)
 		}
 	}
 }