fix(accessfile):debug structure of return

AnalysisData/AnalysisData.sln.DotSettings.user

@@ -1,5 +1,5 @@
 <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:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\kimia\AppData\Local\JetBrains\Rider2024.1\resharper-host\temp\Rider\vAny\CoverageData\_AnalysisData.-35481945\Snapshot\snapshot.utdcvr</s:String>
+
 
 
 

AnalysisData/AnalysisData/EAV/Controllers/FileAccessController.cs

@@ -1,3 +1,4 @@
+using AnalysisData.EAV.Repository.Abstraction;
 using AnalysisData.EAV.Service;
 using Microsoft.AspNetCore.Mvc;
 
@@ -9,10 +10,12 @@ namespace AnalysisData.EAV.Controllers;
 public class FileAccessController : ControllerBase
 {
     private readonly IFilePermissionService _filePermissionService;
+    private readonly IUserFileRepository _userFileRepository;
 
-    public FileAccessController(IFilePermissionService filePermissionService)
+    public FileAccessController(IFilePermissionService filePermissionService, IUserFileRepository userFileRepository)
     {
         _filePermissionService = filePermissionService;
+        _userFileRepository = userFileRepository;
     }
 
     [HttpGet("GetFileForAccessingFile")]
@@ -30,7 +33,7 @@ public async Task<IActionResult> GetUsersAsync([FromQuery] string username)
     }
 
     [HttpPost("AccessFileToUser")]
-    public async Task<IActionResult> AccessFileToUser([FromBody] List<string> userGuidIdes,int fileId)
+    public async Task<IActionResult> AccessFileToUser([FromBody] List<string> userGuidIdes,[FromQuery] int fileId)
     {
         await _filePermissionService.AccessFileToUser(userGuidIdes, fileId);
         return Ok(new 
@@ -40,8 +43,13 @@ public async Task<IActionResult> AccessFileToUser([FromBody] List<string> userGu
     }
 
     [HttpGet("WhoAccessToThisFile")]
-    public async Task<IActionResult> WhoAccessToThisFile([FromQuery] string fileId)
+    public async Task<IActionResult> WhoAccessToThisFile([FromQuery] int fileId)
     {
+        var file = await _userFileRepository.GetByFileIdAsync(fileId);
+        if (file is null)
+        {
+            throw new FileNotFoundException();
+        }
         var result = await _filePermissionService.WhoAccessThisFile(fileId);
         return Ok(result);
     }

AnalysisData/AnalysisData/EAV/Dto/UserWhoAccessThisFileDto.cs

@@ -0,0 +1,7 @@
+namespace AnalysisData.EAV.Dto;
+
+public class UserWhoAccessThisFileDto
+{
+    public Guid Id { get; set; }
+    public string UserName { get; set; }
+}

AnalysisData/AnalysisData/EAV/Repository/Abstraction/IUserFileRepository.cs

@@ -8,7 +8,7 @@ public interface IUserFileRepository
     Task<IEnumerable<UserFile>> GetAllAsync();
     Task<UserFile?> GetByUserIdAsync(string userId);
     Task<IEnumerable<string>> GetUsersIdAccessToInputFile(string fileId);
-    Task<IEnumerable<UserFile?>> GetByFileIdAsync(string fileId);
+    Task<IEnumerable<UserFile?>> GetByFileIdAsync(int fileId);
     Task DeleteByUserIdAsync(string userId);
     Task RevokeUserAccess(List<string> userIds);
     Task GrantUserAccess(List<string> userIds, int fileId);

AnalysisData/AnalysisData/EAV/Repository/UserFileRepository.cs

@@ -31,10 +31,11 @@ public async Task<IEnumerable<UserFile>> GetAllAsync()
         return await _context.UserFiles.FirstOrDefaultAsync(x => x.UserId.ToString() == userId);
     }
 
-    public async Task<IEnumerable<UserFile?>> GetByFileIdAsync(string fileId)
+    public async Task<IEnumerable<UserFile>> GetByFileIdAsync(int fileId)
     {
-        return await _context.Set<UserFile>()
-            .Where(u => u.FileId.ToString() == fileId)
+        return await _context.UserFiles
+            .Include(x =>x.User)
+            .Where(u => u.FileId == fileId)
             .ToListAsync();
     }
 
@@ -57,7 +58,7 @@ public async Task DeleteByUserIdAsync(string userId)
 
     public async Task GrantUserAccess(List<string> userIds,int fileId)
     {
-        var file = await GetByFileIdAsync(fileId.ToString());
+        var file = await GetByFileIdAsync(fileId);
         if (file is null)
         {
             throw new FileNotFoundException();

AnalysisData/AnalysisData/EAV/Service/FilePermissionService.cs

@@ -46,25 +46,26 @@ public async Task<PaginatedFilesDto> GetFilesPagination(int page, int limit)
     public async Task<List<UserAccessDto>> GetUserForAccessingFile(string username)
     {
         var users =await _userRepository.GetUsersContainSearchInput(username);
+        if (users.Count() == 0)
+        {
+            throw new UserNotFoundException();
+        }
         var result = users.Select(x => new UserAccessDto()
         {
             Id = x.Id.ToString(), UserName = x.Username, FirstName = x.FirstName, LastName = x.LastName
         });
-        if (!result.Any())
-        {
-            throw new UserNotFoundException();
-        }
         return result.ToList();
     }
 
-    public async Task<IEnumerable<UserFile>> WhoAccessThisFile(string fileId)
+    public async Task<IEnumerable<UserWhoAccessThisFileDto>> WhoAccessThisFile(int fileId)
     {
-        var files =await _userFileRepository.GetByFileIdAsync(fileId);
-        if (!files.Any())
+        var users =await _userFileRepository.GetByFileIdAsync(fileId);
+        var usersDtos = users.Select(user => new UserWhoAccessThisFileDto()
         {
-            throw new UserNotFoundException();
-        }
-        return files.ToList();
+            Id = user.User.Id,
+            UserName = user.User.Username
+        });
+        return usersDtos;
     }
 
     public async Task AccessFileToUser(List<string> inputUserGuidIds,int fileId)

AnalysisData/AnalysisData/EAV/Service/IFilePermissionService.cs

@@ -8,6 +8,6 @@ public interface IFilePermissionService
 {
     Task<PaginatedFilesDto> GetFilesPagination(int page, int limit);
     Task<List<UserAccessDto>> GetUserForAccessingFile(string username);
-    Task<IEnumerable<UserFile>> WhoAccessThisFile(string fileId);
+    Task<IEnumerable<UserWhoAccessThisFileDto>> WhoAccessThisFile(int fileId);
     Task AccessFileToUser(List<string> inputUserIds, int fileId);
 }