From e722b67d7d3c41f8411db781bf6238c644268dd1 Mon Sep 17 00:00:00 2001
From: Tanish2002 <tanishkhare@gmail.com>
Date: Sat, 24 Feb 2024 10:09:31 +0530
Subject: [PATCH] codegen(actix): some formatting fixes

---
 lib/codegen/rust/actix.dart | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/codegen/rust/actix.dart b/lib/codegen/rust/actix.dart
index 7e0cd9a8..be560c53 100644
--- a/lib/codegen/rust/actix.dart
+++ b/lib/codegen/rust/actix.dart
@@ -7,8 +7,10 @@ import 'package:apidash/utils/utils.dart'
 import 'package:apidash/models/models.dart' show RequestModel;
 
 class RustActixCodeGen {
-  final String kTemplateStart =
-      """{% if isFormDataRequest %}use std::io::Read;{% endif %}
+  final String kTemplateStart = """
+{%- if isFormDataRequest -%}
+use std::io::Read;
+{% endif -%}  
 #[actix_rt::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let url = "{{url}}";
@@ -105,7 +107,7 @@ multipart/form-data; boundary={{boundary}}''';
   String kStringRequestNormal = """\n        .send()""";
 
   String kTemplateRequestHeaders =
-      """\n        {% for key, val in headers %}.insert_header(("{{key}}", "{{val}}")){% if not loop.last %}{{ '\n        ' }}{% endif %}{% endfor %}""";
+      """\n        {% for key, val in headers -%}.insert_header(("{{key}}", "{{val}}")){% if not loop.last %}{{ '\n        ' }}{% endif %}{%- endfor -%}""";
 
   final String kStringRequestEnd = """\n        .await\n        .unwrap();
 
@@ -192,12 +194,6 @@ multipart/form-data; boundary={{boundary}}''';
         var headersList = requestModel.enabledRequestHeaders;
         if (headersList != null) {
           var headers = requestModel.enabledHeadersMap;
-          if (headers.isNotEmpty) {
-            if (hasBody) {
-              headers[HttpHeaders.contentTypeHeader] =
-                  requestModel.requestBodyContentType.header;
-            }
-          }
           if (requestModel.isFormDataRequest) {
             var formHeaderTemplate =
                 jj.Template(kTemplateFormHeaderContentType);
@@ -206,8 +202,15 @@ multipart/form-data; boundary={{boundary}}''';
             });
           }
 
-          var templateHeaders = jj.Template(kTemplateRequestHeaders);
-          result += templateHeaders.render({"headers": headers});
+          if (headers.isNotEmpty) {
+            if (hasBody) {
+              headers[HttpHeaders.contentTypeHeader] =
+                  requestModel.requestBodyContentType.header;
+            }
+
+            var templateHeaders = jj.Template(kTemplateRequestHeaders);
+            result += templateHeaders.render({"headers": headers});
+          }
         }
 
         if (hasBody || requestModel.isFormDataRequest) {