Skip to content

Commit cf38541

Browse files
refactor: PageSize and LastResultId removed from PaginationResult Model, tests updated (#1617)
1 parent 1e882f8 commit cf38541

3 files changed

Lines changed: 3 additions & 17 deletions

File tree

application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationResult.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ public class PaginationResult<T>
66
public bool IsFirstPage { get; set; }
77
public bool HasNextPage { get; set; }
88
public bool HasPreviousPage { get; set; }
9-
public int? LastResultId { get; set; }
109
public int TotalItems { get; set; }
1110
public int TotalPages { get; set; }
1211
public int CurrentPage { get; set; }
13-
public int PageSize { get; set; }
1412
}

application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationService.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ public PaginationResult<T> GetPaginatedResult(IQueryable<T> source, int page = 1
3131
IsFirstPage = page == 1,
3232
HasNextPage = page < totalPages,
3333
HasPreviousPage = page > 1,
34-
LastResultId = null, // Not used in page-based pagination
3534
TotalItems = totalItems,
3635
TotalPages = totalPages,
3736
CurrentPage = page,
38-
PageSize = pageSize
3937
};
4038
}
4139

tests/UnitTests/ScreeningDataServicesTests/ValidationExceptionDataTests/GetValidationExceptionTests/GetValidationExceptionsTests.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ public async Task Run_NoExceptionIdQueryParameter_ReturnsAllExceptions()
137137
CurrentPage = 1,
138138
TotalItems = 3,
139139
TotalPages = 1,
140-
PageSize = 10
141140
};
142141

143142
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", "3" } };
@@ -175,7 +174,6 @@ public async Task Run_WhenIsReportTrueWithValidDate_ReturnsReportExceptions()
175174
CurrentPage = 1,
176175
TotalItems = reportExceptions.Count,
177176
TotalPages = 1,
178-
PageSize = 10
179177
};
180178

181179
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", "2" } };
@@ -237,7 +235,6 @@ public async Task Run_WhenIsReportTrueWithNullDate_ReturnsReportExceptions()
237235
CurrentPage = 1,
238236
TotalItems = allReportExceptions.Count,
239237
TotalPages = 1,
240-
PageSize = 10
241238
};
242239

243240
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", allReportExceptions.Count.ToString() } };
@@ -280,7 +277,6 @@ public async Task Run_WhenIsReportTrueWithTodaysDate_ReturnsReportExceptions()
280277
CurrentPage = 1,
281278
TotalItems = todaysReportExceptions.Count,
282279
TotalPages = 1,
283-
PageSize = 10
284280
};
285281

286282
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", todaysReportExceptions.Count.ToString() } };
@@ -343,7 +339,6 @@ public async Task Run_WithDifferentExceptionCategory_ReturnsCorrectExceptions()
343339
CurrentPage = 1,
344340
TotalItems = boExceptions.Count,
345341
TotalPages = 1,
346-
PageSize = 10
347342
};
348343

349344
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", boExceptions.Count.ToString() } };
@@ -394,7 +389,6 @@ public async Task Run_WithMultipleFilters_AppliesAllCorrectly()
394389
CurrentPage = pageNumber,
395390
TotalItems = filteredAndSortedExceptions.Count,
396391
TotalPages = 2,
397-
PageSize = 1
398392
};
399393

400394
var expectedHeaders = new Dictionary<string, string>
@@ -487,7 +481,6 @@ public async Task Run_NoExceptionsFound_ReturnsOkWithEmptyList()
487481
CurrentPage = 1,
488482
TotalItems = 0,
489483
TotalPages = 0,
490-
PageSize = 10
491484
};
492485

493486
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", "0" } };
@@ -553,7 +546,6 @@ public async Task Run_WithExceptionStatus_ReturnsFilteredExceptions()
553546
CurrentPage = 1,
554547
TotalItems = 2,
555548
TotalPages = 1,
556-
PageSize = 10
557549
};
558550

559551
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", "2" } };
@@ -594,7 +586,6 @@ public async Task Run_WithSortOrder_ReturnsOrderedExceptions()
594586
CurrentPage = 1,
595587
TotalItems = sortedExceptions.Count,
596588
TotalPages = 1,
597-
PageSize = 10
598589
};
599590

600591
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", sortedExceptions.Count.ToString() } };
@@ -635,7 +626,6 @@ public async Task Run_WithPageParameter_ReturnsPaginatedResults()
635626
CurrentPage = pageNumber,
636627
TotalItems = _exceptionList.Count,
637628
TotalPages = 3,
638-
PageSize = 2
639629
};
640630

641631
var expectedHeaders = new Dictionary<string, string> {
@@ -681,7 +671,7 @@ public async Task Run_WithPageZero_DefaultsToPage1()
681671
CurrentPage = 1,
682672
TotalItems = _exceptionList.Count,
683673
TotalPages = 1,
684-
PageSize = 10
674+
685675
};
686676

687677
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", _exceptionList.Count.ToString() } };
@@ -720,7 +710,7 @@ public async Task Run_WithNegativePage_DefaultsToPage1()
720710
CurrentPage = 1,
721711
TotalItems = _exceptionList.Count,
722712
TotalPages = 1,
723-
PageSize = 10
713+
724714
};
725715

726716
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", _exceptionList.Count.ToString() } };
@@ -780,7 +770,7 @@ public async Task Run_PaginationServiceThrowsException_ReturnsInternalServerErro
780770
CurrentPage = 1,
781771
TotalItems = reportExceptions.Count,
782772
TotalPages = 1,
783-
PageSize = 10
773+
784774
};
785775

786776
var expectedHeaders = new Dictionary<string, string> { { "X-Total-Count", reportExceptions.Count.ToString() } };

0 commit comments

Comments
 (0)