No extra code

kepkin · Jan 27, 2020 · 31aae23 · 31aae23
1 parent acbd1ea
commit 31aae23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/internal/generator/constructors/form_data.go b/internal/generator/constructors/form_data.go
@@ -20,12 +20,13 @@ func Make{{ .Name }}(c *gin.Context) (result {{ .Name }}, errors []FieldError) {
 	{{ end }}
 	
 	{{- with .Fields }}
+	{{ if $.HasNoFileFields }}
 		form, err := c.MultipartForm()
 		if err != nil {
 			errors = append(errors, NewFieldError(InFormData, "", "can't parse multipart form", err))
 			return
 		}
-		{{ if $.HasNoFileFields }}
+		
 		getFormValue := func(param string) (string, bool) {
 			values, ok := form.Value[param]
 			if !ok {
@@ -36,7 +37,7 @@ func Make{{ .Name }}(c *gin.Context) (result {{ .Name }}, errors []FieldError) {
 			}
 			return values[0], true
 		}
-		{{ end }}
+	{{ end }}
 	{{- end }}
 
 	{{ range $, $field := .Fields }}

diff --git a/internal/generator/constructors/form_data_test.go b/internal/generator/constructors/form_data_test.go
@@ -93,12 +93,6 @@ func TestMakeFormDataConstructorForOneFileField(t *testing.T) {
 func MakeUploadDocumentRequestBodyForm(c *gin.Context) (result UploadDocumentRequestBodyForm, errors []FieldError) {
 	var err error
 
-	form, err := c.MultipartForm()
-	if err != nil {
-		errors = append(errors, NewFieldError(InFormData, "", "can't parse multipart form", err))
-		return
-	}
-
 	result.Document, err = c.FormFile("document")
 	if err != nil {
 		errors = append(errors, NewFieldError(InFormData, "document", "can't extract file from form-data", err))