Reverts

Author: {{name}}

Services/UI/OJS.Services.Ui.Business/Implementations/ContestsBusinessService.cs

@@ -346,7 +346,7 @@ public async Task<PagedResult<ContestForListingServiceModel>> GetAllByFiltersAnd
         var includeHidden = model.IncludeHidden && user.IsAdmin;
 
         var pagedContests =
-            await contestsData.GetAllAsPageByFiltersAndSorting(model, includeHidden);
+            await contestsData.GetAllAsPageByFiltersAndSorting<ContestForListingServiceModel>(model, includeHidden);
 
         this.SetContestVisibility(pagedContests.Items);
 

Services/UI/OJS.Services.Ui.Data/IContestsDataService.cs

@@ -18,7 +18,7 @@ Task<PagedResult<TServiceModel>> ApplyFiltersSortAndPagination<TServiceModel>(
 
         Task<IEnumerable<TServiceModel>> GetAllExpired<TServiceModel>();
 
-        Task<PagedResult<ContestForListingServiceModel>> GetAllAsPageByFiltersAndSorting(ContestFiltersServiceModel model, bool includeHidden = false);
+        Task<PagedResult<TServiceModel>> GetAllAsPageByFiltersAndSorting<TServiceModel>(ContestFiltersServiceModel model, bool includeHidden = false);
 
         IQueryable<Contest> GetLatestForParticipantByUsername(string username);
 

Services/UI/OJS.Services.Ui.Data/Implementations/ContestsDataService.cs

@@ -39,7 +39,7 @@ public async Task<IEnumerable<TServiceModel>> GetAllExpired<TServiceModel>()
     public IQueryable<Contest> GetAllVisible()
         => this.GetQuery(c => c.IsVisible || c.VisibleFrom <= this.dates.GetUtcNow());
 
-    public async Task<PagedResult<ContestForListingServiceModel>> GetAllAsPageByFiltersAndSorting(
+    public async Task<PagedResult<TServiceModel>> GetAllAsPageByFiltersAndSorting<TServiceModel>(
         ContestFiltersServiceModel model,
         bool includeHidden = false)
     {
@@ -53,7 +53,7 @@ public async Task<PagedResult<ContestForListingServiceModel>> GetAllAsPageByFilt
                 .Where(c => c.CategoryId.HasValue && model.CategoryIds.Contains(c.CategoryId.Value));
         }
 
-        return await this.ApplyFiltersSortAndPagination<ContestForListingServiceModel>(contests, model);
+        return await this.ApplyFiltersSortAndPagination<TServiceModel>(contests, model);
     }
 
     public IQueryable<Contest> GetLatestForParticipantByUsername(string username)