Merge pull request #224 from ctreminiom/feature/jira-module-http-impr…

…ovements Feature/jira module http improvements
ctreminiom · Jul 24, 2023 · 9db20ff · 9db20ff
2 parents 98af35b + 5d47859
commit 9db20ff
Show file tree

Hide file tree

Showing 153 changed files with 5,145 additions and 7,501 deletions.
diff --git a/jira/internal/announcement_banner_impl.go b/jira/internal/announcement_banner_impl.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 )
 
-func NewAnnouncementBannerService(client service.Client, version string) *AnnouncementBannerService {
+func NewAnnouncementBannerService(client service.Connector, version string) *AnnouncementBannerService {
 
 	return &AnnouncementBannerService{
 		internalClient: &internalAnnouncementBannerImpl{c: client, version: version},
@@ -39,15 +39,15 @@ func (a *AnnouncementBannerService) Update(ctx context.Context, payload *model.A
 }
 
 type internalAnnouncementBannerImpl struct {
-	c       service.Client
+	c       service.Connector
 	version string
 }
 
 func (i *internalAnnouncementBannerImpl) Get(ctx context.Context) (*model.AnnouncementBannerScheme, *model.ResponseScheme, error) {
 
 	endpoint := fmt.Sprintf("rest/api/%v/announcementBanner", i.version)
 
-	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, nil)
+	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, "", nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -63,14 +63,9 @@ func (i *internalAnnouncementBannerImpl) Get(ctx context.Context) (*model.Announ
 
 func (i *internalAnnouncementBannerImpl) Update(ctx context.Context, payload *model.AnnouncementBannerPayloadScheme) (*model.ResponseScheme, error) {
 
-	reader, err := i.c.TransformStructToReader(payload)
-	if err != nil {
-		return nil, err
-	}
-
 	endpoint := fmt.Sprintf("rest/api/%v/announcementBanner", i.version)
 
-	request, err := i.c.NewRequest(ctx, http.MethodPut, endpoint, reader)
+	request, err := i.c.NewRequest(ctx, http.MethodPut, endpoint, "", payload)
 	if err != nil {
 		return nil, err
 	}

diff --git a/jira/internal/announcement_banner_impl_test.go b/jira/internal/announcement_banner_impl_test.go
@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
@@ -15,7 +14,7 @@ import (
 func Test_internalAnnouncementBannerImpl_Get(t *testing.T) {
 
 	type fields struct {
-		c       service.Client
+		c       service.Connector
 		version string
 	}
 
@@ -38,12 +37,13 @@ func Test_internalAnnouncementBannerImpl_Get(t *testing.T) {
 			},
 			fields: fields{version: "2"},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodGet,
 					"rest/api/2/announcementBanner",
+					"",
 					nil).
 					Return(&http.Request{}, nil)
 
@@ -63,12 +63,13 @@ func Test_internalAnnouncementBannerImpl_Get(t *testing.T) {
 			},
 			fields: fields{version: "3"},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodGet,
 					"rest/api/3/announcementBanner",
+					"",
 					nil).
 					Return(&http.Request{}, nil)
 
@@ -88,12 +89,13 @@ func Test_internalAnnouncementBannerImpl_Get(t *testing.T) {
 				ctx: context.Background(),
 			},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodGet,
 					"rest/api/2/announcementBanner",
+					"",
 					nil).
 					Return(&http.Request{}, errors.New("unable to create the http request"))
 
@@ -110,12 +112,13 @@ func Test_internalAnnouncementBannerImpl_Get(t *testing.T) {
 				ctx: context.Background(),
 			},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodGet,
 					"rest/api/2/announcementBanner",
+					"",
 					nil).
 					Return(&http.Request{}, nil)
 
@@ -170,7 +173,7 @@ func Test_internalAnnouncementBannerImpl_Update(t *testing.T) {
 	}
 
 	type fields struct {
-		c       service.Client
+		c       service.Connector
 		version string
 	}
 
@@ -195,17 +198,14 @@ func Test_internalAnnouncementBannerImpl_Update(t *testing.T) {
 			},
 			fields: fields{version: "2"},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
-
-				client.On("TransformStructToReader",
-					payloadMocked).
-					Return(bytes.NewReader([]byte{}), nil)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodPut,
 					"rest/api/2/announcementBanner",
-					bytes.NewReader([]byte{})).
+					"",
+					payloadMocked).
 					Return(&http.Request{}, nil)
 
 				client.On("Call",
@@ -225,17 +225,14 @@ func Test_internalAnnouncementBannerImpl_Update(t *testing.T) {
 			},
 			fields: fields{version: "3"},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
-
-				client.On("TransformStructToReader",
-					payloadMocked).
-					Return(bytes.NewReader([]byte{}), nil)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodPut,
 					"rest/api/3/announcementBanner",
-					bytes.NewReader([]byte{})).
+					"",
+					payloadMocked).
 					Return(&http.Request{}, nil)
 
 				client.On("Call",
@@ -255,17 +252,14 @@ func Test_internalAnnouncementBannerImpl_Update(t *testing.T) {
 				payload: payloadMocked,
 			},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
-
-				client.On("TransformStructToReader",
-					payloadMocked).
-					Return(bytes.NewReader([]byte{}), nil)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodPut,
 					"rest/api/2/announcementBanner",
-					bytes.NewReader([]byte{})).
+					"",
+					payloadMocked).
 					Return(&http.Request{}, errors.New("unable to create the http request"))
 
 				fields.c = client
@@ -282,17 +276,14 @@ func Test_internalAnnouncementBannerImpl_Update(t *testing.T) {
 				payload: payloadMocked,
 			},
 			on: func(fields *fields) {
-				client := mocks.NewClient(t)
-
-				client.On("TransformStructToReader",
-					payloadMocked).
-					Return(bytes.NewReader([]byte{}), nil)
+				client := mocks.NewConnector(t)
 
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodPut,
 					"rest/api/2/announcementBanner",
-					bytes.NewReader([]byte{})).
+					"",
+					payloadMocked).
 					Return(&http.Request{}, nil)
 
 				client.On("Call",

diff --git a/jira/internal/application_role_impl.go b/jira/internal/application_role_impl.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 )
 
-func NewApplicationRoleService(client service.Client, version string) (*ApplicationRoleService, error) {
+func NewApplicationRoleService(client service.Connector, version string) (*ApplicationRoleService, error) {
 
 	if version == "" {
 		return nil, model.ErrNoVersionProvided
@@ -45,15 +45,15 @@ func (a *ApplicationRoleService) Get(ctx context.Context, key string) (*model.Ap
 }
 
 type internalApplicationRoleImpl struct {
-	c       service.Client
+	c       service.Connector
 	version string
 }
 
 func (i *internalApplicationRoleImpl) Gets(ctx context.Context) ([]*model.ApplicationRoleScheme, *model.ResponseScheme, error) {
 
 	endpoint := fmt.Sprintf("rest/api/%v/applicationrole", i.version)
 
-	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, nil)
+	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, "", nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -75,7 +75,7 @@ func (i *internalApplicationRoleImpl) Get(ctx context.Context, key string) (*mod
 
 	endpoint := fmt.Sprintf("rest/api/%v/applicationrole/%v", i.version, key)
 
-	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, nil)
+	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, "", nil)
 	if err != nil {
 		return nil, nil, err
 	}