Merge pull request #59 from ekeyme/enhance/error-enrich

enrich error on io.EOF error from json.decode for membership api

Author: mattn

client.go

@@ -1,10 +1,14 @@
 package redmine
 
 import (
+	"encoding/json"
+	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 )
 
 type Client struct {
@@ -56,6 +60,20 @@ type errorsResult struct {
 	Errors []string `json:"errors"`
 }
 
+func errorFromResp(bodyDecoder *json.Decoder, httpStatus int) (err error) {
+	var er errorsResult
+	err = bodyDecoder.Decode(&er)
+	if err == nil { /* error from redmine */
+		return errors.New(strings.Join(er.Errors, "\n"))
+	}
+
+	if err == io.EOF { /* empty body */
+		err = errors.New(http.StatusText(httpStatus))
+	}
+
+	return
+}
+
 type IdName struct {
 	Id   int    `json:"id"`
 	Name string `json:"name"`

go.mod

@@ -2,4 +2,4 @@ module github.com/mattn/go-redmine
 
 go 1.13
 
-require github.com/mattn/go-shellwords v1.0.12 // indirect
+require github.com/mattn/go-shellwords v1.0.12

membership.go

@@ -41,11 +41,7 @@ func (c *Client) Memberships(projectId int) ([]Membership, error) {
 		return nil, errors.New("Not Found")
 	}
 	if res.StatusCode != 200 {
-		var er errorsResult
-		err = decoder.Decode(&er)
-		if err == nil {
-			err = errors.New(strings.Join(er.Errors, "\n"))
-		}
+		err = errorFromResp(decoder, res.StatusCode)
 	} else {
 		err = decoder.Decode(&r)
 	}
@@ -68,11 +64,7 @@ func (c *Client) Membership(id int) (*Membership, error) {
 		return nil, errors.New("Not Found")
 	}
 	if res.StatusCode != 200 {
-		var er errorsResult
-		err = decoder.Decode(&er)
-		if err == nil {
-			err = errors.New(strings.Join(er.Errors, "\n"))
-		}
+		err = errorFromResp(decoder, res.StatusCode)
 	} else {
 		err = decoder.Decode(&r)
 	}
@@ -103,11 +95,7 @@ func (c *Client) CreateMembership(membership Membership) (*Membership, error) {
 	decoder := json.NewDecoder(res.Body)
 	var r membershipRequest
 	if res.StatusCode != 201 {
-		var er errorsResult
-		err = decoder.Decode(&er)
-		if err == nil {
-			err = errors.New(strings.Join(er.Errors, "\n"))
-		}
+		err = errorFromResp(decoder, res.StatusCode)
 	} else {
 		err = decoder.Decode(&r)
 	}
@@ -140,11 +128,7 @@ func (c *Client) UpdateMembership(membership Membership) error {
 	}
 	if res.StatusCode != 200 {
 		decoder := json.NewDecoder(res.Body)
-		var er errorsResult
-		err = decoder.Decode(&er)
-		if err == nil {
-			err = errors.New(strings.Join(er.Errors, "\n"))
-		}
+		err = errorFromResp(decoder, res.StatusCode)
 	}
 	if err != nil {
 		return err
@@ -170,11 +154,7 @@ func (c *Client) DeleteMembership(id int) error {
 
 	decoder := json.NewDecoder(res.Body)
 	if res.StatusCode != 200 {
-		var er errorsResult
-		err = decoder.Decode(&er)
-		if err == nil {
-			err = errors.New(strings.Join(er.Errors, "\n"))
-		}
+		err = errorFromResp(decoder, res.StatusCode)
 	}
 	return err
 }