From 87f26f9367dbcafb9cb7515fadf7b793ab0dc929 Mon Sep 17 00:00:00 2001
From: "a.beging@eas-solutions.de" <a.beging@eas-solutions.de>
Date: Wed, 29 Apr 2026 15:35:47 +0200
Subject: [PATCH] Refactor Audit service and view: implement GetCount and
 LoadPage methods, update OnReadData for improved data handling

Co-authored-by: Copilot <copilot@github.com>
---
 .../Data/Service/AuditService.cs              | 51 ++++++++++++++-----
 .../Pages/AuditView.razor                     |  2 +
 .../Pages/AuditView.razor.cs                  | 37 ++++++++++++--
 3 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/FoodsharingSiegen.Server/Data/Service/AuditService.cs b/FoodsharingSiegen.Server/Data/Service/AuditService.cs
index dd3b715..2f13c51 100644
--- a/FoodsharingSiegen.Server/Data/Service/AuditService.cs
+++ b/FoodsharingSiegen.Server/Data/Service/AuditService.cs
@@ -61,29 +61,56 @@ namespace FoodsharingSiegen.Server.Data.Service
 
         #endregion
 
-        #region Public Method Load
+        #region Public Method GetCount
 
         /// <summary>
-        /// Loads the count (a. beging, 23.05.2022)
+        /// Gets the total count (ab)
         /// </summary>
-        /// <param name="count">The count</param>
         /// <param name="type">The type</param>
-        /// <returns>A task containing an operation result of list audit</returns>
-        public async Task<OperationResult<List<Audit>>> Load(int count, AuditType? type = null)
+        /// <returns>A task containing an operation result of count</returns>
+        public async Task<OperationResult<int>> GetCount(AuditType? type = null)
         {
             try
             {
-                await Task.CompletedTask;
-                
-                var query = Context.Audits?.Include(x => x.User).OrderByDescending(x => x.Created).AsQueryable();
+                var query = Context.Audits?.AsQueryable();
 
-                if (count > 0)
-                    query = query?.Take(count);
-            
                 if (type != null)
                     query = query?.Where(x => x.Type == type);
 
-                var mat = query?.ToList();
+                if (query == null) return new(0);
+
+                var count = await query.CountAsync();
+                return new(count);
+            }
+            catch (Exception e)
+            {
+                return new(e);
+            }
+        }
+
+        #endregion
+
+        #region Public Method LoadPage
+
+        /// <summary>
+        /// Loads the page of audits (ab)
+        /// </summary>
+        /// <param name="skip">The skip count</param>
+        /// <param name="take">The take count</param>
+        /// <param name="type">The type</param>
+        /// <returns>A task containing an operation result of list audit</returns>
+        public async Task<OperationResult<List<Audit>>> LoadPage(int skip, int take, AuditType? type = null)
+        {
+            try
+            {
+                var query = Context.Audits?.Include(x => x.User).OrderByDescending(x => x.Created).AsQueryable();
+
+                if (type != null)
+                    query = query?.Where(x => x.Type == type);
+
+                query = query?.Skip(skip).Take(take);
+
+                var mat = await query!.ToListAsync();
 
                 if (mat != null) return new(mat);
 
diff --git a/FoodsharingSiegen.Server/Pages/AuditView.razor b/FoodsharingSiegen.Server/Pages/AuditView.razor
index 8222a48..438fd14 100644
--- a/FoodsharingSiegen.Server/Pages/AuditView.razor
+++ b/FoodsharingSiegen.Server/Pages/AuditView.razor
@@ -13,6 +13,8 @@
     
     <DataGrid TItem="Audit"
               Data="@Audits"
+              ReadData="@OnReadData"
+              TotalItems="@TotalAudits"
               VirtualizeOptions="@(new() { DataGridHeight = "100%", DataGridMaxHeight = "100%"})"
               Virtualize="true"
               Responsive>
diff --git a/FoodsharingSiegen.Server/Pages/AuditView.razor.cs b/FoodsharingSiegen.Server/Pages/AuditView.razor.cs
index bc60999..89e4076 100644
--- a/FoodsharingSiegen.Server/Pages/AuditView.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/AuditView.razor.cs
@@ -1,3 +1,4 @@
+using Blazorise.DataGrid;
 using FoodsharingSiegen.Contracts.Entity;
 using FoodsharingSiegen.Server.Data.Service;
 using Microsoft.AspNetCore.Components;
@@ -26,16 +27,44 @@ namespace FoodsharingSiegen.Server.Pages
         /// </summary>
         private List<Audit>? Audits { get; set; }
 
+        /// <summary>
+        ///     Gets or sets the value of the total audits (ab)
+        /// </summary>
+        private int TotalAudits { get; set; }
+
         #endregion
 
         #region Override InitializeDataAsync
 
         /// <inheritdoc />
-        protected override async Task InitializeDataAsync()
+        protected override Task InitializeDataAsync()
         {
-            var loadR = await AuditService?.Load(100)!;
-            if (loadR.Success)
-                Audits = loadR.Data;
+            return Task.CompletedTask;
+        }
+
+        #endregion
+
+        #region Private Method OnReadData
+
+        /// <summary>
+        ///     Called when data is read (ab)
+        /// </summary>
+        /// <param name="e">The params</param>
+        private async Task OnReadData(DataGridReadDataEventArgs<Audit> e)
+        {
+            var countLoad = await AuditService?.GetCount()!;
+            if (countLoad.Success)
+                TotalAudits = countLoad.Data;
+
+            // Default fallback if VirtualizeCount is not set, though Blazor shouldn't do this usually
+            var limit = e.VirtualizeCount > 0 ? e.VirtualizeCount : 50;
+            var offset = e.VirtualizeOffset;
+
+            var itemsLoad = await AuditService?.LoadPage(offset, limit)!;
+            if (itemsLoad.Success)
+                Audits = itemsLoad.Data;
+
+            await InvokeAsync(StateHasChanged);
         }
 
         #endregion