chore: Fix apiSpecDoc content model.

Author: ldmi3i

internal/dto/apiSpecDoc/apiSpecDoc.go

@@ -166,20 +166,30 @@ func (sc *Schema) FindField(name string) *Schema {
 // MediaTypeObject represents schema for the different media types
 // i.e. "application/json" and etc.
 type MediaTypeObject struct {
-	Schema *Schema
+	MediaType string
+	Schema    *Schema
 }
 
 // RequestBody is a representation of request body
 type RequestBody struct {
 	Description string
 
 	//Content represents request object for the different media types
-	Content map[string]*MediaTypeObject
+	Content []*MediaTypeObject
 
 	//Required define is request body required
 	Required bool
 }
 
+func (rb *RequestBody) FindContentByMediaType(mediaType string) *MediaTypeObject {
+	for _, mediaTypeObj := range rb.Content {
+		if mediaTypeObj != nil && mediaTypeObj.MediaType == mediaType {
+			return mediaTypeObj
+		}
+	}
+	return nil
+}
+
 // Server represents server description
 // To use in the address line of view
 // https://swagger.io/specification/#server-object

internal/parse/openapi/openapi.go

@@ -139,12 +139,13 @@ func convertBody(body *openapi3.RequestBody) *apiSpecDoc.RequestBody {
 	specBody := new(apiSpecDoc.RequestBody)
 	specBody.Description = body.Description
 	specBody.Required = body.Required
-	specContent := make(map[string]*apiSpecDoc.MediaTypeObject)
+	specContent := make([]*apiSpecDoc.MediaTypeObject, 0, len(body.Content))
 	for cType, content := range body.Content {
 		if content.Schema == nil || content.Schema.Value == nil {
 			continue
 		}
-		specContent[cType] = &apiSpecDoc.MediaTypeObject{Schema: convertSchema("", content.Schema.Value)}
+		specContent = append(specContent,
+			&apiSpecDoc.MediaTypeObject{MediaType: cType, Schema: convertSchema("", content.Schema.Value)})
 	}
 	specBody.Content = specContent
 	return specBody

internal/parse/openapi/openapi_test.go

@@ -89,8 +89,8 @@ func TestOpenapiToApiSpec(t *testing.T) {
 	pmBody := postM.RequestBody
 	assert.NotNil(t, pmBody.Content)
 	assert.True(t, pmBody.Required)
-	pmContent, ok := pmBody.Content["application/json"]
-	assert.True(t, ok)
+	pmContent := pmBody.FindContentByMediaType("application/json")
+	assert.NotNil(t, pmContent)
 	assert.NotNil(t, pmContent.Schema)
 	pmSchema := pmContent.Schema
 	assert.Equal(t, apiSpecDoc.Object, pmSchema.Type)
@@ -139,8 +139,8 @@ func TestOpenapiToApiSpec(t *testing.T) {
 	gBody := postG.RequestBody
 	assert.NotNil(t, gBody.Content)
 	assert.True(t, gBody.Required)
-	gContent, ok := gBody.Content["application/json"]
-	assert.True(t, ok)
+	gContent := gBody.FindContentByMediaType("application/json")
+	assert.NotNil(t, gContent)
 	assert.NotNil(t, gContent.Schema)
 	gSchema := gContent.Schema
 	assert.Equal(t, apiSpecDoc.Object, gSchema.Type)