* Update to dotnet 9 and update nuget packages * Update umbraco code version * Update Directory.Build.props Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> * Include preview version in pipeline * update template projects * update global json with specific version * Update version.json to v15 * Rename TrimStart and TrimEnd to string specific * Rename to Exact * Update global.json Co-authored-by: Ronald Barendse <ronald@barend.se> * Remove includePreviewVersion * Rename to trim exact * Add new Hybridcache project * Add tests * Start implementing PublishedContent.cs * Implement repository for content * Refactor to use async everywhere * Add cache refresher * make public as needed for serialization * Use content type cache to get content type out * Refactor to use ContentCacheNode model, that goes in the memory cache * Remove content node kit as its not needed * Implement tests for ensuring caching * Implement better asserts * Implement published property * Refactor to use mapping * Rename to document tests * Update to test properties * Create more tests * Refactor mock tests into own file * Update property test * Fix published version of content * Change default cache level to elements * Refactor to always have draft * Refactor to not use PublishedModelFactory * Added tests * Added and updated tests * Fixed tests * Don't return empty object with id * More tests * Added key * Another key * Refactor CacheService to be responsible for using the hybrid cache * Use notification handler to remove deleted content from cache * Add more tests for missing functions * Implement missing methods * Remove HasContent as it pertains to routing * Fik up test * formatting * refactor variable names * Implement variant tests * Map all the published content properties * Get item out of cache first, to assert updated * Implement member cache * Add member test * Implement media cache * Implement property tests for media tests * Refactor tests to use extension method * Add more media tests * Refactor properties to no longer have element caching * Don't use property cache level * Start implementing seeding * Only seed when main * Add Immutable for performance * Implement permanent seeding of content * Implement cache settings * Implement tests for seeding * Update package version * start refactoring nurepo * Refactor so draft & published nodes are cached individually * Refactor RefreshContent to take node instead of IContent * Refactor media to also use cache nodes * Remove member from repo as it isn't cached * Refactor media to not include preview, as media has no draft * create new benchmark project * POC Integration benchmarks with custom api controllers * Start implementing content picker tests * Implement domain cache * Rework content cache to implement interface * Start implementing elements cache * Implement published snapshot service * Publish snapshot tests * Use snapshot for elements cache * Create test proving we don't clear cache when updating content picker * Clear entire elements cache * Remove properties from element cache, when content gets updated. * Rename methods to async * Refactor to use old cache interfaces instead of new ones * Remove snapshot, as it is no longer needed * Fix tests building * Refactor domaincache to not have snapshots * Delete benchmarks * Delete benchmarks * Add HybridCacheProject to Umbraco * Add comment to route value transformer * Implement is draft * remove snapshot from property * V15 updated the hybrid caching integration tests to use ContentEditingService (#16947) * Added builder extension withParentKey * Created builder with ContentEditingService * Added usage of the ContentEditingService to SETUP * Started using ContentEditingService builder in tests * Updated builder extensions * Fixed builder * Clean up * Clean up, not done * Added Ids * Remove entries from cache on delete * Fix up seeding logic * Don't register hybrid cache twice * Change seeded entry options * Update hybrid cache package * Fix up published property to work with delivery api again * Fix dependency injection to work with tests * Fix naming * Dont make caches nullable * Make content node sealed * Remove path and other unused from content node * Remove hacky 2 phase ctor * Refactor to actually set content templates * Remove umbraco context * Remove "HasBy" methods * rename property data * Delete obsolete legacy stuff * Add todo for making expiration configurable * Add todo in UmbracoContext * Add clarifying comment in content factory * Remove xml stuff from published property * Fix according to review * Make content type cache injectible * Make content type cache injectible * Rename to database cache repository * Rename to document cache * Add TODO * Refactor to async * Rename to async * Make everything async * Remove duplicate line from json schema * Move Hybrid cache project * Remove leftover file * Refactor to use keys * Refactor published content to no longer have content data, as it is on the node itself * Refactor to member to use proper content node ctor * Move tests to own folder * Add immutable objects to property and content data for performance * Make property data public * Fix member caching to be singleton * Obsolete GetContentType * Remove todo * Fix naming * Fix lots of exposed errors due to scope test * Add final scope tests * Rename to document cache service * Rename test files * Create new doc type tests * Add ignore to tests * Start implementing refresh for content type save * Clear contenttype cache when contenttype is updated * Fix test Teh contenttype is not upated unless the property is dirty * Updated tests * Added tests * Use init for ContentSourceDto * Startup of setup * Fix get by key in PublishedContentTypeCache * Remove ContentType from PublishedContentTypeCache when contenttype is deleted * Created interfaces for the builder with the necessary properties * Created builder for PropertyTypeContainer * Created builder for PropertyTypeEditing * Created builder for PropertyTypeValidationEditing * Made adjustments to the builder * Updated name of usage * Commented out to test * Cleaned up builders * Updated integration test setup * Moved tests * Added interface * Add IDocumentSeedKeyProvider and migrate existing logic to seed key provider * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Created helper to Convert a IContentType to ContentTypeUpdateModel * Added interfaces * Added builder * Cleaned up builders and added fixes * Added tests for PublishedContentTypeCache * Applied changes in builder * Add BreadthFirstKeyProvider * Use ISet for seedkey providers * Implement GetContentSource by key * Seed the cache with keys provided by seed key providers * Builder updates * Test setup updates * Updated tests * Dont require contenttype keys for seeding * Fix cache settings * Don't inject cache settings into SeedingNotificationHandler * Fix tests * Use enlistment for setting updated cache item * Pin seeded nodes for longer * Fix BreadthFirstKeyProvider * Fix ContentTypeSeedKeyProvider * Fix tests * Only seed published documents * Only cache published if contentCacheNode is not draft * Fix incorrect templateId * Removed unnecessary setup * initialized value * Fixed template test * Removed test * Updated tests * Removed code that was not used * Removed unused cacheSettings * Re-organize to support media cache seeding * Add MediaBreadthFirstKeyProvider * Seed media * Don't use IdKeyMap when removing content from cache * Don't clear IdKeyMap in DocumentCacheService * Add unit tests * Don't use IdKeyMap when deleting media * Add default value to timespan * Use cancellation tokens when doing loop * Fixed Models Builder error --------- Co-authored-by: Zeegaan <skrivdetud@gmail.com> Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> Co-authored-by: Andreas Zerbst <andr317c@live.dk> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Co-authored-by: Bjarke Berg <mail@bergmania.dk>
183 lines
7.3 KiB
C#
183 lines
7.3 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Web;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
[Platform("Linux", Reason = "This uses too much memory when running both caches, should be removed when nuchache is removed")]
|
|
public class DocumentHybridCacheVariantsTests : UmbracoIntegrationTest
|
|
{
|
|
private string _englishIsoCode = "en-US";
|
|
private string _danishIsoCode = "da-DK";
|
|
private string _variantTitleAlias = "variantTitle";
|
|
private string _variantTitleName = "Variant Title";
|
|
private string _invariantTitleAlias = "invariantTitle";
|
|
private string _invariantTitleName = "Invariant Title";
|
|
|
|
private ILanguageService LanguageService => GetRequiredService<ILanguageService>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentTypeEditingService ContentTypeEditingService => GetRequiredService<IContentTypeEditingService>();
|
|
|
|
private IUmbracoContextFactory UmbracoContextFactory => GetRequiredService<IUmbracoContextFactory>();
|
|
|
|
private IPublishedContentCache PublishedContentHybridCache => GetRequiredService<IPublishedContentCache>();
|
|
|
|
private IContent VariantPage { get; set; }
|
|
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddUmbracoHybridCache();
|
|
|
|
[SetUp]
|
|
public async Task Setup() => await CreateTestData();
|
|
|
|
[Test]
|
|
public async Task Can_Set_Invariant_Title()
|
|
{
|
|
// Arrange
|
|
await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
var updatedInvariantTitle = "Updated Invariant Title";
|
|
var updatedVariantTitle = "Updated Variant Title";
|
|
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantProperties =
|
|
new[] { new PropertyValueModel { Alias = _invariantTitleAlias, Value = updatedInvariantTitle } },
|
|
Variants = new[]
|
|
{
|
|
new VariantModel
|
|
{
|
|
Culture = _englishIsoCode,
|
|
Name = "Updated English Name",
|
|
Properties =
|
|
new[]
|
|
{
|
|
new PropertyValueModel
|
|
{
|
|
Alias = _variantTitleAlias, Value = updatedVariantTitle
|
|
}
|
|
},
|
|
},
|
|
new VariantModel
|
|
{
|
|
Culture = _danishIsoCode,
|
|
Name = "Updated Danish Name",
|
|
Properties = new[]
|
|
{
|
|
new PropertyValueModel
|
|
{
|
|
Alias = _variantTitleAlias, Value = updatedVariantTitle
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var result = await ContentEditingService.UpdateAsync(VariantPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
|
|
// Assert
|
|
using var contextReference = UmbracoContextFactory.EnsureUmbracoContext();
|
|
Assert.AreEqual(updatedInvariantTitle, textPage.Value(_invariantTitleAlias, "", ""));
|
|
Assert.AreEqual(updatedVariantTitle, textPage.Value(_variantTitleAlias, _englishIsoCode));
|
|
Assert.AreEqual(updatedVariantTitle, textPage.Value(_variantTitleAlias, _danishIsoCode));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Set_Invariant_Title_On_One_Culture()
|
|
{
|
|
// Arrange
|
|
await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
var updatedInvariantTitle = "Updated Invariant Title";
|
|
var updatedVariantTitle = "Updated Invariant Title";
|
|
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantProperties =
|
|
new[] { new PropertyValueModel { Alias = _invariantTitleAlias, Value = updatedInvariantTitle } },
|
|
Variants = new[]
|
|
{
|
|
new VariantModel
|
|
{
|
|
Culture = _englishIsoCode,
|
|
Name = "Updated English Name",
|
|
Properties = new[]
|
|
{
|
|
new PropertyValueModel
|
|
{
|
|
Alias = _variantTitleAlias, Value = updatedVariantTitle
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
var result =
|
|
await ContentEditingService.UpdateAsync(VariantPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
|
|
// Act
|
|
var textPage = await PublishedContentHybridCache.GetByIdAsync(VariantPage.Id, true);
|
|
|
|
// Assert
|
|
using var contextReference = UmbracoContextFactory.EnsureUmbracoContext();
|
|
Assert.AreEqual(updatedInvariantTitle, textPage.Value(_invariantTitleAlias, "", ""));
|
|
Assert.AreEqual(updatedVariantTitle, textPage.Value(_variantTitleAlias, _englishIsoCode));
|
|
Assert.AreEqual(_variantTitleName, textPage.Value(_variantTitleAlias, _danishIsoCode));
|
|
}
|
|
|
|
private async Task CreateTestData()
|
|
{
|
|
var language = new LanguageBuilder()
|
|
.WithCultureInfo(_danishIsoCode)
|
|
.Build();
|
|
await LanguageService.CreateAsync(language, Constants.Security.SuperUserKey);
|
|
|
|
var groupKey = Guid.NewGuid();
|
|
var contentType = new ContentTypeEditingBuilder()
|
|
.WithAlias("cultureVariationTest")
|
|
.WithName("Culture Variation Test")
|
|
.WithAllowAtRoot(true)
|
|
.WithVariesByCulture(true)
|
|
.AddPropertyType()
|
|
.WithAlias(_variantTitleAlias)
|
|
.WithName(_variantTitleName)
|
|
.WithVariesByCulture(true)
|
|
.WithContainerKey(groupKey)
|
|
.Done()
|
|
.AddPropertyType()
|
|
.WithAlias(_invariantTitleAlias)
|
|
.WithName(_invariantTitleName)
|
|
.WithContainerKey(groupKey)
|
|
.Done()
|
|
.AddPropertyGroup()
|
|
.WithName("content")
|
|
.WithKey(groupKey)
|
|
.Done()
|
|
.Build();
|
|
var contentTypeAttempt = await ContentTypeEditingService.CreateAsync(contentType, Constants.Security.SuperUserKey);
|
|
if (!contentTypeAttempt.Success)
|
|
{
|
|
throw new Exception("Failed to create content type");
|
|
}
|
|
|
|
var rootContentCreateModel = ContentEditingBuilder.CreateContentWithTwoVariantProperties(contentTypeAttempt.Result.Key, "en-US", "da-DK", _variantTitleAlias, _variantTitleName);
|
|
var result = await ContentEditingService.CreateAsync(rootContentCreateModel, Constants.Security.SuperUserKey);
|
|
VariantPage = result.Result.Content;
|
|
}
|
|
}
|