From 18b35ae3a5d132dfc05aa555a8478d71938cf5ab Mon Sep 17 00:00:00 2001
From: "Johnny.Ratton" <Johnny.RATTON@etu.uca.fr>
Date: Wed, 3 Apr 2024 10:58:25 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Controller=20modifi=C3=A9=20mais=20bug=20av?=
 =?UTF-8?q?ec=20test=20unitaires=20en=20local?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 API_SQLuedo/API/Controllers/QueryController.cs | 6 +++---
 API_SQLuedo/API/Service/QueryDataServiceApi.cs | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/API_SQLuedo/API/Controllers/QueryController.cs b/API_SQLuedo/API/Controllers/QueryController.cs
index e0fdb81..0a8c1c4 100644
--- a/API_SQLuedo/API/Controllers/QueryController.cs
+++ b/API_SQLuedo/API/Controllers/QueryController.cs
@@ -26,7 +26,7 @@ namespace API.Controllers
             }
 
             logger.LogInformation("[INFORMATION] La requête a renvoyé : {result} ", queryResult);
-            return Ok(queryResult);
+            return Content(queryResult.Result, "application/json");
         }
 
         [HttpGet("{database}/Tables")]
@@ -42,7 +42,7 @@ namespace API.Controllers
             }
 
             logger.LogInformation("[INFORMATION] La requête a renvoyé : {result} ", queryResult);
-            return Ok(queryResult);
+            return Content(queryResult.Result, "application/json");
         }
 
 
@@ -59,7 +59,7 @@ namespace API.Controllers
             }
 
             logger.LogInformation("[INFORMATION] La requête a renvoyé : {result} ", queryResult);
-            return Ok(queryResult);
+            return Content(queryResult.Result, "application/json");
         }
     }
 }
diff --git a/API_SQLuedo/API/Service/QueryDataServiceApi.cs b/API_SQLuedo/API/Service/QueryDataServiceApi.cs
index f4bff6d..d0a7883 100644
--- a/API_SQLuedo/API/Service/QueryDataServiceApi.cs
+++ b/API_SQLuedo/API/Service/QueryDataServiceApi.cs
@@ -56,7 +56,6 @@ public class QueryDataServiceApi : IQueryService<QueryDto>{
 
                             resultList.Add(row);
                         }
-
                         string resultJson = JsonConvert.SerializeObject(resultList);
 
                         QueryDto queryDto = new QueryDto { Result = resultJson };
-- 
2.36.3


From 8965ed2dcb019e9e6e54e173b982fb79f1c583b9 Mon Sep 17 00:00:00 2001
From: "Johnny.Ratton" <Johnny.RATTON@etu.uca.fr>
Date: Wed, 3 Apr 2024 14:00:39 +0200
Subject: [PATCH 2/2] Modification du format de renvoi pour les tables et les
 colonnes

---
 API_SQLuedo/API/Service/QueryDataServiceApi.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/API_SQLuedo/API/Service/QueryDataServiceApi.cs b/API_SQLuedo/API/Service/QueryDataServiceApi.cs
index d0a7883..e1a104e 100644
--- a/API_SQLuedo/API/Service/QueryDataServiceApi.cs
+++ b/API_SQLuedo/API/Service/QueryDataServiceApi.cs
@@ -103,10 +103,10 @@ public class QueryDataServiceApi : IQueryService<QueryDto>{
                             tableNames.Add(reader["table_name"].ToString());
                         }
 
-                        Dictionary<string, string> tablesDict = new Dictionary<string, string>();
+                        List<object> tablesDict = new List<object>();
                         foreach (string tableName in tableNames)
                         {
-                            tablesDict[tableName] = tableName;
+                            tablesDict.Add(new { TableName = tableName});
                         }
 
                         string tablesJson = JsonConvert.SerializeObject(tablesDict);
@@ -156,13 +156,13 @@ public class QueryDataServiceApi : IQueryService<QueryDto>{
                             columnsNames.Add(reader["column_name"].ToString());
                         }
 
-                        Dictionary<string, string> columnsDict = new Dictionary<string, string>();
+                       /*List<object> columnsDict = new List<object>();
                         foreach (string colName in columnsNames)
                         {
-                            columnsDict[colName] = colName;
-                        }
+                            columnsDict.Add(new { ColumnName = colName});
+                        }*/
 
-                        string tablesJson = JsonConvert.SerializeObject(columnsDict);
+                        string tablesJson = JsonConvert.SerializeObject(columnsNames);
 
                         Console.WriteLine(tablesJson);
 
-- 
2.36.3