Updated createAndSendRequest to add headers (#1277)

gofr-dev · Dec 10, 2024 · 313163f · 313163f
1 parent 6f6f17a
commit 313163f
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 39 deletions.
diff --git a/pkg/gofr/service/new.go b/pkg/gofr/service/new.go
@@ -147,10 +147,20 @@ func (h *httpService) createAndSendRequest(ctx context.Context, method string, p
 		return nil, err
 	}
 
+	var isContentTypeSet bool
+
 	for k, v := range headers {
+		if strings.EqualFold(k, "content-type") {
+			isContentTypeSet = true
+		}
+
 		req.Header.Set(k, v)
 	}
 
+	if !isContentTypeSet {
+		req.Header.Set("Content-Type", "application/json")
+	}
+
 	// encode the query parameters on the request
 	encodeQueryParameters(req, queryParams)
 

diff --git a/pkg/gofr/service/new_test.go b/pkg/gofr/service/new_test.go
@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -35,55 +36,76 @@ func TestNewHTTPService(t *testing.T) {
 
 func TestHTTPService_createAndSendRequest(t *testing.T) {
 	ctrl := gomock.NewController(t)
-
 	metrics := NewMockMetrics(ctrl)
+	ctx := context.Background()
 
-	// Setup a test server
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// read request body
-		var body []byte
+	tests := []struct {
+		desc           string
+		queryParams    map[string]interface{}
+		body           []byte
+		headers        map[string]string
+		expQueryParam  string
+		expContentType string
+	}{
+		{"with query params, body and header", map[string]interface{}{"key": "value", "name": []string{"gofr", "test"}},
+			[]byte("{Test Body}"), map[string]string{"header1": "value1"}, "key=value&name=test", "application/json"},
+		{"with query params, body, header and content type", map[string]interface{}{"key": "value", "name": []string{"gofr", "test"}},
+			[]byte("{Test Body}"), map[string]string{"header1": "value1", "content-type": "application/json"},
+			"key=value&name=test", "application/json"},
+		{"with query params, body, header and content type xml", map[string]interface{}{"key": "value", "name": []string{"gofr", "test"}},
+			[]byte("{Test Body}"), map[string]string{"header1": "value1", "content-type": "application/xml"},
+			"key=value&name=test", "application/xml"},
+		{"without query params, body, header and content type", nil, []byte("{Test Body}"),
+			map[string]string{"header1": "value1", "content-type": "application/json"},
+			"", "application/json"},
+	}
 
-		_, err := r.Body.Read(body)
-		if err != nil {
-			t.Fatal("Unable to read request body")
+	for i, tc := range tests {
+		// Setup a test server
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			// read request body
+			var body []byte
+
+			body, err := io.ReadAll(r.Body)
+			if err != nil {
+				t.Fatal("Unable to read request body")
+			}
+
+			assert.Equal(t, http.MethodPost, r.Method)
+			assert.Equal(t, "/test-path", r.URL.Path)
+			assert.Equal(t, tc.expQueryParam, r.URL.RawQuery)
+			assert.Contains(t, "value1", r.Header.Get("header1"))
+			assert.Contains(t, tc.expContentType, r.Header.Get("content-type"))
+			assert.Equal(t, string(tc.body), string(body))
+
+			w.WriteHeader(http.StatusOK)
+		}))
+
+		service := &httpService{
+			Client:  http.DefaultClient,
+			url:     server.URL,
+			Tracer:  otel.Tracer("gofr-http-client"),
+			Logger:  logging.NewMockLogger(logging.INFO),
+			Metrics: metrics,
 		}
 
-		assert.Equal(t, "POST", r.Method)
-		assert.Equal(t, "/test-path", r.URL.Path)
-		assert.Equal(t, "key=value&name=test", r.URL.RawQuery)
-		assert.Contains(t, "value1", r.Header.Get("header1"))
-		assert.Contains(t, "Test Body", string(body))
+		metrics.EXPECT().RecordHistogram(gomock.Any(), "app_http_service_response", gomock.Any(), "path", server.URL,
+			"method", http.MethodPost, "status", fmt.Sprintf("%v", http.StatusOK)).Times(1)
 
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer server.Close()
-
-	service := &httpService{
-		Client:  http.DefaultClient,
-		url:     server.URL,
-		Tracer:  otel.Tracer("gofr-http-client"),
-		Logger:  logging.NewMockLogger(logging.INFO),
-		Metrics: metrics,
-	}
-
-	ctx := context.Background()
+		resp, err := service.createAndSendRequest(ctx,
+			http.MethodPost, "test-path", tc.queryParams, tc.body, tc.headers)
 
-	metrics.EXPECT().RecordHistogram(gomock.Any(), "app_http_service_response", gomock.Any(), "path", server.URL,
-		"method", http.MethodPost, "status", fmt.Sprintf("%v", http.StatusOK))
+		if err != nil {
+			if resp != nil {
+				resp.Body.Close()
+			}
+		}
 
-	// when params value is of type []string then last value is sent in request
-	resp, err := service.createAndSendRequest(ctx,
-		http.MethodPost, "test-path", map[string]interface{}{"key": "value", "name": []string{"gofr", "test"}},
-		[]byte("{Test Body}"), map[string]string{"header1": "value1"})
+		require.NoError(t, err)
+		assert.NotNil(t, resp, "TEST[%d], Failed.\n%s", i, tc.desc)
 
-	if err != nil {
-		if resp != nil {
-			defer resp.Body.Close()
-		}
+		server.Close()
 	}
-
-	require.NoError(t, err)
-	assert.NotNil(t, resp, "TEST[%d], Failed.\n%s")
 }
 
 func TestHTTPService_Get(t *testing.T) {