SoftDelete V1.1.0 (Bool and DateTime?)

fulviocanducci · Sep 30, 2020 · ddb905f · ddb905f
1 parent afc354a
commit ddb905f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 16 deletions.
diff --git a/Canducci.SoftDelete/Canducci.SoftDelete.csproj b/Canducci.SoftDelete/Canducci.SoftDelete.csproj
@@ -6,12 +6,14 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Canducci</Authors>
     <Company>Canducci</Company>
-    <Description>Version 1.0 SoftDelete</Description>
+    <Description>Version 1.1.0 SoftDelete (bool and DateTime?)</Description>
     <PackageIcon>remove.jpg</PackageIcon>
     <RepositoryUrl>https://github.com/fulviocanducci/Canducci.SoftDelete</RepositoryUrl>
     <RepositoryType>GIT</RepositoryType>
     <PackageTags>EntityFrameworkCore ORM NetCore Entity EntityFramework</PackageTags>
     <PackageProjectUrl>https://github.com/fulviocanducci/Canducci.SoftDelete</PackageProjectUrl>
+    <Version>1.1.0</Version>
+    <PackageReleaseNotes>Version 1.1.0 SoftDelete (bool and DateTime?)</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">

diff --git a/Canducci.SoftDelete/Extensions/AddInterceptorMethodsExtensions.cs b/Canducci.SoftDelete/Extensions/AddInterceptorMethodsExtensions.cs
@@ -5,15 +5,19 @@ namespace Canducci.SoftDelete.Extensions
 {
     public static class AddInterceptorMethodsExtensions
     {
-        public static DbContextOptionsBuilder AddInterceptorSoftDeleteDateTime(this DbContextOptionsBuilder optionsBuilder)
+        public static DbContextOptionsBuilder AddInterceptorSoftDeleteDateTime(
+            this DbContextOptionsBuilder optionsBuilder
+        )
         {
-            optionsBuilder.AddInterceptors(SoftDeleteDateTimeSaveChangesInterceptor.Create());
-            return optionsBuilder;
+            return optionsBuilder
+                .AddInterceptors(SoftDeleteDateTimeSaveChangesInterceptor.Create());            
         }
-        public static DbContextOptionsBuilder AddInterceptorSoftDeleteBool(this DbContextOptionsBuilder optionsBuilder)
+        public static DbContextOptionsBuilder AddInterceptorSoftDeleteBool(
+            this DbContextOptionsBuilder optionsBuilder
+        )
         {
-            optionsBuilder.AddInterceptors(SoftDeleteBoolSaveChangesInterceptor.Create());
-            return optionsBuilder;
+            return optionsBuilder
+                .AddInterceptors(SoftDeleteBoolSaveChangesInterceptor.Create());
         }
     }
 }
diff --git a/Canducci.SoftDelete/Extensions/HasQueryFilterExtensions.cs b/Canducci.SoftDelete/Extensions/HasQueryFilterExtensions.cs
@@ -4,15 +4,19 @@ namespace Canducci.SoftDelete.Extensions
 {
     public static class HasQueryFilterExtensions
     {
-        public static EntityTypeBuilder<T> HasQueryFilterSoftDeleteDateTime<T>(this EntityTypeBuilder<T> option)
-            where T : class
+        public static EntityTypeBuilder<T> HasQueryFilterSoftDeleteDateTime<T>(
+            this EntityTypeBuilder<T> option
+        ) where T : class
         {
-            return option.HasQueryFilter(x => ((ISoftDeleteDateTime)x).DeletedAt == null);
+            return option
+                .HasQueryFilter(x => ((ISoftDeleteDateTime)x).DeletedAt == null);
         }
-        public static EntityTypeBuilder<T> HasQueryFilterSoftDeleteBool<T>(this EntityTypeBuilder<T> option)
-            where T : class
+        public static EntityTypeBuilder<T> HasQueryFilterSoftDeleteBool<T>(
+            this EntityTypeBuilder<T> option
+        ) where T : class
         {
-            return option.HasQueryFilter(x => ((ISoftDeleteBool)x).DeletedAt == false);
+            return option
+                .HasQueryFilter(x => ((ISoftDeleteBool)x).DeletedAt == false);
         }
     }
 

diff --git a/README.md b/README.md
@@ -15,11 +15,23 @@ PM> Install-Package Canducci.SoftDelete
 
 Declare o namespace `using Canducci.SoftDelete;` and implementation `class`, example:
 
+#### - DateTime?
+
 ```csharp
 public class Animal: ISoftDeleteDateTime
 {
     ...
-    public DateTime? DeletedAt { get; }
+    public DateTime? DeletedAt { get; } = null;
+}
+```
+
+#### - Bool
+
+```csharp
+public class People: ISoftDeleteBool
+{
+    ...
+    public bool DeletedAt { get; } = false;
 }
 ```
 
@@ -35,7 +47,8 @@ public class DatabaseContext : DbContext
 		optionsBuilder.UseSqlite("Data Source = db.db", options =>
 		{
 		})
-		.AddInterceptorSoftDelete(); // <-- this 
+		.AddInterceptorSoftDeleteDateTime() // DateTime?
+		.AddInterceptorSoftDeleteBool(); // Boolean 
 	}
 	protected override void OnModelCreating(ModelBuilder modelBuilder)
 	{
@@ -51,7 +64,16 @@ public class DatabaseContext : DbContext
 				.HasMaxLength(100);
 			options.Property(x => x.DeletedAt)
 				.HasColumnName("deleted_at");
-			options.HasQueryFilter(x => x.DeletedAt == null); // <--this
+			options.HasQueryFilterSoftDeleteDateTime();	// DateTime?
+		});
+		modelBuilder.Entity<People>(options =>
+		{
+			options.ToTable("people");
+			options.HasKey(x => x.Id);
+			options.Property(x => x.Id).HasColumnName("id");
+			options.Property(x => x.Name).HasColumnName("name").IsRequired().HasMaxLength(100);
+			options.Property(x => x.DeletedAt).HasColumnName("deleted_at").HasDefaultValue(false);
+			options.HasQueryFilterSoftDeleteBool(); // Bool
 		});
 	}
 }