diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs index 20e3254e..25956f19 100644 --- a/Oqtane.Server/Repository/Context/DBContextBase.cs +++ b/Oqtane.Server/Repository/Context/DBContextBase.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Oqtane.Models; +using Oqtane.Shared; using System; using System.Linq; @@ -71,19 +72,19 @@ namespace Oqtane.Repository item.CurrentValues[nameof(IAuditable.ModifiedOn)] = date; } - if (item.Entity is ISoftDeletable softDeleted && item.State != EntityState.Added) + if (item.Entity is IDeletable deleted && item.State != EntityState.Added) { - if ((bool)item.CurrentValues[nameof(ISoftDeletable.IsSoftDeleted)] - && !item.GetDatabaseValues().GetValue(nameof(ISoftDeletable.IsSoftDeleted))) + if ((bool)item.CurrentValues[nameof(IDeletable.IsDeleted)] + && !item.GetDatabaseValues().GetValue(nameof(IDeletable.IsDeleted))) { - item.CurrentValues[nameof(ISoftDeletable.DeletedBy)] = username; - item.CurrentValues[nameof(ISoftDeletable.DeletedOn)] = date; + item.CurrentValues[nameof(IDeletable.DeletedBy)] = username; + item.CurrentValues[nameof(IDeletable.DeletedOn)] = date; } - else if (!(bool)item.CurrentValues[nameof(ISoftDeletable.IsSoftDeleted)] - && item.GetDatabaseValues().GetValue(nameof(ISoftDeletable.IsSoftDeleted))) + else if (!(bool)item.CurrentValues[nameof(IDeletable.IsDeleted)] + && item.GetDatabaseValues().GetValue(nameof(IDeletable.IsDeleted))) { - item.CurrentValues[nameof(ISoftDeletable.DeletedBy)] = null; - item.CurrentValues[nameof(ISoftDeletable.DeletedOn)] = null; + item.CurrentValues[nameof(IDeletable.DeletedBy)] = null; + item.CurrentValues[nameof(IDeletable.DeletedOn)] = null; } } } diff --git a/Oqtane.Shared/Models/ISoftDeletable.cs b/Oqtane.Shared/Shared/IDeletable.cs similarity index 53% rename from Oqtane.Shared/Models/ISoftDeletable.cs rename to Oqtane.Shared/Shared/IDeletable.cs index a0c1f370..6198dcde 100644 --- a/Oqtane.Shared/Models/ISoftDeletable.cs +++ b/Oqtane.Shared/Shared/IDeletable.cs @@ -1,11 +1,11 @@ using System; -namespace Oqtane.Models +namespace Oqtane.Shared { - public interface ISoftDeletable + public interface IDeletable { string DeletedBy { get; set; } DateTime? DeletedOn { get; set; } - bool IsSoftDeleted { get; set; } + bool IsDeleted { get; set; } } }