Merge pull request #144 from ctreminiom/feature/agile-refactor-v2

♻️ Refactor the Agile Module
ctreminiom · Sep 17, 2022 · 6040361 · 6040361
2 parents 41ff408 + 18e72ad
commit 6040361
Show file tree

Hide file tree

Showing 14 changed files with 875 additions and 601 deletions.
diff --git a/jira/agile/api_client_impl.go b/jira/agile/api_client_impl.go
@@ -4,10 +4,8 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"github.com/ctreminiom/go-atlassian/jira/agile/internal"
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
-	"github.com/ctreminiom/go-atlassian/service/agile"
 	"github.com/ctreminiom/go-atlassian/service/common"
 	"io"
 	"io/ioutil"
@@ -64,9 +62,9 @@ type Client struct {
 	HTTP   common.HttpClient
 	Site   *url.URL
 	Auth   common.Authentication
-	Board  agile.Board
-	Epic   agile.Epic
-	Sprint agile.Sprint
+	Board  *internal.BoardService
+	Epic   *internal.EpicService
+	Sprint *internal.SprintService
 }
 
 func (c *Client) NewFormRequest(ctx context.Context, method, apiEndpoint, contentType string, payload io.Reader) (*http.Request, error) {
@@ -107,61 +105,32 @@ func (c *Client) NewRequest(ctx context.Context, method, apiEndpoint string, pay
 func (c *Client) Call(request *http.Request, structure interface{}) (*models.ResponseScheme, error) {
 
 	response, err := c.HTTP.Do(request)
-
 	if err != nil {
 		return nil, err
 	}
 
+	return c.TransformTheHTTPResponse(response, structure)
+}
+
+func (c *Client) TransformTheHTTPResponse(response *http.Response, structure interface{}) (*models.ResponseScheme, error) {
+
 	responseTransformed := &models.ResponseScheme{
 		Response: response,
 		Code:     response.StatusCode,
 		Endpoint: response.Request.URL.String(),
 		Method:   response.Request.Method,
 	}
 
-	if !(response.StatusCode >= 200 && response.StatusCode < 300) {
-		return responseTransformed, models.ErrInvalidStatusCodeError
-	}
-
 	responseAsBytes, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		return responseTransformed, err
 	}
 
-	if structure != nil {
-		if err = json.Unmarshal(responseAsBytes, &structure); err != nil {
-			return responseTransformed, err
-		}
-	}
-
-	_, err = responseTransformed.Bytes.Write(responseAsBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return responseTransformed, nil
-}
-
-func (c *Client) TransformTheHTTPResponse(response *http.Response, structure interface{}) (*models.ResponseScheme, error) {
-
-	if response == nil {
-		return nil, errors.New("validation failed, please provide a http.Response pointer")
-	}
-
-	responseTransformed := &models.ResponseScheme{}
-	responseTransformed.Code = response.StatusCode
-	responseTransformed.Endpoint = response.Request.URL.String()
-	responseTransformed.Method = response.Request.Method
+	responseTransformed.Bytes.Write(responseAsBytes)
 
 	var wasSuccess = response.StatusCode >= 200 && response.StatusCode < 300
 	if !wasSuccess {
-
-		return responseTransformed, errors.New("TODO")
-	}
-
-	responseAsBytes, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		return responseTransformed, err
+		return responseTransformed, models.ErrInvalidStatusCodeError
 	}
 
 	if structure != nil {
@@ -170,7 +139,6 @@ func (c *Client) TransformTheHTTPResponse(response *http.Response, structure int
 		}
 	}
 
-	responseTransformed.Bytes.Write(responseAsBytes)
 	return responseTransformed, nil
 }
 

diff --git a/jira/agile/api_client_impl_test.go b/jira/agile/api_client_impl_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"github.com/ctreminiom/go-atlassian/jira/agile/internal"
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
-	"github.com/ctreminiom/go-atlassian/service/agile"
 	"github.com/ctreminiom/go-atlassian/service/common"
 	"github.com/ctreminiom/go-atlassian/service/mocks"
 	"github.com/stretchr/testify/assert"
@@ -41,9 +41,9 @@ func TestClient_Call(t *testing.T) {
 		HTTP           common.HttpClient
 		Site           *url.URL
 		Authentication common.Authentication
-		Board          agile.Board
-		Epic           agile.Epic
-		Sprint         agile.Sprint
+		Board          *internal.BoardService
+		Epic           *internal.EpicService
+		Sprint         *internal.SprintService
 	}
 
 	type args struct {
@@ -253,9 +253,9 @@ func TestClient_TransformTheHTTPResponse(t *testing.T) {
 		HTTP           common.HttpClient
 		Site           *url.URL
 		Authentication common.Authentication
-		Board          agile.Board
-		Epic           agile.Epic
-		Sprint         agile.Sprint
+		Board          *internal.BoardService
+		Epic           *internal.EpicService
+		Sprint         *internal.SprintService
 	}
 
 	type args struct {
@@ -321,7 +321,7 @@ func TestClient_TransformTheHTTPResponse(t *testing.T) {
 func TestClient_TransformStructToReader(t *testing.T) {
 
 	expectedBytes, err := json.Marshal(&models.BoardScheme{
-		Name: "Board Sample",
+		Name: "BoardConnector Sample",
 		Type: "Scrum",
 	})
 
@@ -333,9 +333,9 @@ func TestClient_TransformStructToReader(t *testing.T) {
 		HTTP           common.HttpClient
 		Site           *url.URL
 		Authentication common.Authentication
-		Board          agile.Board
-		Epic           agile.Epic
-		Sprint         agile.Sprint
+		Board          *internal.BoardService
+		Epic           *internal.EpicService
+		Sprint         *internal.SprintService
 	}
 
 	type args struct {
@@ -354,7 +354,7 @@ func TestClient_TransformStructToReader(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				structure: &models.BoardScheme{
-					Name: "Board Sample",
+					Name: "BoardConnector Sample",
 					Type: "Scrum",
 				},
 			},
@@ -366,7 +366,7 @@ func TestClient_TransformStructToReader(t *testing.T) {
 			name: "when the payload provided is not a pointer",
 			args: args{
 				structure: models.BoardScheme{
-					Name: "Board Sample",
+					Name: "BoardConnector Sample",
 					Type: "Scrum",
 				},
 			},