golang fixes and updates

lib/codegen/go/http.dart

@@ -1,9 +1,7 @@
-import 'dart:convert';
+import 'package:apidash/consts.dart';
-
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart' show getValidRequestUri;
 import 'package:apidash/models/models.dart' show RequestModel;
-import 'package:apidash/consts.dart';
 
 class GoHttpCodeGen {
   final String kTemplateStart = """package main
@@ -12,10 +10,10 @@ import (
   "fmt"
   "io"
   "net/http"
-  "net/url"
+  "net/url"{% if hasBody %}
-  {% if isBody %}"bytes"
+  "bytes"{% if hasFormData %}
-  {% if isFormDataRequest %}"mime/multipart"
+  "mime/multipart"{% if hasFileInFormData %}
-  "os"{% endif %}{% endif %}
+  "os"{% endif %}{% endif %}{% endif %}
 )
 
 func main() {
@@ -24,44 +22,26 @@ func main() {
 """;
 
   String kTemplateUrl = """
-  url, err := url.Parse("{{url}}")
+  url, _ := url.Parse("{{url}}")
-  if err != nil {
-    fmt.Println(err)
-    return
-  }
 
 """;
 
-  String kTemplateRawBody = """
+  String kTemplateBody = """
-  {% if body %}body := bytes.NewBuffer([]byte(`{{body}}`)){% endif %}
+  {% if body %}payload := bytes.NewBuffer([]byte(`{{body}}`)){% endif %}
-
-""";
-
-  String kTemplateJsonBody = """
-  {% if body %}body := bytes.NewBuffer([]byte(`{{body}}`)){% endif %}
 
 """;
 
   String kTemplateFormData = """
-  body := &bytes.Buffer{}
+  payload := &bytes.Buffer{}
-  writer := multipart.NewWriter(body)
+  writer := multipart.NewWriter(payload){% if hasFileInFormData %}
   var (
     file *os.File
     part io.Writer
-  )
+  ){% endif %}
   {% for field in fields %}
-  {% if field.type == "file" %}file, err = os.Open("{{field.value}}")
+  {% if field.type == "file" %}file, _ = os.Open("{{field.value}}")
-  if err != nil {
-    fmt.Println(err)
-    return
-  }
   defer file.Close()
-
+  part, _ = writer.CreateFormFile("{{field.name}}", "{{field.value}}")
-  part, err = writer.CreateFormFile("{{field.name}}", "{{field.value}}")
-  if err != nil {
-    fmt.Println(err)
-    return
-  }
   io.Copy(part, file)
   {% else %}writer.WriteField("{{field.name}}", "{{field.value}}"){% endif %}{% endfor %}
   writer.Close()
@@ -71,43 +51,40 @@ func main() {
 
   String kTemplateHeader = """
 {% if headers %}{% for header, value in headers %}
-  req.Header.Set("{{header}}", "{{value}}")
+  req.Header.Set("{{header}}", "{{value}}"){% endfor %}
-{% endfor %}
 {% endif %}
 """;
 
+  String kStringFormDataHeader = """
+  req.Header.Set("Content-Type", writer.FormDataContentType())
+""";
+
   String kTemplateQueryParam = """
   query := url.Query()
   {% for key, value in params %}
-  query.Set("{{key}}", "{{value}}")
+  query.Set("{{key}}", "{{value}}"){% endfor %}
-  {% endfor %}
+
   url.RawQuery = query.Encode()
 
 """;
 
   String kTemplateRequest = """
-  req, err := http.NewRequest("{{method}}", url.String(), {% if hasBody %}body{% else %}nil{% endif %})
+  req, _ := http.NewRequest("{{method}}", url.String(), {% if hasBody %}payload{% else %}nil{% endif %})
-  if err != nil {
-    fmt.Println(err)
-    return
-  }
 
 """;
 
   final String kTemplateEnd = """
-  resp, err := client.Do(req)
-  if err != nil {
-    fmt.Println(err)
-    return
-  }
-  defer resp.Body.Close()
 
-  res, err := io.ReadAll(resp.Body)
+  response, err := client.Do(req)
   if err != nil {
     fmt.Println(err)
     return
   }
-  fmt.Println(string(res))
+  defer response.Body.Close()
+
+  fmt.Println("Status Code:", response.StatusCode)
+  body, _ := io.ReadAll(response.Body)
+  fmt.Println("Response body:", string(body))
 }""";
 
   String? getCode(
@@ -122,9 +99,9 @@ func main() {
 
       var templateStart = jj.Template(kTemplateStart);
       result += templateStart.render({
-        "isBody": kMethodsWithBody.contains(requestModel.method) &&
+        "hasBody": requestModel.hasData,
-            requestBody != null,
+        "hasFormData": requestModel.hasFormData,
-        "isFormDataRequest": requestModel.hasFormData,
+        "hasFileInFormData": requestModel.hasFileInFormData,
       });
 
       var templateUrl = jj.Template(kTemplateUrl);
@@ -138,27 +115,18 @@ func main() {
       Uri? uri = rec.$1;
 
       if (uri != null) {
-        var method = requestModel.method.name.toUpperCase();
+        if (requestModel.hasTextData || requestModel.hasJsonData) {
-        if (kMethodsWithBody.contains(requestModel.method) &&
-            requestBody != null) {
-          var contentLength = utf8.encode(requestBody).length;
-          if (contentLength > 0) {
           hasBody = true;
-          }
+          var templateRawBody = jj.Template(kTemplateBody);
-          if (requestModel.requestBodyContentType == ContentType.text) {
-            var templateRawBody = jj.Template(kTemplateRawBody);
           result += templateRawBody.render({"body": requestBody});
-          } else if (requestModel.requestBodyContentType == ContentType.json) {
-            var templateJsonBody = jj.Template(kTemplateJsonBody);
-            result += templateJsonBody.render({"body": requestBody});
         } else if (requestModel.hasFormData) {
           hasBody = true;
           var templateFormData = jj.Template(kTemplateFormData);
           result += templateFormData.render({
+            "hasFileInFormData": requestModel.hasFileInFormData,
             "fields": requestModel.formDataMapList,
           });
         }
-        }
 
         if (uri.hasQuery) {
           var params = uri.queryParameters;
@@ -168,18 +136,30 @@ func main() {
           }
         }
 
+        var method = requestModel.method.name.toUpperCase();
         var templateRequest = jj.Template(kTemplateRequest);
-        result +=
+        result += templateRequest.render({
-            templateRequest.render({"method": method, "hasBody": hasBody});
+          "method": method,
+          "hasBody": hasBody,
+        });
 
         var headersList = requestModel.enabledRequestHeaders;
-        if (headersList != null) {
+        if (headersList != null || requestModel.hasData) {
           var headers = requestModel.enabledHeadersMap;
+          if (requestModel.hasJsonData || requestModel.hasTextData) {
+            headers.putIfAbsent(kHeaderContentType,
+                () => requestModel.requestBodyContentType.header);
+          }
           if (headers.isNotEmpty) {
             var templateHeader = jj.Template(kTemplateHeader);
-            result += templateHeader.render({"headers": headers});
+            result += templateHeader.render({
+              "headers": headers,
+            });
           }
         }
+        if (requestModel.hasFormData) {
+          result += kStringFormDataHeader;
+        }
 
         result += kTemplateEnd;
       }

lib/models/request_model.dart

@@ -68,6 +68,7 @@ class RequestModel {
   bool get hasJsonContentType => requestBodyContentType == ContentType.json;
   bool get hasTextContentType => requestBodyContentType == ContentType.text;
   int get contentLength => utf8.encode(requestBody ?? "").length;
+  bool get hasData => hasJsonData || hasTextData || hasFormData;
   bool get hasJsonData =>
       kMethodsWithBody.contains(method) &&
       hasJsonContentType &&
@@ -84,6 +85,9 @@ class RequestModel {
       requestFormDataList ?? <FormDataModel>[];
   List<Map<String, dynamic>> get formDataMapList =>
       rowsToFormDataMapList(requestFormDataList) ?? [];
+  bool get hasFileInFormData => formDataList
+      .map((e) => e.type == FormDataType.file)
+      .any((element) => element);
 
   bool get hasContentTypeHeader => enabledHeadersMap.keys
       .any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);