🐛 Refactor activity filtering

Author: Beelzenef

TaleEngine/TaleEngine.Application.Contracts/IActivityService.cs

@@ -10,7 +10,7 @@ public interface IActivityService
         List<ActivityEntity> GetActiveActivities(int editionId);
         List<ActivityEntity> GetPendingActivities(int editionId);
         List<ActivityEntity> GetLastThreeActivities(int editionId);
-        IEnumerable<ActivityEntity> GetActiveActivitiesFiltered(int typeId, int editionId, List<int> timeframes, string title, int skipByPagination, int activitiesPerPage, int userFav = default);
+        IEnumerable<ActivityEntity> GetActiveActivitiesFiltered(int typeId, int editionId, List<int> timeframes, string title, int userFav = default);
         List<ActivityEntity> GetFavouriteActivitiesByUser(int userId, int editionId);
         bool AddFavouriteActivity(int activityId, int userId);
         bool RemoveFavouriteActivity(int activityId, int userId);

TaleEngine/TaleEngine.Application/ActivityService.cs

@@ -51,7 +51,7 @@ public List<ActivityEntity> GetPendingActivities(int editionId)
         }
 
         public IEnumerable<ActivityEntity> GetActiveActivitiesFiltered(int typeId, int editionId,
-                List<int> timeFrames, string title, int skipByPagination, int activitiesPerPage, int userFav = default)
+                List<int> timeFrames, string title, int userFav = default)
         {
             IEnumerable<ActivityEntity> query;
 

TaleEngine/TaleEngine.Business.Testing/ActivityQueriesPaginationTests.cs

@@ -0,0 +1,69 @@
+using FluentAssertions;
+using Moq;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using TaleEngine.API.Contracts.Dtos.Requests;
+using TaleEngine.CQRS.Queries;
+using TaleEngine.Data.Contracts.Entities;
+using TaleEngine.Services.Contracts;
+using Xunit;
+
+namespace TaleEngine.CQRS.Testing
+{
+    [ExcludeFromCodeCoverage]
+    public class ActivityQueriesPaginationTests
+    {
+        [Fact]
+        public void ActiveActivitiesFilteredQuery_ShouldApplyPaginationAndCalculateTotalPages()
+        {
+            // Arrange
+            const int editionId = 1;
+            const int userId = 10;
+
+            var request = new ActivityFilterRequest
+            {
+                EditionId = editionId,
+                Page = 1,
+                Title = string.Empty,
+                TimeFrames = new List<int>()
+            };
+
+            var editionServiceMock = new Mock<IEditionService>();
+            var activityServiceMock = new Mock<IActivityService>();
+
+            var allFilteredActivities = Enumerable.Range(1, 7)
+                .Select(i => new ActivityEntity
+                {
+                    Id = i,
+                    Title = $"Activity {i}",
+                    EditionId = editionId
+                })
+                .ToList();
+
+            editionServiceMock.Setup(x => x.GetById(editionId))
+                .Returns(new EditionEntity { Id = editionId });
+
+            activityServiceMock.Setup(x => x.GetActiveActivitiesFiltered(
+                    request.TypeId,
+                    editionId,
+                    request.TimeFrames,
+                    request.Title,
+                    userId))
+                .Returns(allFilteredActivities);
+
+            var target = new ActivityQueries(activityServiceMock.Object, editionServiceMock.Object);
+
+            // Act
+            var result = target.ActiveActivitiesFilteredQuery(request, userId);
+
+            // Assert
+            result.Should().NotBeNull();
+            result.CurrentPage.Should().Be(1);
+            result.TotalPages.Should().Be(3);
+            result.Activities.Should().NotBeNull();
+            result.Activities.Should().HaveCount(3);
+            result.Activities.Select(a => a.Id).Should().Equal(new[] { 4, 5, 6 });
+        }
+    }
+}

TaleEngine/TaleEngine.Bussiness/Queries/ActivityQueries.cs

@@ -55,10 +55,15 @@ public ActivityFilteredResult ActiveActivitiesFilteredQuery(ActivityFilterReques
             int skipByPagination = request.Page * ACTIVITIESPERPAGE;
 
             var activitiesQueried = _activityService.GetActiveActivitiesFiltered(request.TypeId, currentEdition.Id,
-                request.TimeFrames, request.Title, skipByPagination, ACTIVITIESPERPAGE, userId);
+                request.TimeFrames, request.Title, userId);
 
-            var totalActivities = activitiesQueried.Count();
-            var activities = activitiesQueried.ToList();
+            var filteredActivities = activitiesQueried.ToList();
+            var totalActivities = filteredActivities.Count;
+
+            var activities = filteredActivities
+                .Skip(skipByPagination)
+                .Take(ACTIVITIESPERPAGE)
+                .ToList();
 
             var models = ActivityMapper.MapEntityToDto(activities);