Modification Criteria pour les lessons et Users dans l'ordre

API_SQLuedo/DbDataManager/Service/LessonDataService.cs

@@ -29,7 +29,7 @@ public class LessonDataService : ILessonService<LessonEntity>
             number = 10;
         }
 
-        IQueryable<LessonEntity> query = DbContext.Lessons.Skip((page - 1) * number).Take(number);
+        IQueryable<LessonEntity> query = DbContext.Lessons;
         switch (orderCriteria)
         {
             case LessonOrderCriteria.None:
@@ -43,10 +43,16 @@ public class LessonDataService : ILessonService<LessonEntity>
             case LessonOrderCriteria.ByLastEdit:
                 query = query.OrderBy(s => s.LastEdit);
                 break;
+            case LessonOrderCriteria.ById:
+                query = query.OrderBy(s => (int) s.Id);
+                break;
             default:
                 break;
         }
 
+        query = query.Skip((page - 1) * number).Take(number);
+        
+
         var lessons = query.ToList();
         return lessons;
     }

API_SQLuedo/DbDataManager/Service/UserDataService.cs

@@ -58,7 +58,8 @@ public class UserDataService : IUserService<UserEntity>
         {
             number = 10;
         }
-        IQueryable<UserEntity> query = DbContext.Users.Skip((page - 1) * number).Take(number);
+
+        IQueryable<UserEntity> query = DbContext.Users;
         switch (orderCriteria)
         {
             case UserOrderCriteria.None:
@@ -78,6 +79,7 @@ public class UserDataService : IUserService<UserEntity>
             default:
                 break;
         }
+        query = query.Skip((page - 1) * number).Take(number);
 
         var users = query.ToList();
         return users;
@@ -195,7 +197,6 @@ public class UserDataService : IUserService<UserEntity>
     {
         var userEdit = GetUserById(id);
         var newUserEntity = UpdateUser(id,new UserEntity{Id = id,Username = userEdit.Username,Password = userEdit.Password,Email = userEdit.Email,IsAdmin = true});
-        DbContext.Users.Add(newUserEntity);
         DbContext.SaveChangesAsync();
         return newUserEntity;
     }

API_SQLuedo/Model/OrderCriteria/LessonOrderCriteria.cs

@@ -5,5 +5,6 @@ public enum LessonOrderCriteria
     None,
     ByTitle,
     ByLastPublisher,
-    ByLastEdit
+    ByLastEdit,
+    ById
 }