#123 Preserve query string order partially (#124)

middleware.go

@@ -44,7 +44,7 @@ func parseRequestURL(c *Client, r *Request) error {
 	}
 
 	// Adding Query Param
-	query := reqURL.Query()
+	query := make(url.Values)
 	for k, v := range c.QueryParam {
 		for _, iv := range v {
 			query.Add(k, iv)
@@ -61,7 +61,16 @@ func parseRequestURL(c *Client, r *Request) error {
 		}
 	}
 
-	reqURL.RawQuery = query.Encode()
+	// GitHub #123 Preserve query string order partially.
+	// Since not feasible in `SetQuery*` resty methods, because
+	// standrad package `url.Encode(...)` sorts the query params
+	// alphabetically
+	if IsStringEmpty(reqURL.RawQuery) {
+		reqURL.RawQuery = query.Encode()
+	} else {
+		reqURL.RawQuery = reqURL.RawQuery + "&" + query.Encode()
+	}
+
 	r.URL = reqURL.String()
 
 	return nil

request.go

@@ -110,10 +110,12 @@ func (r *Request) SetMultiValueQueryParams(params url.Values) *Request {
 //			SetQueryString("productId=232&template=fresh-sample&cat=resty&source=google&kw=buy a lot more")
 //
 func (r *Request) SetQueryString(query string) *Request {
-	values, err := url.ParseQuery(strings.TrimSpace(query))
+	params, err := url.ParseQuery(strings.TrimSpace(query))
 	if err == nil {
-		for k := range values {
-			r.QueryParam.Add(k, values.Get(k))
+		for p, v := range params {
+			for _, pv := range v {
+				r.QueryParam.Add(p, pv)
+			}
 		}
 	} else {
 		r.client.Log.Printf("ERROR [%v]", err)

request_test.go

@@ -1254,9 +1254,26 @@ func TestReportMethodSupportsPayload(t *testing.T) {
 	c := dc()
 	resp, err := c.R().
 		SetBody("body").
-		Execute("REPORT", ts.URL + "/report")
+		Execute("REPORT", ts.URL+"/report")
 
 	assertError(t, err)
 	assertEqual(t, http.StatusOK, resp.StatusCode())
 
 }
+
+func TestRequestQueryStringOrder(t *testing.T) {
+	ts := createGetServer(t)
+	defer ts.Close()
+
+	resp, err := New().R().
+		SetQueryString("productId=232&template=fresh-sample&cat=resty&source=google&kw=buy a lot more").
+		Get(ts.URL + "/?UniqueId=ead1d0ed-XXX-XXX-XXX-abb7612b3146&Translate=false&tempauth=eyJ0eXAiOiJKV1QiLC...HZEhwVnJ1d0NSUGVLaUpSaVNLRG5scz0&ApiVersion=2.0")
+
+	assertError(t, err)
+	assertEqual(t, http.StatusOK, resp.StatusCode())
+	assertEqual(t, "200 OK", resp.Status())
+	assertNotNil(t, resp.Body())
+	assertEqual(t, "TestGet: text response", resp.String())
+
+	logResponse(t, resp)
+}