Merge pull request #52 from gfleury/ParseError

Adding error parser

api_response.go

@@ -6,6 +6,7 @@ package bitbucketv1
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -492,9 +493,14 @@ func NewAPIResponse(r *http.Response) *APIResponse {
 }
 
 // NewAPIResponseWithError create new erroneous API response from http.response and error
-func NewAPIResponseWithError(r *http.Response, err error) (*APIResponse, error) {
+func NewAPIResponseWithError(r *http.Response, bodyBytes []byte, err error) (*APIResponse, error) {
-
 	response := &APIResponse{Response: r, Message: strings.Replace(err.Error(), "\"", "", -1)}
+	if bodyBytes != nil {
+		parseErr := json.Unmarshal(bodyBytes, &response.Values)
+		if parseErr != nil {
+			err = fmt.Errorf("%s ParseError: %v", err.Error(), parseErr)
+		}
+	}
 	return response, err
 }
 

api_response_test.go

@@ -826,6 +826,7 @@ func TestNewAPIResponse(t *testing.T) {
 func TestNewAPIResponseWithError(t *testing.T) {
 	type args struct {
 		r   *http.Response
+		b   []byte
 		err error
 	}
 	tests := []struct {
@@ -838,7 +839,7 @@ func TestNewAPIResponseWithError(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := NewAPIResponseWithError(tt.args.r, tt.args.err)
+			got, err := NewAPIResponseWithError(tt.args.r, tt.args.b, tt.args.err)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("NewAPIResponseWithError() error = %v, wantErr %v", err, tt.wantErr)
 				return

default_api_test.go

@@ -436,7 +436,17 @@ func TestDefaultApiService_Create(t *testing.T) {
 				repositorySlug:    "repo1",
 				localVarOptionals: map[string]interface{}{"values": "values"}},
 			&APIResponse{
-				Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}"},
+				Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}",
+				Values: map[string]interface{}{
+					"errors": []interface{}{
+						map[string]interface{}{
+							"context":       nil,
+							"message":       "title must be supplied for this request",
+							"exceptionName": nil,
+						},
+					},
+				},
+			},
 			true, true},
 		{"ValidRequestNoBranch", fields{client: generateConfigRealLocalServer()},
 			args{projectKey: "PROJ",
@@ -469,7 +479,17 @@ func TestDefaultApiService_Create(t *testing.T) {
 				},
 			},
 			&APIResponse{
-				Message: `Status: 404 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`},
+				Message: `Status: 404 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
+				Values: map[string]interface{}{
+					"errors": []interface{}{
+						map[string]interface{}{
+							"context":       nil,
+							"message":       "Repository \"repo1\" of project with key \"PROJ\" has no branch \"refs/heads/feature\"",
+							"exceptionName": "com.atlassian.bitbucket.commit.NoSuchCommitException",
+						},
+					},
+				},
+			},
 			true, true},
 	}
 	for _, tt := range tests {
@@ -516,7 +536,17 @@ func TestDefaultApiService_CreatePullRequest(t *testing.T) {
 				localVarOptionals: PullRequest{},
 			},
 			&APIResponse{
-				Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}"},
+				Message: "Status: 400 , Body: {errors:[{context:null,message:title must be supplied for this request,exceptionName:null}]}",
+				Values: map[string]interface{}{
+					"errors": []interface{}{
+						map[string]interface{}{
+							"context":       nil,
+							"message":       "title must be supplied for this request",
+							"exceptionName": nil,
+						},
+					},
+				},
+			},
 			true, true},
 		{"ValidRequestNoBranch", fields{client: generateConfigRealLocalServer()},
 			args{projectKey: "PROJ",
@@ -548,7 +578,17 @@ func TestDefaultApiService_CreatePullRequest(t *testing.T) {
 					Locked: false,
 				},
 			},
-			&APIResponse{Message: `Status: 404 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`},
+			&APIResponse{Message: `Status: 404 , Body: {errors:[{context:null,message:Repository \repo1\ of project with key \PROJ\ has no branch \refs/heads/feature\,exceptionName:com.atlassian.bitbucket.commit.NoSuchCommitException}]}`,
+				Values: map[string]interface{}{
+					"errors": []interface{}{
+						map[string]interface{}{
+							"context":       nil,
+							"message":       "Repository \"repo1\" of project with key \"PROJ\" has no branch \"refs/heads/feature\"",
+							"exceptionName": "com.atlassian.bitbucket.commit.NoSuchCommitException",
+						},
+					},
+				},
+			},
 			true, true},
 	}
 	for _, tt := range tests {