Merge pull request #19 from Star-Academy/feature/save-graph

Feature/save graph

mohaymen-codestar-Team02/Controllers/AdminController.cs

@@ -57,7 +57,7 @@ public async Task<IActionResult> Delete([FromBody] DeleteUserDto request)
     {
         var user = new User
         {
-            Username = request.Username,
+            Username = request.Username
         };
 
         ServiceResponse<GetUserDto?> response =

mohaymen-codestar-Team02/Controllers/DataAdminController.cs

@@ -1,29 +1,44 @@
 using Microsoft.AspNetCore.Mvc;
+using mohaymen_codestar_Team02.Dto;
+using mohaymen_codestar_Team02.Dto.GraphDTO;
 using mohaymen_codestar_Team02.Dto.StoreDataDto;
+using mohaymen_codestar_Team02.Models;
+using mohaymen_codestar_Team02.Services;
 using mohaymen_codestar_Team02.Services.DataAdminService;
 using mohaymen_codestar_Team02.Services.FileReaderService;
 
 namespace mohaymen_codestar_Team02.Controllers;
 
 public class DataAdminController : ControllerBase
 {
-
     private readonly IDataAdminService _dataAdminService;
     private readonly IFileReader _fileReader;
-    public DataAdminController(IDataAdminService dataAdminService, IFileReader fileReader)
+    private readonly IDisplayDataService _dataService;
+
+    public DataAdminController(IDataAdminService dataAdminService, IFileReader fileReader,
+        IDisplayDataService dataService)
     {
         _dataAdminService = dataAdminService;
         _fileReader = fileReader;
+        _dataAdminService = dataAdminService;
     }
+
     [HttpPost("DataSets")]
     public async Task<IActionResult> StoreNewDataSet([FromForm] StoreDataDto storeDataDto)
     {
-        var edgeFile = _fileReader.Read(storeDataDto.EdgeFile);
-        var vertexFile = _fileReader.Read(storeDataDto.VertexFile);
-        var response = await _dataAdminService.StoreData(edgeFile, vertexFile, storeDataDto.DataName,
-            Path.GetFileName(storeDataDto.EdgeFile.FileName), Path.GetFileName(storeDataDto.VertexFile.FileName),
-            storeDataDto.CreatorUserName);
-        return StatusCode((int)response.Type, response);
+        try
+        {
+            var edgeFile = _fileReader.Read(storeDataDto.EdgeFile);
+            var vertexFile = _fileReader.Read(storeDataDto.VertexFile);
+            var response = await _dataAdminService.StoreData(edgeFile, vertexFile, storeDataDto.DataName,
+                Path.GetFileName(storeDataDto.EdgeFile.FileName), Path.GetFileName(storeDataDto.VertexFile.FileName),
+                storeDataDto.CreatorUserName);
+            return StatusCode((int)response.Type, response);
+        }
+        catch (FormatException e)
+        {
+            return BadRequest("your File is not on a correct format");
+        }
     }
 
     [HttpGet("DataSets")]
@@ -32,17 +47,26 @@ public void GetDataSetsList()
     }
 
     [HttpGet("DataSets/{dataSetName}")]
-    public void DisplayDataSetAsGraph(string dataSetName)
+    public async Task<IActionResult> DisplayDataSetAsGraph(string dataSetName,
+    [FromQuery] string sourceEdgeIdentifierFieldName, [FromQuery] string destinationEdgeIdentifierFieldName,
+        [FromQuery] string vertexIdentifierFieldName)
     {
+        ServiceResponse<DisplayGraphDto> response =
+            await _dataAdminService.DisplayGeraphData(dataSetName, sourceEdgeIdentifierFieldName, destinationEdgeIdentifierFieldName, vertexIdentifierFieldName);
+        response.Data.GraphName = dataSetName;
+        return StatusCode((int)response.Type, response);
     }
 
+
     [HttpGet("DataSets/{dataSetName}/Vertices/{vertexId}")]
-    public void DisplayVertexDetails(string datasetName, int vertexId)
+    public async Task<IActionResult> DisplayVertexDetails(string datasetName, int vertexId)
     {
+        return BadRequest();
     }
 
     [HttpGet("DataSets/{dataSetName}/Edges/{edgeId}")]
-    public void DisplayEdgeDetails(string datasetName, int edgeId)
+    public async Task<IActionResult> DisplayEdgeDetails(string datasetName, int edgeId)
     {
+        return BadRequest();
     }
 }

mohaymen-codestar-Team02/Dto/GetGraphDto.cs

@@ -0,0 +1,9 @@
+namespace mohaymen_codestar_Team02.Dto;
+
+public class GetGraphDto
+{
+    public string databaseName;
+    public string sourceEdgeIdentifierFieldName;
+    public string destinationEdgeIdentifierFieldName;
+    public string vertexIdentifierFieldName;
+}

mohaymen-codestar-Team02/Dto/GraphDTO/DetailDto.cs

@@ -0,0 +1,6 @@
+namespace mohaymen_codestar_Team02.Dto.GraphDTO;
+
+public class DetailDto
+{
+    public Dictionary<string, string> AttributeValue { get; init; }
+}

mohaymen-codestar-Team02/Dto/GraphDTO/DisplayGraphDto.cs

@@ -0,0 +1,10 @@
+using mohaymen_codestar_Team02.Models;
+
+namespace mohaymen_codestar_Team02.Dto.GraphDTO;
+
+public class DisplayGraphDto
+{
+    public List<Edge> Edges { get; init; }
+    public List<Vertex> Vertices { get; init; }
+    public string GraphName { get; set; }
+}