Merge branch 'main' into feature/issue-assign-null

Author: Fank

assets/internal/aql_impl_test.go

@@ -3,12 +3,13 @@ package internal
 import (
 	"context"
 	"errors"
+	"net/http"
+	"testing"
+
 	model "github.com/ctreminiom/go-atlassian/v2/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/v2/service"
 	"github.com/ctreminiom/go-atlassian/v2/service/mocks"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func Test_internalAQLImpl_Filter(t *testing.T) {
@@ -18,7 +19,7 @@ func Test_internalAQLImpl_Filter(t *testing.T) {
 		Page:                  2,
 		ResultPerPage:         25,
 		IncludeAttributes:     true,
-		IncludeAttributesDeep: true,
+		IncludeAttributesDeep: 12,
 		IncludeTypeAttributes: true,
 		IncludeExtendedInfo:   true,
 	}
@@ -55,7 +56,7 @@ func Test_internalAQLImpl_Filter(t *testing.T) {
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodGet,
-					"jsm/assets/workspace/workspace-uuid-sample/v1/aql/objects?includeAttributes=true&includeAttributesDeep=true&includeExtendedInfo=true&includeTypeAttributes=true&page=2&qlQuery=Name+LIKE+Test&resultPerPage=25",
+					"jsm/assets/workspace/workspace-uuid-sample/v1/aql/objects?includeAttributes=true&includeAttributesDeep=12&includeExtendedInfo=true&includeTypeAttributes=true&page=2&qlQuery=Name+LIKE+Test&resultPerPage=25",
 					"",
 					nil).
 					Return(&http.Request{}, nil)
@@ -83,7 +84,7 @@ func Test_internalAQLImpl_Filter(t *testing.T) {
 				client.On("NewRequest",
 					context.Background(),
 					http.MethodGet,
-					"jsm/assets/workspace/workspace-uuid-sample/v1/aql/objects?includeAttributes=true&includeAttributesDeep=true&includeExtendedInfo=true&includeTypeAttributes=true&page=2&qlQuery=Name+LIKE+Test&resultPerPage=25",
+					"jsm/assets/workspace/workspace-uuid-sample/v1/aql/objects?includeAttributes=true&includeAttributesDeep=12&includeExtendedInfo=true&includeTypeAttributes=true&page=2&qlQuery=Name+LIKE+Test&resultPerPage=25",
 					"",
 					nil).
 					Return(&http.Request{}, errors.New("error, unable to create the http request"))

pkg/infra/models/assets_aql.go

@@ -17,7 +17,7 @@ type AQLSearchParamsScheme struct {
 	IncludeAttributes bool `query:"includeAttributes,omitempty"`
 
 	// IncludeAttributesDeep determines how many levels of attributes should be included.
-	IncludeAttributesDeep bool `query:"includeAttributesDeep,omitempty"`
+	IncludeAttributesDeep int `query:"includeAttributesDeep,omitempty"`
 
 	// IncludeTypeAttributes determines if the response should include the object type attribute definition for each attribute returned with the objects.
 	IncludeTypeAttributes bool `query:"includeTypeAttributes,omitempty"`