Moving addToQuery to dedicated function

pkg/lib/api/request.go

@@ -116,6 +116,21 @@ func (request Request) buildHttpRequest() (req *http.Request, err error) {
 
 	q := req.URL.Query()
 
+	addToQuery := func(key string, v any) error {
+		stringVal, err := util.GetStringFromInterface(v)
+		if err != nil {
+			return fmt.Errorf("error GetStringFromInterface: %s", err)
+		}
+
+		if stringVal == "" {
+			return nil
+		}
+
+		q.Add(key, stringVal)
+
+		return nil
+	}
+
 	for queryName, datastoreKey := range request.QueryParamsFromStore {
 		skipOnError := false
 		if len(datastoreKey) > 0 && datastoreKey[0] == '?' {
@@ -135,23 +150,17 @@ func (request Request) buildHttpRequest() (req *http.Request, err error) {
 			return nil, fmt.Errorf("could not get '%s' from Datastore: %s", datastoreKey, err)
 		}
 
-		stringVal, err := util.GetStringFromInterface(queryParamInterface)
+		err = addToQuery(queryName, queryParamInterface)
 		if err != nil {
-			return req, fmt.Errorf("error GetStringFromInterface: %s", err)
-		}
-
-		if stringVal == "" {
-			continue
+			return req, err
 		}
-		q.Add(queryName, stringVal)
 	}
 
 	for key, val := range request.QueryParams {
-		stringVal, err := util.GetStringFromInterface(val)
+		err = addToQuery(key, val)
 		if err != nil {
-			return req, fmt.Errorf("error GetStringFromInterface: %s", err)
+			return req, err
 		}
-		q.Set(key, stringVal)
 	}
 
 	req.URL.RawQuery = q.Encode()