Merge pull request #31 from nodes-dotnet/develop

Publish updated package

Author: Morten Turn Pedersen

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 3.1.403
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/pullrequest.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 3.1.403
 
     - name: Install dependencies
       run: dotnet restore

NetCoreEntityFramework.Tests/EntityRepositoryTests.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using TestContext = Nodes.NetCore.EntityFramework.Tests.Mocks.TestContext;
 
@@ -16,7 +17,6 @@ public class EntityRepositoryTests
         private TestEntityRepository _repository;
         private TestContext _context;
         private TestEntity _entity;
-        private TestEntity _deletedEntity;
         private IEnumerable<TestEntity> _listEntities;
 
         [SetUp]
@@ -35,24 +35,12 @@ public void Setup()
             _entity = new TestEntity
             {
                 Created = now,
-                Deleted = false,
                 Id = Guid.NewGuid(),
                 Updated = now,
                 Property = string.Empty
             };
 
-            _deletedEntity = new TestEntity
-            {
-                Created = now.AddMinutes(-42),
-                Deleted = true,
-                DeletedAt = now,
-                Id = Guid.NewGuid(),
-                Updated = now.AddMinutes(-42),
-                Property = "I'm deleted"
-            };
-
             _context.Table.Add(_entity);
-            _context.Table.Add(_deletedEntity);
 
             _listEntities = GetTestList();
             _context.Table.AddRange(_listEntities);
@@ -70,33 +58,32 @@ public async Task AddAddsEntityAndSetsAttributes()
             int expectedSize = startSize + 1;
             var entity = new TestEntity();
 
-            using(_repository)
+            await using(_repository)
             {
                 await _repository.Add(entity);
             }
 
-            Assert.NotNull(entity.Id);
+            Assert.AreNotEqual(Guid.Empty, entity.Id);
             Assert.AreNotEqual(default(DateTime), entity.Created);
             Assert.AreNotEqual(default(DateTime), entity.Updated);
-            Assert.IsFalse(entity.Deleted);
             Assert.AreEqual(expectedSize, await _context.Table.CountAsync());
         }
 
         [Test]
-        public async Task AddEntityWithIdKeepsId()
+        [AutoData]
+        public async Task AddEntityWithIdKeepsId(Guid idToCreate)
         {
-            Guid id = Guid.NewGuid();
             var entity = new TestEntity
             {
-                Id = id
+                Id = idToCreate
             };
 
-            using (_repository)
+            await using (_repository)
             {
                 await _repository.Add(entity);
             }
 
-            Assert.AreEqual(id, entity.Id);
+            Assert.AreEqual(idToCreate, entity.Id);
         }
 
         [Test]
@@ -107,28 +94,12 @@ public void AddThrowsExceptionIfEntityIsNull()
         #endregion
 
         #region List
-        [Test]
-        public async Task GetListReturnsAllNotDeleted()
-        {
-            var entities = await _repository.GetList();
-
-            Assert.AreEqual(_listEntities.Count() + 1, entities.Count());
-        }
-
         [Test]
         public async Task GetListReturnsAll()
         {
-            var entities = await _repository.GetList(null, null, OrderBy.Ascending, GetListMode.IncludeDeleted);
-
-            Assert.AreEqual(_listEntities.Count() + 2, entities.Count());
-        }
-
-        [Test]
-        public async Task GetListReturnsAllDeleted()
-        {
-            var entities = await _repository.GetList(null, null, OrderBy.Ascending, GetListMode.OnlyDeleted);
+            var entities = await _repository.GetList(null, null, OrderBy.Ascending);
 
-            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(_listEntities.Count() + 1, entities.Count());
         }
 
         [Test]
@@ -196,6 +167,80 @@ public async Task GetListPaginated()
             Assert.AreEqual(3, entitiesLastPage.Count());
         }
 
+        [Test]
+        public async Task GetListWithSelectReturnsAll()
+        {
+            var entities = await _repository.GetListWithSelect<string>(e => e.Property);
+
+            Assert.AreEqual(_listEntities.Count() + 1, entities.Count());
+        }
+
+        [Test]
+        public async Task GetListWithSelectWhere()
+        {
+            const string propertyToLookFor = "b";
+            IEnumerable<string> entities = await _repository.GetListWithSelect(x => x.Property, x => x.Property == propertyToLookFor);
+
+            Assert.AreEqual(1, entities.Count());
+            Assert.AreEqual(propertyToLookFor, entities.ElementAt(0));
+        }
+
+        [Test]
+        public async Task GetListWithSelectOrderBy()
+        {
+            var entities = await _repository.GetListWithSelect(x => x.Property, x => x.Property.Length == 1, x => x.Property);
+
+            Assert.AreEqual(_listEntities.Count(), entities.Count());
+            Assert.AreEqual("a", entities.ElementAt(0));
+            Assert.AreEqual("b", entities.ElementAt(1));
+            Assert.AreEqual("c", entities.ElementAt(2));
+            Assert.AreEqual("d", entities.ElementAt(3));
+            Assert.AreEqual("e", entities.ElementAt(4));
+            Assert.AreEqual("f", entities.ElementAt(5));
+            Assert.AreEqual("g", entities.ElementAt(6));
+            Assert.AreEqual("h", entities.ElementAt(7));
+            Assert.AreEqual("i", entities.ElementAt(8));
+            Assert.AreEqual("j", entities.ElementAt(9));
+            Assert.AreEqual("k", entities.ElementAt(10));
+            Assert.AreEqual("l", entities.ElementAt(11));
+            Assert.AreEqual("m", entities.ElementAt(12));
+            Assert.AreEqual("n", entities.ElementAt(13));
+        }
+
+        [Test]
+        public async Task GetListWithSelectOrderByDescending()
+        {
+            var entities = await _repository.GetListWithSelect(x => x.Property, x => x.Property.Length == 1, x => x.Property, OrderBy.Descending);
+
+            Assert.AreEqual(_listEntities.Count(), entities.Count());
+            Assert.AreEqual("n", entities.ElementAt(0));
+            Assert.AreEqual("m", entities.ElementAt(1));
+            Assert.AreEqual("l", entities.ElementAt(2));
+            Assert.AreEqual("k", entities.ElementAt(3));
+            Assert.AreEqual("j", entities.ElementAt(4));
+            Assert.AreEqual("i", entities.ElementAt(5));
+            Assert.AreEqual("h", entities.ElementAt(6));
+            Assert.AreEqual("g", entities.ElementAt(7));
+            Assert.AreEqual("f", entities.ElementAt(8));
+            Assert.AreEqual("e", entities.ElementAt(9));
+            Assert.AreEqual("d", entities.ElementAt(10));
+            Assert.AreEqual("c", entities.ElementAt(11));
+            Assert.AreEqual("b", entities.ElementAt(12));
+            Assert.AreEqual("a", entities.ElementAt(13));
+        }
+
+        [Test]
+        public async Task GetListWithSelectPaginated()
+        {
+            const int pageSize = 6;
+
+            var entities = await _repository.GetListWithSelect(x => x.Property, 1, pageSize);
+            var entitiesLastPage = await _repository.GetListWithSelect(x => x.Property, 3, pageSize);
+
+            Assert.AreEqual(pageSize, entities.Count());
+            Assert.AreEqual(3, entitiesLastPage.Count());
+        }
+
         private IEnumerable<TestEntity> GetTestList()
         {
             return new List<TestEntity>
@@ -233,26 +278,19 @@ private TestEntity GetTestEntity(string property)
         [Test]
         public async Task GetValidEntityReturnsEntity()
         {
-            var entity = await _repository.Get((Guid)_entity.Id);
+            var entity = await _repository.Get(_entity.Id);
 
             Assert.AreSame(_entity, entity);
         }
 
         [Test]
-        public async Task DontGetDeletedEntityWithoutFlag()
+        [AutoData]
+        public async Task DontGetNonExistantEntity(Guid nonExistantId)
         {
-            var entity = await _repository.Get((Guid)_deletedEntity.Id);
+            var entity = await _repository.Get(nonExistantId);
 
             Assert.IsNull(entity);
         }
-
-        [Test]
-        public async Task GetDeletedEntityWithFlag()
-        {
-            var entity = await _repository.Get((Guid)_deletedEntity.Id, true);
-
-            Assert.AreSame(_deletedEntity, entity);
-        }
         #endregion
 
         #region Update
@@ -264,12 +302,12 @@ public async Task UpdateUpdatesUpdated(string propertyValue)
             DateTime oldCreated = _entity.Created;
             _entity.Property = propertyValue;
 
-            using(_repository)
+            await using(_repository)
             {
                 await _repository.Update(_entity);
             }
 
-            var entity = await _repository.Get((Guid)_entity.Id);
+            var entity = await _repository.Get(_entity.Id);
 
             Assert.AreEqual(propertyValue, entity.Property);
             Assert.AreNotEqual(oldUpdated, entity.Updated);
@@ -285,121 +323,60 @@ public void UpdateThrowsExceptionIfNull()
 
         #region Delete
         [Test]
-        public async Task DeleteSoftDeletesAndSetsDeletedAt()
+        public async Task DeleteDeletesEntity()
         {
             bool success;
-            using(_repository)
+            var expectedEntityCount = _context.Table.Count() - 1;
+            await using(_repository)
             {
                 success = await _repository.Delete(_entity);
             }
 
-            var newlyDeletedEntity = await _repository.Get((Guid)_entity.Id, true);
+            var newlyDeletedEntity = await _repository.Get(_entity.Id);
             Assert.IsTrue(success);
-            Assert.IsTrue(newlyDeletedEntity.Deleted);
-            Assert.NotNull(newlyDeletedEntity.DeletedAt);
-        }
-
-        [Test]
-        public void DeleteThrowsExceptionIfArgumentNull()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _repository.Delete(null));
+            Assert.IsNull(newlyDeletedEntity);
+            Assert.AreEqual(expectedEntityCount, _context.Table.Count());
         }
-
         [Test]
-        public async Task DeleteWithValidIdDeletesAndSetsDeletedAt()
+        public async Task DeleteOnIdDeletesEntity()
         {
             bool success;
-            Guid id = (Guid)_entity.Id;
-            using (_repository)
+            var expectedEntityCount = _context.Table.Count() - 1;
+            await using (_repository)
             {
-                success = await _repository.Delete(id);
+                success = await _repository.Delete(_entity.Id);
             }
 
-            var newlyDeletedEntity = await _repository.Get(id, true);
+            var newlyDeletedEntity = await _repository.Get(_entity.Id);
             Assert.IsTrue(success);
-            Assert.IsTrue(newlyDeletedEntity.Deleted);
-            Assert.NotNull(newlyDeletedEntity.DeletedAt);
-        }
-
-        [Test]
-        [AutoData]
-        public async Task DeleteWithInvalidIdReturnsFalse(Guid randomId)
-        {
-            bool success;
-
-            using(_repository)
-            {
-                success = await _repository.Delete(randomId);
-            }
-
-            Assert.IsFalse(success);
+            Assert.IsNull(newlyDeletedEntity);
+            Assert.AreEqual(expectedEntityCount, _context.Table.Count());
         }
 
         [Test]
-        public void DeleteWithEmptyGuidThrowsException()
-        {
-            Assert.ThrowsAsync<ArgumentException>(() => _repository.Delete(Guid.Empty));
-        }
-        #endregion
-
-        #region Restore
-        [Test]
-        public async Task RestoreSetsDeletedFalse()
-        {
-            bool success;
-
-            using(_repository)
-            {
-                success = await _repository.Restore(_deletedEntity);
-            }
-
-            var restoredEntity = await _repository.Get((Guid)_deletedEntity.Id);
-            Assert.IsTrue(success);
-            Assert.IsFalse(restoredEntity.Deleted);
-            Assert.IsNull(restoredEntity.DeletedAt);
-        }
-
-        [Test]
-        public void RestoreThrowsExceptionWhenEntityNull()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _repository.Restore(null));
-        }
-
-        [Test]
-        public async Task RestoreOnIdSetsDeletedFalse()
+        public void DeleteThrowsExceptionIfArgumentNull()
         {
-            bool success;
-            Guid id = (Guid)_deletedEntity.Id;
-
-            using (_repository)
-            {
-                success = await _repository.Restore(id);
-            }
-
-            var restoredEntity = await _repository.Get(id);
-            Assert.IsTrue(success);
-            Assert.IsFalse(restoredEntity.Deleted);
-            Assert.IsNull(restoredEntity.DeletedAt);
+            Assert.ThrowsAsync<ArgumentNullException>(() => _repository.Delete(null));
         }
 
         [Test]
         [AutoData]
-        public async Task RestoreOnInvalidIdReturnsFalse(Guid randomId)
+        public async Task DeleteWithInvalidIdReturnsFalse(Guid randomId)
         {
             bool success;
 
-            using(_repository)
+            await using(_repository)
             {
-                success = await _repository.Restore(randomId);
+                success = await _repository.Delete(randomId);
             }
 
             Assert.IsFalse(success);
         }
 
         [Test]
-        public void RestoreOnEmptyGuidThrowsException()
+        public void DeleteWithEmptyGuidThrowsException()
         {
-            Assert.ThrowsAsync<ArgumentException>(() => _repository.Restore(Guid.Empty));
+            Assert.ThrowsAsync<ArgumentException>(() => _repository.Delete(Guid.Empty));
         }
         #endregion
     }