From 74070ecc768c6cec5a3f3ce09613b5f6fd33eae0 Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 5 Jan 2021 15:23:27 +0300 Subject: [PATCH] CmsKit - Handle SofDelete manually as temporary solution --- .../CmsKitDbContextModelCreatingExtensions.cs | 2 ++ .../Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs index 3c937a3432..b61b35a363 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs @@ -105,6 +105,8 @@ namespace Volo.CmsKit.EntityFrameworkCore b.ConfigureByConvention(); + b.HasQueryFilter(x => !x.IsDeleted); // TODO: Find out why default filter doesn't work. + b.Property(x => x.EntityType).IsRequired().HasMaxLength(ContentConsts.MaxEntityTypeLength); b.Property(x => x.EntityId).IsRequired().HasMaxLength(ContentConsts.MaxEntityIdLength); b.Property(x => x.Value).IsRequired().HasMaxLength(ContentConsts.MaxValueLength); diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs index 442a86c0b9..cdc364b172 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs @@ -215,9 +215,20 @@ namespace Volo.CmsKit _cmsKitTestData.Content_2_EntityId, _cmsKitTestData.Content_2 ); + + var content3 = new Content( + Guid.NewGuid(), + "a", + "b", + "Content" + ) + { + IsDeleted = true, + }; await _contentRepository.InsertAsync(content1); await _contentRepository.InsertAsync(content2); + await _contentRepository.InsertAsync(content3); } private async Task SeedTagsAsync()