fix(filePermission):return pageIndex (#64)

Star-Academy · Aug 28, 2024 · aacc9a0 · aacc9a0
1 parent 5279be8
commit aacc9a0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/AnalysisData/AnalysisData/EAV/Dto/PaginatedFilesDto.cs b/AnalysisData/AnalysisData/EAV/Dto/PaginatedFilesDto.cs
@@ -0,0 +1,8 @@
+namespace AnalysisData.EAV.Dto;
+
+public class PaginatedFilesDto
+{
+    public List<UploadDataDto> Items { get; set; }
+    public int TotalCount { get; set; }
+    public int PageIndex { get; set; }
+}
diff --git a/AnalysisData/AnalysisData/EAV/Repository/FileUploadedRepository/FileUploadedRepository.cs b/AnalysisData/AnalysisData/EAV/Repository/FileUploadedRepository/FileUploadedRepository.cs
@@ -14,8 +14,17 @@ public FileUploadedRepository(ApplicationDbContext context)
         _context = context;
     }
 
+    public async Task<int> GetTotalFilesCountAsync()
+    {
+        return await _context.FileUploadedDb.CountAsync();
+    }
+
     public async Task<IEnumerable<UploadedFile>> GetFileUploadedInDb(int page, int limit)
     {
-        return await _context.FileUploadedDb.Include(x => x.Category).Skip((page) * limit).Take(limit).ToListAsync();
+        return await _context.FileUploadedDb
+            .Include(x => x.Category)
+            .Skip(page * limit)
+            .Take(limit)
+            .ToListAsync();
     }
 }
diff --git a/AnalysisData/AnalysisData/EAV/Repository/FileUploadedRepository/IFileUploadedRepository.cs b/AnalysisData/AnalysisData/EAV/Repository/FileUploadedRepository/IFileUploadedRepository.cs
@@ -5,4 +5,5 @@ namespace AnalysisData.EAV.Repository.FileUploadedRepository;
 public interface IFileUploadedRepository
 {
     Task<IEnumerable<UploadedFile>> GetFileUploadedInDb(int page, int limit);
+    Task<int> GetTotalFilesCountAsync();
 }
diff --git a/AnalysisData/AnalysisData/EAV/Service/FilePermissionService.cs b/AnalysisData/AnalysisData/EAV/Service/FilePermissionService.cs
@@ -22,14 +22,25 @@ public FilePermissionService(IFileUploadedRepository fileUploadedRepository,IUse
     }
 
 
-    public async Task<List<UploadDataDto>> GetFilesPagination(int page, int limit)
+    public async Task<PaginatedFilesDto> GetFilesPagination(int page, int limit)
     {
+        var totalFilesCount = await _fileUploadedRepository.GetTotalFilesCountAsync();
         var files = await _fileUploadedRepository.GetFileUploadedInDb(page, limit);
-        var paginationFiles = files.Select(x => new UploadDataDto()
+
+        var paginatedFiles = files.Select(x => new UploadDataDto()
         {
-            Id = x.Id.ToString() ,FileName = x.FileName , Category = x.Category.Name, UploadDate = x.UploadDate,
-        });
-        return paginationFiles.ToList();
+            Id = x.Id.ToString(),
+            FileName = x.FileName,
+            Category = x.Category.Name,
+            UploadDate = x.UploadDate,
+        }).ToList();
+
+        return new PaginatedFilesDto
+        {
+            Items = paginatedFiles,
+            TotalCount = totalFilesCount,
+            PageIndex = page
+        };
     }
 
     public async Task<List<UserAccessDto>> GetUserForAccessingFile(string username)

diff --git a/AnalysisData/AnalysisData/EAV/Service/IFilePermissionService.cs b/AnalysisData/AnalysisData/EAV/Service/IFilePermissionService.cs
@@ -6,7 +6,7 @@ namespace AnalysisData.EAV.Service;
 
 public interface IFilePermissionService
 {
-    Task<List<UploadDataDto>> GetFilesPagination(int page, int limit);
+    Task<PaginatedFilesDto> GetFilesPagination(int page, int limit);
     Task<List<UserAccessDto>> GetUserForAccessingFile(string username);
     Task<IEnumerable<UserFile>> WhoAccessThisFile(string fileId);
     Task AccessFileToUser(List<string> inputUserIds, int fileId);