refactor: merge commit

mohaymen-codestar-Team02.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=mohaymen_002Dcodestar_002DTeam02_003B_002A_003Bmohaymen_005Fcodestar_005FTeam02_002EServices_002EAuthenticatoin_002EAuthenticationService_003B_002A/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

mohaymen-codestar-Team02/Controllers/DataAdminController.cs

@@ -10,15 +10,15 @@
 namespace mohaymen_codestar_Team02.Controllers;
 
 [ApiController]
-[Authorize(Roles = nameof(RoleType.DataAdmin))]
+[Authorize]
 public class DataAdminController : ControllerBase
 {
     private readonly IDataAdminService _dataAdminService;
     private readonly IFileReader _fileReader;
-    private readonly IDisplayDataService _dataService;
+    private readonly IGraphService _graphService;
 
-    public DataAdminController(IDataAdminService dataAdminService, IFileReader fileReader,
-        IDisplayDataService dataService)
+    public DataAdminController(IDataAdminService dataAdminService,
+        IFileReader fileReader)
     {
         _dataAdminService = dataAdminService;
         _fileReader = fileReader;
@@ -33,8 +33,7 @@ public async Task<IActionResult> StoreNewDataSet([FromForm] StoreDataDto storeDa
             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);
+                Path.GetFileName(storeDataDto.EdgeFile.FileName), Path.GetFileName(storeDataDto.VertexFile.FileName));
             return StatusCode((int)response.Type, response);
         }
         catch (FormatException e)
@@ -44,8 +43,10 @@ public async Task<IActionResult> StoreNewDataSet([FromForm] StoreDataDto storeDa
     }
 
     [HttpGet("DataSets")]
-    public void GetDataSetsList()
+    public IActionResult GetDataSetsList()
     {
+        var response = _dataAdminService.DisplayDataSet();
+        return StatusCode((int)response.Type, response);
     }
 
     [HttpGet("DataSets/{dataSetName}")]
@@ -61,15 +62,17 @@ await _dataAdminService.DisplayGeraphData(dataSetName, sourceEdgeIdentifierField
     }
 
 
-    [HttpGet("DataSets/{dataSetName}/Vertices/{vertexId}")]
-    public async Task<IActionResult> DisplayVertexDetails(string datasetName, int vertexId)
+    [HttpGet("DataSets/Vertices/{objectId}")]
+    public async Task<IActionResult> DisplayVertexDetails(string objectId)
     {
-        return BadRequest();
+        var respond = _dataAdminService.GetVertexDetail(objectId);
+        return StatusCode((int)respond.Type, respond);
     }
 
-    [HttpGet("DataSets/{dataSetName}/Edges/{edgeId}")]
-    public async Task<IActionResult> DisplayEdgeDetails(string datasetName, int edgeId)
+    [HttpGet("DataSets/Edges/{objectId}")]
+    public async Task<IActionResult> DisplayEdgeDetails(string objectId)
     {
-        return BadRequest();
+        var respond = _dataAdminService.GetEdgeDetail(objectId);
+        return StatusCode((int)respond.Type, respond);
     }
 }

mohaymen-codestar-Team02/Data/Resources.resx

@@ -97,4 +97,7 @@
     <data name="AuthorizedMessage" xml:space="preserve">
         <value>Authorized Message</value>
     </data>
+    <data name="GraphFetchedSuccessfully" xml:space="preserve">
+        <value>GraphFetchedSuccessfully</value>
+    </data>
 </root>

mohaymen-codestar-Team02/Dto/GetDataGroupDto.cs

@@ -0,0 +1,15 @@
+using mohaymen_codestar_Team02.Models.EdgeEAV;
+using mohaymen_codestar_Team02.Models.VertexEAV;
+
+namespace mohaymen_codestar_Team02.Dto;
+
+public class GetDataGroupDto
+{
+    public string Name { get; set; }
+
+    public DateTime CreateAt { get; set; } = DateTime.UtcNow;
+    public DateTime UpdateAt { get; set; } = DateTime.UtcNow;
+
+    public virtual GetEdgeEntityDto EdgeEntity { get; set; }
+    public virtual GetVertexEntityDto VertexEntity { get; set; }
+}

mohaymen-codestar-Team02/Dto/GetEdgeEntityDto.cs

@@ -0,0 +1,6 @@
+namespace mohaymen_codestar_Team02.Dto;
+
+public class GetEdgeEntityDto
+{
+    public string Name { get; set; }
+}

mohaymen-codestar-Team02/Dto/GetVertexEntityDto.cs

@@ -0,0 +1,6 @@
+namespace mohaymen_codestar_Team02.Dto;
+
+public class GetVertexEntityDto
+{
+    public string Name { get; set; }
+}

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

@@ -2,5 +2,5 @@ namespace mohaymen_codestar_Team02.Dto.GraphDTO;
 
 public class DetailDto
 {
-    public Dictionary<string, string> AttributeValue { get; init; }
+    public Dictionary<string, string>? AttributeValue { get; set; } = new();
 }

mohaymen-codestar-Team02/Dto/InfoDto/InfoDto.cs

@@ -0,0 +1,5 @@
+namespace mohaymen_codestar_Team02.Dto.InfoDto;
+
+public class InfoDto
+{
+}

mohaymen-codestar-Team02/Dto/StoreDataDto/StoreDataDto.cs

@@ -4,8 +4,5 @@ public class StoreDataDto
 {
     public IFormFile EdgeFile { get; set; }
     public IFormFile VertexFile { get; set; }
-    public string FileType { get; set; }
     public string DataName { get; set; }
-
-    public string CreatorUserName { get; set; }
 }

mohaymen-codestar-Team02/Mapper/AutoMapperProfile.cs

@@ -1,9 +1,11 @@
 using AutoMapper;
+using mohaymen_codestar_Team02.Dto;
 using mohaymen_codestar_Team02.Dto.Role;
 using mohaymen_codestar_Team02.Dto.User;
 using mohaymen_codestar_Team02.Dto.UserDtos;
-using mohaymen_codestar_Team02.Dto.UserRole;
 using mohaymen_codestar_Team02.Models;
+using mohaymen_codestar_Team02.Models.EdgeEAV;
+using mohaymen_codestar_Team02.Models.VertexEAV;
 
 namespace mohaymen_codestar_Team02.Mapper;
 
@@ -17,5 +19,14 @@ public AutoMapperProfile()
         CreateMap<Role, GetRoleDto>();
         CreateMap<User, RegisterUserDto>();
         CreateMap<User, UpdateUserDto>();
+        CreateMap<DataGroup, GetDataGroupDto>()
+            .ForMember(dest => dest.EdgeEntity, opt =>
+                opt.MapFrom(src => src.EdgeEntity))
+            .ForMember(dest => dest.VertexEntity, opt =>
+                opt.MapFrom(src => src.VertexEntity));
+        CreateMap<DataGroup, GetDataGroupDto>()
+            .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name));
+        CreateMap<EdgeEntity, GetEdgeEntityDto>();
+        CreateMap<VertexEntity, GetVertexEntityDto>();
     }
 }