* 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 * Builder testing * Media test * Created builders * Updated method from getByKey to getById to maintain structure * Updated test setup * Moved tests * Cleaned up builders * Added helper * Added space * Updated tests * Cleaned setup * Added tests for MediaTypes * Uncommented tests * Added builder extensions * Added interfaces for builder methods * Updated to use interface pattern * Updated name * Used builder * Cleaned up test * Added media scope tests * Removed PropertyTypeModelBuilder * moved PropertyTypeModelBuilder to PropertyTypeEditingBuilder * Removed constructor * Removed duplicate * Fixed naming * Reverted * Removed space * Added todos * Removed only run on linux * Commet out DocumentHybridCacheTemplateTest again This is fixed in the release branch * Update media when media type is updated * Remove todo the tests pass now --------- Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Co-authored-by: Zeegaan <skrivdetud@gmail.com> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch> Co-authored-by: Bjarke Berg <mail@bergmania.dk>
156 lines
7.1 KiB
C#
156 lines
7.1 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.Models.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.TestHelpers;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
public abstract class UmbracoIntegrationTestWithMediaEditing : UmbracoIntegrationTest
|
|
{
|
|
protected IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
|
|
|
|
protected IMediaEditingService MediaEditingService => GetRequiredService<IMediaEditingService>();
|
|
|
|
protected IMediaTypeEditingService MediaTypeEditingService => GetRequiredService<IMediaTypeEditingService>();
|
|
|
|
protected MediaCreateModel RootFolder { get; private set; }
|
|
|
|
protected int RootFolderId { get; private set; }
|
|
|
|
protected MediaCreateModel RootImage { get; private set; }
|
|
|
|
protected int RootImageId { get; private set; }
|
|
|
|
protected MediaCreateModel SubFolder1 { get; private set; }
|
|
|
|
protected int SubFolder1Id { get; private set; }
|
|
|
|
protected MediaCreateModel SubFolder2 { get; private set; }
|
|
|
|
protected int SubFolder2Id { get; private set; }
|
|
|
|
protected MediaCreateModel SubImage { get; private set; }
|
|
|
|
protected int SubImageId { get; private set; }
|
|
|
|
protected MediaCreateModel SubTestMedia { get; private set; }
|
|
|
|
protected int SubTestMediaId { get; private set; }
|
|
|
|
protected MediaCreateModel SubSubImage { get; private set; }
|
|
|
|
protected int SubSubImageId { get; private set; }
|
|
|
|
protected MediaCreateModel SubSubFile { get; private set; }
|
|
|
|
protected int SubSubFileId { get; private set; }
|
|
|
|
protected MediaTypeCreateModel CustomMediaTypeCreateModel { get; private set; }
|
|
|
|
protected IMediaType CustomMediaType { get; private set; }
|
|
|
|
[SetUp]
|
|
public new void Setup() => CreateTestData();
|
|
|
|
protected async void CreateTestData()
|
|
{
|
|
CustomMediaTypeCreateModel = MediaTypeEditingBuilder.CreateMediaTypeWithOneProperty();
|
|
var mediaTypeTestAttempt = await MediaTypeEditingService.CreateAsync(CustomMediaTypeCreateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(mediaTypeTestAttempt.Success);
|
|
CustomMediaType = mediaTypeTestAttempt.Result;
|
|
|
|
// Gets all media types
|
|
var folderMediaTypes = await MediaTypeEditingService.GetFolderMediaTypes(0, 10);
|
|
var folderMediaType = folderMediaTypes.Items.FirstOrDefault(x => x.Alias == "Folder");
|
|
var mediaTypes = MediaTypeService.GetAll();
|
|
var mediaTypesList = mediaTypes.ToList();
|
|
var imageMediaType = mediaTypesList.FirstOrDefault(x => x.Alias == "Image");
|
|
|
|
// Add CustomMediaType to FolderMediaType AllowedContentTypes
|
|
var mediaTypeUpdateHelper = new MediaTypeUpdateHelper();
|
|
var updateModel = mediaTypeUpdateHelper.CreateMediaTypeUpdateModel(folderMediaType);
|
|
var folderMediaTypeAllowedContentTypes = updateModel.AllowedContentTypes.ToList();
|
|
folderMediaTypeAllowedContentTypes.Add(new ContentTypeSort(key: mediaTypeTestAttempt.Result.Key, sortOrder: folderMediaTypeAllowedContentTypes.Count, alias: CustomMediaTypeCreateModel.Alias));
|
|
updateModel.AllowedContentTypes = folderMediaTypeAllowedContentTypes;
|
|
var updatedFolderMediaTypeAttempt = MediaTypeEditingService.UpdateAsync(folderMediaType, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(updatedFolderMediaTypeAttempt.Result.Success);
|
|
|
|
// Create and Save RootFolder
|
|
RootFolder = MediaEditingBuilder.CreateSimpleMedia(folderMediaType.Key, "RootFolder", null);
|
|
var rootFolderAttempt = await MediaEditingService.CreateAsync(RootFolder, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(rootFolderAttempt.Success);
|
|
if (rootFolderAttempt.Result.Content != null)
|
|
{
|
|
RootFolderId = rootFolderAttempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save RootImage
|
|
RootImage = MediaEditingBuilder.CreateSimpleMedia(imageMediaType.Key, "RootImage", null);
|
|
var rootImageAttempt = await MediaEditingService.CreateAsync(RootImage, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(rootImageAttempt.Success);
|
|
if (rootImageAttempt.Result.Content != null)
|
|
{
|
|
RootImageId = rootImageAttempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save SubFolder1
|
|
SubFolder1 = MediaEditingBuilder.CreateSimpleMedia(folderMediaType.Key, "SubFolder1", RootFolder.Key);
|
|
var subFolder1Attempt = await MediaEditingService.CreateAsync(SubFolder1, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(subFolder1Attempt.Success);
|
|
if (subFolder1Attempt.Result.Content != null)
|
|
{
|
|
SubFolder1Id = subFolder1Attempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save SubFolder2
|
|
SubFolder2 = MediaEditingBuilder.CreateSimpleMedia(folderMediaType.Key, "SubFolder2", RootFolder.Key);
|
|
var subFolder2Attempt = await MediaEditingService.CreateAsync(SubFolder2, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(subFolder2Attempt.Success);
|
|
if (subFolder2Attempt.Result.Content != null)
|
|
{
|
|
SubFolder2Id = subFolder2Attempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save SubImage
|
|
SubImage = MediaEditingBuilder.CreateSimpleMedia(imageMediaType.Key, "SubImage", RootFolder.Key);
|
|
var subImageAttempt = await MediaEditingService.CreateAsync(SubImage, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(subImageAttempt.Success);
|
|
if (subImageAttempt.Result.Content != null)
|
|
{
|
|
SubImageId = subImageAttempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save SubTestMedia
|
|
SubTestMedia = MediaEditingBuilder.CreateMediaWithAProperty(mediaTypeTestAttempt.Result.Key, "SubTestMedia", RootFolder.Key, "testProperty", "This is a test");
|
|
var subTestMediaAttempt = await MediaEditingService.CreateAsync(SubTestMedia, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(subTestMediaAttempt.Success);
|
|
if (subTestMediaAttempt.Result.Content != null)
|
|
{
|
|
SubTestMediaId = subTestMediaAttempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save SubSubImage
|
|
SubSubImage = MediaEditingBuilder.CreateSimpleMedia(imageMediaType.Key, "SubSubImage", SubFolder1.Key);
|
|
var subSubImageAttempt = await MediaEditingService.CreateAsync(SubSubImage, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(subSubImageAttempt.Success);
|
|
if (subSubImageAttempt.Result.Content != null)
|
|
{
|
|
SubSubImageId = subSubImageAttempt.Result.Content.Id;
|
|
}
|
|
|
|
// Create and Save SubSubFile
|
|
SubSubFile = MediaEditingBuilder.CreateSimpleMedia(imageMediaType.Key, "SubSubFile", SubFolder1.Key);
|
|
var subSubFileAttempt = await MediaEditingService.CreateAsync(SubSubFile, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(subSubFileAttempt.Success);
|
|
if (subSubFileAttempt.Result.Content != null)
|
|
{
|
|
SubSubFileId = subSubFileAttempt.Result.Content.Id;
|
|
}
|
|
}
|
|
}
|