Merge pull request #13 from PandaTechAM/development

Sync audit base ignores now version check

Author: HaikAsatryan

src/EFCore.AuditBase/AuditEntityBase.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EFCore.AuditBase;
 
@@ -14,6 +15,9 @@ public abstract class AuditEntityBase
    [ConcurrencyCheck]
    public int Version { get; private set; } = 1;
 
+   [NotMapped]
+   internal bool IgnoreInterceptor { get; set; }
+
    public void MarkAsUpdated(long? userId, DateTime? updatedAt = null)
    {
       UpdatedAt = updatedAt ?? DateTime.UtcNow;
@@ -28,8 +32,10 @@ public void MarkAsDeleted(long? userId, DateTime? updatedAt = null)
       UpdatedByUserId = userId;
       Version++;
    }
+
    public void SyncAuditBase(AuditEntityBase source)
    {
+      IgnoreInterceptor = true;
       UpdatedAt = source.UpdatedAt;
       UpdatedByUserId = source.UpdatedByUserId;
       Deleted = source.Deleted;

src/EFCore.AuditBase/EFCore.AuditBase.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>3.0.3</Version>
+        <Version>3.0.4</Version>
         <PackageId>Pandatech.EFCore.AuditBase</PackageId>
         <Title>Pandatech EFCore AuditBase</Title>
         <PackageTags>Pandatech, library, audit, optimistic lock, tracking, efcore, soft delete, versioning</PackageTags>
         <Description>Pandatech.EFCore.AuditBase provides a robust auditing solution for EF Core applications, ensuring traceability and integrity of entity modifications. It seamlessly integrates auditing capabilities into your EF Core entities, enforcing best practices for entity state changes, deletion handling, and versioning to support concurrency control. Ideal for applications requiring a reliable audit trail and compliance with data handling standards.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-efcore-audit-base</RepositoryUrl>
-        <PackageReleaseNotes>Nuget updates</PackageReleaseNotes>
+        <PackageReleaseNotes>Sync audit base ignores now version check</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

src/EFCore.AuditBase/Interceptors/AuditPropertyValidationInterceptor.cs

@@ -32,7 +32,16 @@ private static void ValidateAuditMethodUsage(DbContext context)
    {
       var entries = context.ChangeTracker
                            .Entries<AuditEntityBase>()
-                           .Where(e => e.State == EntityState.Modified);
+                           .Where(e => e.State == EntityState.Modified)
+                           .ToList();
+
+      var ignoreInterceptor =
+         entries.Any(x => x.CurrentValues[nameof(AuditEntityBase.IgnoreInterceptor)] as bool? ?? false);
+
+      if (ignoreInterceptor)
+      {
+         return;
+      }
 
       foreach (var entry in entries)
       {

test/EFCore.AuditBase.Demo/EFCore.AuditBase.Demo.csproj

@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
     </ItemGroup>
 
     <ItemGroup>