diff --git a/API_SQLuedo/ModelToEntity/DbDataManager.cs b/API_SQLuedo/ModelToEntity/DbDataManager.cs index c571461..fde0a88 100644 --- a/API_SQLuedo/ModelToEntity/DbDataManager.cs +++ b/API_SQLuedo/ModelToEntity/DbDataManager.cs @@ -189,11 +189,11 @@ namespace ModelToEntity } } - public async Task> GetItems(int index, int count, string? orderingPropertyName = null, object? valueProperty = null) + public async Task> GetItems(int page, int count, string? orderingPropertyName = null, object? valueProperty = null) { using (var context = new UserDbContext()) { - var users = (await context.GetItemsWithFilter(index, count, orderingPropertyName, valueProperty)); + var users = (await context.GetItemsWithFilter(page, count, orderingPropertyName, valueProperty)); if(users == null) { return null; diff --git a/API_SQLuedo/ModelToEntity/Extension.cs b/API_SQLuedo/ModelToEntity/Extension.cs index 3cc95d0..dda75b6 100644 --- a/API_SQLuedo/ModelToEntity/Extension.cs +++ b/API_SQLuedo/ModelToEntity/Extension.cs @@ -74,7 +74,7 @@ namespace ModelToEntity return Task.FromResult(entity); } internal static Task> GetItemsWithFilter(this DbContext context, - int index, int count, string? orderingPropertyName = null, object? valueProperty = null) where T : class + int page, int count, string? orderingPropertyName = null, object? valueProperty = null) where T : class { IQueryable query = context.Set(); @@ -100,7 +100,7 @@ namespace ModelToEntity } return Task.FromResult>(null); } - var items = query.Skip(index).Take(count).ToList(); + var items = query.Skip((page -1) * count).Take(count).ToList(); return Task.FromResult>(items); } } diff --git a/API_SQLuedo/Services/UserDataService.cs b/API_SQLuedo/Services/UserDataService.cs index 4ace5ec..81ba9d4 100644 --- a/API_SQLuedo/Services/UserDataService.cs +++ b/API_SQLuedo/Services/UserDataService.cs @@ -78,9 +78,9 @@ namespace Services return item.FromModelToDTO(); } - public async Task> GetItems(int index, int count, string? orderingPropertyName = null, object? valueProperty = null) + public async Task> GetItems(int page, int count, string? orderingPropertyName = null, object? valueProperty = null) { - var items = await dataServiceEF.GetItems(index, count, orderingPropertyName, valueProperty); + var items = await dataServiceEF.GetItems(page, count, orderingPropertyName, valueProperty); if (items == null) { throw new InvalidOperationException("aucune donnée trouvé");