Added missing unit test and updated pagination logic so it isn't copied between classes

Author: Morten Turn Pedersen

NetCoreEntityFramework.Tests/EntityRepositoryTests.cs

@@ -263,6 +263,21 @@ public async Task DeleteDeletesEntity()
             Assert.IsNull(newlyDeletedEntity);
             Assert.AreEqual(expectedEntityCount, _context.Table.Count());
         }
+        [Test]
+        public async Task DeleteOnIdDeletesEntity()
+        {
+            bool success;
+            var expectedEntityCount = _context.Table.Count() - 1;
+            await using (_repository)
+            {
+                success = await _repository.Delete(_entity.Id);
+            }
+
+            var newlyDeletedEntity = await _repository.Get(_entity.Id);
+            Assert.IsTrue(success);
+            Assert.IsNull(newlyDeletedEntity);
+            Assert.AreEqual(expectedEntityCount, _context.Table.Count());
+        }
 
         [Test]
         public void DeleteThrowsExceptionIfArgumentNull()

NetCoreEntityFramework/Repositories/EntityRepository.cs

@@ -30,18 +30,9 @@ public async virtual Task<IEnumerable<TEntity>> GetList(
             Expression<Func<TEntity, object>> orderByExpression = null,
             OrderBy orderBy = OrderBy.Ascending)
         {
-            if (page < 1)
-                throw new ArgumentException($"{nameof(page)} was below 1. Received: {page}", nameof(page));
-            if(pageSize < 1)
-                throw new ArgumentException($"{nameof(pageSize)} was below 1. Received: {pageSize}", nameof(pageSize));
-
             IQueryable<TEntity> query = GetQueryable(where, orderByExpression, orderBy);
 
-            // Pagination only skip if above page 1
-            if (page > 1)
-                query = query.Skip((page - 1) * pageSize);
-
-            query = query.Take(pageSize);
+            query = Paginate(query, page, pageSize);
 
             return await query.ToListAsync();
         }
@@ -109,6 +100,22 @@ public virtual async Task<bool> Delete(Guid id)
             return await Delete(entity);
         }
 
+        protected IQueryable<TEntity> Paginate(IQueryable<TEntity> query, [Range(1, int.MaxValue)] int page, [Range(1, int.MaxValue)] int pageSize)
+        {
+            if (page < 1)
+                throw new ArgumentException($"{nameof(page)} was below 1. Received: {page}", nameof(page));
+            if (pageSize < 1)
+                throw new ArgumentException($"{nameof(pageSize)} was below 1. Received: {pageSize}", nameof(pageSize));
+
+            var q = query;
+
+            // Pagination only skip if above page 1
+            if (page > 1)
+                q = q.Skip((page - 1) * pageSize);
+
+            return q.Take(pageSize);
+        }
+
         protected IQueryable<TEntity> GetQueryable(
             Expression<Func<TEntity, bool>> where = null,
             Expression<Func<TEntity, object>> orderByExpression = null,

NetCoreEntityFramework/Repositories/EntitySoftDeleteRepository.cs

@@ -26,18 +26,9 @@ public async virtual Task<IEnumerable<TEntity>> GetList(
             OrderBy orderBy = OrderBy.Ascending,
             GetListMode mode = GetListMode.ExcludeDeleted)
         {
-            if (page < 1)
-                throw new ArgumentException($"{nameof(page)} was below 1. Received: {page}", nameof(page));
-            if (pageSize < 1)
-                throw new ArgumentException($"{nameof(pageSize)} was below 1. Received: {pageSize}", nameof(pageSize));
-
             IQueryable<TEntity> query = GetQueryable(where, orderByExpression, orderBy, mode);
 
-            // Pagination only skip if above page 1
-            if (page > 1)
-                query = query.Skip((page - 1) * pageSize);
-
-            query = query.Take(pageSize);
+            query = Paginate(query, page, pageSize);
 
             return await query.ToListAsync();
         }