Add concurrency check

Author: lixinyang123

CoreHome.Admin/Controllers/BlogController.cs

@@ -315,28 +315,36 @@ public IActionResult UploadPic()
             }
         }
 
-        private void RecyclingData()
+        private void RecyclingData(int times = 0)
         {
             //回收分类
-            List<Category> noArticleCategories = articleDbContext.Categories.Where(i => i.Articles.Count == 0).ToList();
+            List<Category> noArticleCategories = [.. articleDbContext.Categories.Where(i => i.Articles.Count == 0)];
             noArticleCategories.ForEach(i => articleDbContext.Categories.Remove(i));
 
             //回收标签
-            List<Tag> noArticleTag = articleDbContext.Tags.Where(i => i.ArticleTags.Count == 0).ToList();
+            List<Tag> noArticleTag = [.. articleDbContext.Tags.Where(i => i.ArticleTags.Count == 0)];
             noArticleTag.ForEach(i => articleDbContext.Tags.Remove(i));
 
             //回收归档月份
-            List<Month> months = articleDbContext.Months.Where(i => i.Articles.Count == 0).ToList();
+            List<Month> months = [.. articleDbContext.Months.Where(i => i.Articles.Count == 0)];
             months.ForEach(i => articleDbContext.Months.Remove(i));
 
-            _ = articleDbContext.SaveChanges();
-
             //回收归档年份
-            List<Year> years = articleDbContext.Years.Where(i => i.Months.Count == 0).ToList();
+            List<Year> years = [.. articleDbContext.Years.Where
+            (
+                i => i.Months.Count == 0 || (i.Months.Count == 1 && months.Contains(i.Months.First()))
+            )];
             years.ForEach(i => articleDbContext.Years.Remove(i));
 
-            _ = articleDbContext.SaveChanges();
+            try
+            {
+                _ = articleDbContext.SaveChanges();
+            }
+            catch (Exception)
+            {
+                if (times > 2) throw;
+                RecyclingData(++times);
+            }
         }
-
     }
 }

CoreHome.Data/DatabaseContext/ArticleDbContext.cs

@@ -3,20 +3,26 @@
 
 namespace CoreHome.Data.DatabaseContext
 {
-    public class ArticleDbContext : DbContext
+    public class ArticleDbContext(DbContextOptions options) : DbContext(options)
     {
-        public ArticleDbContext(DbContextOptions options) : base(options) { }
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             _ = modelBuilder.Entity<Year>()
                 .HasKey(i => i.Value);
 
+            _ = modelBuilder.Entity<Year>()
+                .Property(i => i.RowVersion)
+                .IsRowVersion();
+
             _ = modelBuilder.Entity<Month>()
                 .HasOne(i => i.Year)
                 .WithMany(i => i.Months)
                 .HasForeignKey(i => i.YearId);
 
+            _ = modelBuilder.Entity<Month>()
+                .Property(i => i.RowVersion)
+                .IsRowVersion();
+
             _ = modelBuilder.Entity<Article>()
                 .HasOne(i => i.Month)
                 .WithMany(i => i.Articles)
@@ -27,6 +33,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .WithMany(i => i.Articles)
                 .HasForeignKey(i => i.CategoryId);
 
+            _ = modelBuilder.Entity<Article>()
+                .Property(i => i.RowVersion)
+                .IsRowVersion();
+
             _ = modelBuilder.Entity<ArticleTag>()
                 .HasKey(i => new { i.ArticleId, i.TagId });
 
@@ -40,13 +50,27 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .WithMany(i => i.ArticleTags)
                 .HasForeignKey(i => i.TagId);
 
+            _ = modelBuilder.Entity<ArticleTag>()
+                .Property(i => i.RowVersion)
+                .IsRowVersion();
+
             _ = modelBuilder.Entity<Comment>()
                 .HasOne(i => i.Article)
                 .WithMany(i => i.Comments)
                 .HasForeignKey(i => i.ArticleId);
 
             _ = modelBuilder.Entity<Notification>()
                 .HasKey(i => i.Id);
+
+            //foreach (var entityType in modelBuilder.Model.GetEntityTypes())
+            //{
+            //    var timestampProperty = entityType.FindProperty("RowVersion");
+
+            //    if (timestampProperty != null)
+            //    {
+            //        modelBuilder.Entity(entityType.ClrType).Property("RowVersion").IsRowVersion();
+            //    }
+            //}
         }
 
         public DbSet<Article> Articles { get; set; }