chore: Refactoring, fix tests.

Author: ldmi3i

internal/dto/fileresource/fileResource.go

@@ -1,6 +1,6 @@
 package fileresource
 
-//FileResource representation of file resource
+// FileResource representation of file resource
 type FileResource struct {
 	//File name if exists, else empty
 	Name string
@@ -10,4 +10,7 @@ type FileResource struct {
 
 	//File content
 	Content []byte
+
+	//Type of the API specification file (json/yaml ...)
+	Type AsdFileType
 }

internal/parse/converter.go

@@ -11,7 +11,7 @@ import (
 //
 //go:generate mockgen -source=converter.go -destination=./mocks/converter.go -package=parse
 type Converter interface {
-	Convert(content []byte, fileType fileresource.AsdFileType) (*apiSpecDoc.ApiSpecDoc, error)
+	Convert(file *fileresource.FileResource) (*apiSpecDoc.ApiSpecDoc, error)
 }
 
 type ConverterImpl struct {
@@ -20,13 +20,13 @@ type ConverterImpl struct {
 }
 
 // Convert gets bytes slice with json/yaml content and a filetype matching the type of the content and returns parsed ApiSpecDoc.
-func (c *ConverterImpl) Convert(content []byte, fileType fileresource.AsdFileType) (*apiSpecDoc.ApiSpecDoc, error) {
+func (c *ConverterImpl) Convert(file *fileresource.FileResource) (*apiSpecDoc.ApiSpecDoc, error) {
 	//Just example
-	parser, ok := c.parsers[fileType]
+	parser, ok := c.parsers[file.Type]
 	if !ok {
 		return nil, errors.New("file type not supported")
 	}
-	apiSpec, err := parser.parse(content)
+	apiSpec, err := parser.parse(file.Content)
 	if err != nil {
 		return nil, err
 	}
@@ -37,7 +37,7 @@ func (c *ConverterImpl) Convert(content []byte, fileType fileresource.AsdFileTyp
 func NewConverter(parsers []Parser) Converter {
 	parsersMap := make(map[fileresource.AsdFileType]Parser)
 	for _, parser := range parsers {
-		parsers[parser.getType()] = parser
+		parsersMap[parser.getType()] = parser
 	}
 	return &ConverterImpl{
 		parsers: parsersMap,

internal/parse/converter_test.go

@@ -0,0 +1,12 @@
+package parse
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestNewConverter(t *testing.T) {
+	parsers := []Parser{NewYamlOpenApiParser(), NewJsonOpenApiParser()}
+	converter := NewConverter(parsers)
+	assert.NotNil(t, converter)
+}

internal/parse/mocks/converter.go

@@ -39,9 +39,10 @@ func (p *UrlProcessorImpl) Process(ctx context.Context, url string) (*apiSpecDoc
 	if err != nil {
 		return nil, err
 	}
+	file.Type = fileType
 
 	//Parse API spec of defined type
-	apiSpec, err := p.converter.Convert(file.Content, fileType)
+	apiSpec, err := p.converter.Convert(file)
 	if err != nil {
 		return nil, err
 	}

internal/process/processor.go

@@ -74,7 +74,7 @@ func Test_ConverterFail_processReturnsError(t *testing.T) {
 
 	loadCall := contentLoader.EXPECT().Load(ctx, url).Times(1).Return(fileResource, nil)
 	recognizeCall := recognizer.EXPECT().RecognizeFileType(fileResource).After(loadCall).Times(1).Return(fileresource.YamlOpenApi, nil)
-	converter.EXPECT().Convert(gomock.Any(), gomock.Any()).Times(1).After(recognizeCall).Return(nil, expectedErr)
+	converter.EXPECT().Convert(gomock.Any()).Times(1).After(recognizeCall).Return(nil, expectedErr)
 
 	processor, err := NewProcessor(recognizer, converter, contentLoader)
 	assert.Nil(t, err)