fix(Data Structure): Fixed crashes due to missing record IDs in DB an… (

#67) * fix(Data Structure): Fixed crashes due to missing record IDs in DB and improved JSON contract between front and back * fix(try-catch):delete extra trycatch * fix(try-catch):Use specific try-catch
Star-Academy · Aug 29, 2024 · efa5ac2 · efa5ac2
1 parent aa7c6d6
commit efa5ac2
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 34 deletions.
diff --git a/AnalysisData/AnalysisData/EAV/Controllers/FileAccessController.cs b/AnalysisData/AnalysisData/EAV/Controllers/FileAccessController.cs
@@ -1,5 +1,7 @@
+using AnalysisData.EAV.Dto;
 using AnalysisData.EAV.Repository.Abstraction;
 using AnalysisData.EAV.Service;
+using AnalysisData.Exception;
 using Microsoft.AspNetCore.Mvc;
 
 namespace AnalysisData.EAV.Controllers;
@@ -33,12 +35,12 @@ public async Task<IActionResult> GetUsersAsync([FromQuery] string username)
     }
 
     [HttpPost("AccessFileToUser")]
-    public async Task<IActionResult> AccessFileToUser([FromBody] List<string> userGuidIdes,[FromQuery] int fileId)
+    public async Task<IActionResult> AccessFileToUser([FromBody] AccessFileToUserDto request)
     {
-        await _filePermissionService.AccessFileToUser(userGuidIdes, fileId);
-        return Ok(new 
+        await _filePermissionService.AccessFileToUser(request.UserGuidIds.ToList(), request.FileId);
+        return Ok(new  
         {
-            massage = "success"
+            message = "success"
         });
     }
 

diff --git a/AnalysisData/AnalysisData/EAV/Dto/AccessFileToUserDto.cs b/AnalysisData/AnalysisData/EAV/Dto/AccessFileToUserDto.cs
@@ -0,0 +1,7 @@
+namespace AnalysisData.EAV.Dto;
+
+public class AccessFileToUserDto
+{
+    public IEnumerable<string> UserGuidIds { get; set; }
+    public int FileId { get; set; }
+}
diff --git a/AnalysisData/AnalysisData/EAV/Dto/PaginatedListDto.cs b/AnalysisData/AnalysisData/EAV/Dto/PaginatedListDto.cs
@@ -1,17 +1,17 @@
 namespace AnalysisData.EAV.Dto;
 
-public class PaginatedListDto 
+public class PaginatedListDto
 {
-    public List<string> PaginateList { get; }
-    public int PageIndex { get; }
-    public int TotalCount { get; }
-    public string TypeCategory { get; }
-
-    public PaginatedListDto(List<string> items, int pageIndex, int totalCount, string typeCategory)
+    public PaginatedListDto(List<PaginationNodeDto> items, int pageIndex, int totalItems, string categoryName)
     {
-        PaginateList = items;
+        Items = items;
         PageIndex = pageIndex;
-        TotalCount = totalCount;
-        TypeCategory = typeCategory;
-    }    
+        TotalItems = totalItems;
+        CategoryName = categoryName;
+    }
+
+    public List<PaginationNodeDto> Items { get; set; }
+    public int PageIndex { get; set; }
+    public int TotalItems { get; set; }
+    public string CategoryName { get; set; }
 }
diff --git a/AnalysisData/AnalysisData/EAV/Dto/PaginationNodeDto.cs b/AnalysisData/AnalysisData/EAV/Dto/PaginationNodeDto.cs
@@ -2,5 +2,6 @@ namespace AnalysisData.EAV.Dto;
 
 public class PaginationNodeDto
 {
+    public int Id { get; set; }
     public string EntityName { get; set; }
 }
diff --git a/AnalysisData/AnalysisData/EAV/Dto/UploadDataDto.cs b/AnalysisData/AnalysisData/EAV/Dto/UploadDataDto.cs
@@ -2,7 +2,7 @@ namespace AnalysisData.EAV.Dto;
 
 public class UploadDataDto
 {
-    public string Id { get; set; }
+    public int Id { get; set; }
     public string Category { get; set; }
     public string FileName { get; set; }
 

diff --git a/AnalysisData/AnalysisData/EAV/Repository/UserFileRepository.cs b/AnalysisData/AnalysisData/EAV/Repository/UserFileRepository.cs
@@ -58,11 +58,6 @@ public async Task DeleteByUserIdAsync(string userId)
 
     public async Task GrantUserAccess(List<string> userIds,int fileId)
     {
-        var file = await GetByFileIdAsync(fileId);
-        if (file is null)
-        {
-            throw new FileNotFoundException();
-        }
         foreach (var userId in userIds)
         {
             var userFile = new UserFile() { UserId = Guid.Parse(userId), FileId = fileId };
@@ -76,6 +71,4 @@ public async Task RevokeUserAccess(List<string> userIds)
             await DeleteByUserIdAsync(userId);
         }
     }
-
-
 }
diff --git a/AnalysisData/AnalysisData/EAV/Service/FilePermissionService.cs b/AnalysisData/AnalysisData/EAV/Service/FilePermissionService.cs
@@ -13,12 +13,14 @@ public class FilePermissionService : IFilePermissionService
     private readonly IFileUploadedRepository _fileUploadedRepository;
     private readonly IUserRepository _userRepository;
     private readonly IUserFileRepository _userFileRepository;
+    private readonly IUploadDataRepository _uploadDataRepository;
 
-    public FilePermissionService(IFileUploadedRepository fileUploadedRepository,IUserRepository userRepository, IUserFileRepository userFileRepository)
+    public FilePermissionService(IFileUploadedRepository fileUploadedRepository,IUserRepository userRepository, IUserFileRepository userFileRepository, IUploadDataRepository uploadDataRepository)
     {
         _fileUploadedRepository = fileUploadedRepository;
         _userRepository = userRepository;
         _userFileRepository = userFileRepository;
+        _uploadDataRepository = uploadDataRepository;
     }
 
 
@@ -29,7 +31,7 @@ public async Task<PaginatedFilesDto> GetFilesPagination(int page, int limit)
 
         var paginatedFiles = files.Select(x => new UploadDataDto()
         {
-            Id = x.Id.ToString(),
+            Id = x.Id,
             FileName = x.FileName,
             Category = x.Category.Name,
             UploadDate = x.UploadDate,
@@ -68,19 +70,38 @@ public async Task<IEnumerable<UserWhoAccessThisFileDto>> WhoAccessThisFile(int f
         return usersDtos;
     }
 
-    public async Task AccessFileToUser(List<string> inputUserGuidIds,int fileId)
+    public async Task AccessFileToUser(List<string> inputUserGuidIds, int fileId)
     {
+        var validUserGuids = new List<Guid>();
+
         foreach (var userId in inputUserGuidIds)
         {
-            var user = await _userRepository.GetUserById(Guid.Parse(userId));
+            if (Guid.TryParse(userId, out Guid parsedGuid))
+            {
+                validUserGuids.Add(parsedGuid);
+            }
+            else
+            {
+                throw new GuidNotCorrectFormat();
+            }
+        }
+
+        foreach (var userGuid in validUserGuids)
+        {
+            var user = await _userRepository.GetUserById(userGuid);
             if (user is null)
             {
                 throw new UserNotFoundException();
             }
         }
+        if (await _uploadDataRepository.GetByIdAsync(fileId) is null)
+        {
+            throw new NoFileUploadedException();
+        }
         var currentAccessor = await _userFileRepository.GetUsersIdAccessToInputFile(fileId.ToString());
-        var newUsers = inputUserGuidIds.Except(currentAccessor).ToList();
-        var blockAccessToFile = currentAccessor.Except(currentAccessor.Intersect(inputUserGuidIds)).ToList();
+        var newUsers = validUserGuids.Select(g => g.ToString()).Except(currentAccessor).ToList();
+        var blockAccessToFile = currentAccessor.Except(currentAccessor.Intersect(validUserGuids.Select(g => g.ToString()))).ToList();
+
         await _userFileRepository.RevokeUserAccess(blockAccessToFile);
         await _userFileRepository.GrantUserAccess(newUsers, fileId);
     }

diff --git a/AnalysisData/AnalysisData/EAV/Service/GraphServiceEav.cs b/AnalysisData/AnalysisData/EAV/Service/GraphServiceEav.cs
@@ -30,9 +30,9 @@ public GraphServiceEav(IGraphNodeRepository graphNodeRepository, IGraphEdgeRepos
         _graphEdgeRepository = graphEdgeRepository;
     }
 
-    public async Task<PaginatedListDto> GetNodesPaginationAsync(ClaimsPrincipal claimsPrincipal,int pageIndex, int pageSize, int? categoryId = null)
+    public async Task<PaginatedListDto> GetNodesPaginationAsync(ClaimsPrincipal claimsPrincipal, int pageIndex, int pageSize, int? categoryId = null)
     {
-        var valueNodes = await GetEntityNodesForPaginationAsync(claimsPrincipal,categoryId);
+        var valueNodes = await GetEntityNodesForPaginationAsync(claimsPrincipal, categoryId);
 
         string categoryName = null;
         if (categoryId.HasValue)
@@ -43,6 +43,7 @@ public async Task<PaginatedListDto> GetNodesPaginationAsync(ClaimsPrincipal clai
 
         var groupedNodes = valueNodes.Select(g => new PaginationNodeDto
             {
+                Id = g.Id,
                 EntityName = g.Name,
             })
             .ToList();
@@ -51,7 +52,6 @@ public async Task<PaginatedListDto> GetNodesPaginationAsync(ClaimsPrincipal clai
         var items = groupedNodes
             .Skip(pageIndex * pageSize)
             .Take(pageSize)
-            .Select(x => x.EntityName)  // Extract EntityName to match List<string>
             .ToList();
 
         return new PaginatedListDto(items, pageIndex, count, categoryName);

diff --git a/AnalysisData/AnalysisData/Resources.Designer.cs b/AnalysisData/AnalysisData/Resources.Designer.cs
diff --git a/AnalysisData/AnalysisData/Resources.resx b/AnalysisData/AnalysisData/Resources.resx
@@ -61,12 +61,15 @@
         <value>Node not found Exception ! </value>
     </data>
     <data name="NoFileUploadedException" xml:space="preserve">
-        <value>No file uploaded exception !</value>
+        <value>No file uploaded !</value>
     </data>
     <data name="EdgeNotFoundException" xml:space="preserve">
         <value>Edge not found exception !</value>
     </data>
     <data name="DuplicateRoleException" xml:space="preserve">
         <value>We have this role in db ! </value>
     </data>
+    <data name="GuidNotCorrectFormat" xml:space="preserve">
+        <value>id not in correct format!</value>
+    </data>
 </root>
diff --git a/AnalysisData/AnalysisData/User/Exception/GuidNotCorrectFormat.cs b/AnalysisData/AnalysisData/User/Exception/GuidNotCorrectFormat.cs
@@ -0,0 +1,8 @@
+namespace AnalysisData.Exception;
+
+public class GuidNotCorrectFormat : ServiceException
+{
+    public GuidNotCorrectFormat() : base(Resources.GuidNotCorrectFormat,StatusCodes.Status401Unauthorized)
+    {
+    }
+}