|C# endpoints] required sur returns + gestion string dans les clients

klee-contrib · Nov 24, 2023 · 1994aed · 1994aed
1 parent e97e7f0
commit 1994aed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/TopModel.Generator.Csharp/CSharpApiClientGenerator.cs b/TopModel.Generator.Csharp/CSharpApiClientGenerator.cs
@@ -34,7 +34,7 @@ protected override void HandleFile(string filePath, string fileName, string tag,
         using var fw = new CSharpWriter(filePath, _logger);
 
         var hasBody = endpoints.Any(e => e.GetJsonBodyParam() != null);
-        var hasReturn = endpoints.Any(e => e.Returns != null);
+        var hasReturn = endpoints.Any(e => e.Returns != null && !new[] { "string", "byte[]" }.Contains(Config.GetType(e.Returns)));
         var hasJson = hasReturn || hasBody;
 
         var usings = new List<string>();
@@ -218,7 +218,11 @@ protected override void HandleFile(string filePath, string fileName, string tag,
 
             if (returnType != null)
             {
-                if (returnType == "byte[]")
+                if (returnType == "string")
+                {
+                    fw.WriteLine(2, $"return await res.Content.ReadAsStringAsync();");
+                }
+                else if (returnType == "byte[]")
                 {
                     fw.WriteLine();
                     fw.WriteLine(2, "using var ms = new MemoryStream();");

diff --git a/TopModel.Generator.Csharp/CsharpConfig.cs b/TopModel.Generator.Csharp/CsharpConfig.cs
@@ -420,7 +420,7 @@ public string GetReturnTypeName(IProperty? prop)
             return NoAsyncControllers ? "void" : "async Task";
         }
 
-        var typeName = GetType(prop, nonNullable: true);
+        var typeName = GetType(prop, nonNullable: (prop as IFieldProperty)?.Required ?? true);
         return typeName.StartsWith("IAsyncEnumerable") || NoAsyncControllers
             ? typeName
             : $"async Task<{typeName}>";