Merge pull request #12 from devilcove/refactor-jsonendpoint-struct

return http status code for JSON func/method

Author: mattkasun

examples/functions/json/main.go

@@ -15,9 +15,12 @@ type Answer struct {
 // equivalient of curl api.ipify.org?format=json
 func main() {
 	var answer Answer
-	ip, err := httpclient.GetJSON(nil, answer, http.MethodGet, "http://api.ipify.org?format=json", "")
+	ip, code, err := httpclient.GetJSON(nil, answer, http.MethodGet, "http://api.ipify.org?format=json", "")
 	if err != nil {
 		log.Fatal(err)
 	}
+	if code != http.StatusOK {
+		log.Fatal(err, code)
+	}
 	fmt.Println(ip)
 }

examples/method/json/main.go

@@ -22,10 +22,13 @@ func main() {
 		Data:          nil,
 		Response:      response,
 	}
-	answer, err := endpoint.GetJSON(response)
+	answer, code, err := endpoint.GetJSON(response)
 	if err != nil {
 		log.Fatal(err)
 	}
+	if code != http.StatusOK {
+		log.Fatal(err, code)
+	}
 	fmt.Println(answer)
 
 }

httpclient.go

@@ -3,6 +3,7 @@ package httpclient
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -62,16 +63,19 @@ func GetResponse(data any, method, url, auth string) (*http.Response, error) {
 }
 
 // JSON returns JSON response from http request
-func GetJSON[T any](data any, resp T, method, url, auth string) (any, error) {
+func GetJSON[T any](data any, resp T, method, url, auth string) (any, int, error) {
 	response, err := GetResponse(data, method, url, auth)
 	if err != nil {
-		return nil, err
+		return nil, response.StatusCode, err
 	}
 	defer response.Body.Close()
+	if response.StatusCode != http.StatusOK {
+		return response, response.StatusCode, errors.New("non 200 response code")
+	}
 	if err := json.NewDecoder(response.Body).Decode(&resp); err != nil {
-		return nil, err
+		return nil, response.StatusCode, err
 	}
-	return resp, nil
+	return resp, response.StatusCode, nil
 }
 
 // GetResponse returns response from http endpoint
@@ -80,6 +84,6 @@ func (e *Endpoint) GetResponse() (*http.Response, error) {
 }
 
 // GetJSON returns JSON received from http endpoint
-func (e *JSONEndpoint[T]) GetJSON(response T) (any, error) {
+func (e *JSONEndpoint[T]) GetJSON(response T) (any, int, error) {
 	return GetJSON(e.Data, response, e.Method, e.URL+e.Route, e.Authorization)
 }

httpclient_test.go

@@ -103,8 +103,9 @@ func TestGetJSON(t *testing.T) {
 			Data:     data,
 			Response: response,
 		}
-		answer, err := e.GetJSON(response)
+		answer, code, err := e.GetJSON(response)
 		is.NoErr(err)
+		is.Equal(code, http.StatusOK)
 		answerType := fmt.Sprintf("%T", answer)
 		is.True(answerType == "struct { JWT string }")
 	})