* Removing obsoleted code from ApiMediaQueryService.cs * Removing obsoleted code from ApiRichTextMarkupParserTests.cs * Removing obsoleted code from ContentCacheRefresher.cs * Removing obsoleted code from ContentFinderByUrlAlias.cs and adjusting its tests to use the new logic * Removing obsoleted code from ContentFinderByUrl.cs & its dependencies * Removing obsoleted code from ApiRichTextMarkupParserTests.cs * Removing obsoleted code from DocumentCache.cs & its dependencies * Removing obsoleted code from MediaCache.cs & its dependencies * Removing obsoleted code from PublishedCacheBase.cs & its dependencies * Removing obsoleted code from RenderNoContentController.cs and its tests * Removing obsoleted code from UmbracoRouteValueTransformer.cs * Removing obsoleted constructors from DefaultUrlProvider.cs * Removing accidental bookmark * Introducing a helper method to get the root keys in ApiMediaQueryService.cs * Removing obsoleted code from Cache classes * Removing unused imports * Refactoring to meet the CR * Added attribute to controller * Fixing missing using statement * Removing obsoleted constructor from ExternalLoginService.cs and making usages fit * Removing obsoleted method from IContentTypeFilter.cs * Removing obsoleted methods from IContentEditingService.cs * Removing obosoleted code from DocumentUrlService.cs * Removed obsoleted code from DataTypeService.cs * Removed obsoleted code from PublishStatusService.cs * Removing obsoleted code from the IContentPublishingService.cs and its dependencies. Also implementing a TODO in the service implementation * Removing obsoleted code from IRelationService.cs * Removing obsoleted code from ContentPublishingService.cs * Removing obsoleted code from ContentEditingService.cs * Removing obsoleted code from Constants-DataTypes.cs * Removing obsoleted code from IAction.cs and its implementations * Removing obsoleted code from IContentService.cs * Removing obsoleted code from DomainUtilities.cs * Removing obsoleted code from IIndexedEntitySearchService.cs and dependencies * Removing obsoleted code from UrlProvider.cs * Removing obsoleted code from AliasUrlProvider.cs * Removing obsoleted code from ApiContentRouteBuilder.cs * Removing obsoleted code from ApiPublishedContentCache.cs * Removing obsoleted class TemplateQueryResult.cs * Removing obsoleted code from ApiContentBuilder.cs * Removing obsoleted code from HealthCheck.cs * Removing obsoleted code from ContentTypeEditingService.cs * Removing obsoleted code from NewDefaultUrlProvider.cs * Removing obsoleted code from PublishedElementPropertyBase.cs * Removing obsoleted code from WebhookRequestService.cs * Bumping to obsolete in V18, due to usage in class that will be removed in V18 * Removing obsoleted code from PropertyValidationService.cs * Removing obsoleted code from AddUnroutableContentWarningsWhenPublishingNotificationHandler.cs * Removing obsoleted code from IMemberService.cs * Removing obsoleted code from DocumentCache.cs
150 lines
6.8 KiB
C#
150 lines
6.8 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.Models.ContentPublishing;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.Notifications;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Services.OperationStatus;
|
|
using Umbraco.Cms.Core.Sync;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
internal sealed class DocumentHybridCachePropertyTest : UmbracoIntegrationTest
|
|
{
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder)
|
|
{
|
|
builder.AddNotificationHandler<ContentTreeChangeNotification, ContentTreeChangeDistributedCacheNotificationHandler>();
|
|
builder.Services.AddUnique<IServerMessenger, ContentEventsTests.LocalServerMessenger>();
|
|
}
|
|
|
|
private ICacheManager CacheManager => GetRequiredService<ICacheManager>();
|
|
|
|
private ITemplateService TemplateService => GetRequiredService<ITemplateService>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentTypeEditingService ContentTypeEditingService => GetRequiredService<IContentTypeEditingService>();
|
|
|
|
private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
|
|
|
|
[Test]
|
|
public async Task Can_Get_Value_From_ContentPicker()
|
|
{
|
|
// Arrange
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
await TemplateService.CreateAsync(template, Constants.Security.SuperUserKey);
|
|
var textPage = await CreateTextPageDocument(template.Key);
|
|
var contentPickerDocument = await CreateContentPickerDocument(template.Key, textPage.Key);
|
|
|
|
// Act
|
|
var contentPickerPage = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
// Assert
|
|
IPublishedContent contentPickerValue = (IPublishedContent)contentPickerPage.Value("contentPicker");
|
|
Assert.AreEqual(textPage.Key, contentPickerValue.Key);
|
|
Assert.AreEqual(textPage.Id, contentPickerValue.Id);
|
|
Assert.AreEqual(textPage.Name, contentPickerValue.Name);
|
|
Assert.AreEqual("The title value", contentPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Value_From_Updated_ContentPicker()
|
|
{
|
|
// Arrange
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
await TemplateService.CreateAsync(template, Constants.Security.SuperUserKey);
|
|
var textPage = await CreateTextPageDocument(template.Key);
|
|
var contentPickerDocument = await CreateContentPickerDocument(template.Key, textPage.Key);
|
|
|
|
// Get for caching
|
|
var notUpdatedContent = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
IPublishedContent contentPickerValue = (IPublishedContent)notUpdatedContent.Value("contentPicker");
|
|
Assert.AreEqual("The title value", contentPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
|
|
// Update content
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
Variants = [new() { Name = "Root Create" }],
|
|
Properties =
|
|
[
|
|
new PropertyValueModel { Alias = "title", Value = "Updated title" },
|
|
new PropertyValueModel { Alias = "bodyText", Value = "The body text" }
|
|
],
|
|
};
|
|
|
|
var updateResult = await ContentEditingService.UpdateAsync(textPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(updateResult.Success);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
updateResult.Result.Content!.Key,
|
|
[new CulturePublishScheduleModel { Culture = "*" }],
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult);
|
|
|
|
// Act
|
|
var contentPickerPage = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
// Assert
|
|
IPublishedContent updatedPickerValue = (IPublishedContent)contentPickerPage.Value("contentPicker");
|
|
Assert.AreEqual(textPage.Key, updatedPickerValue.Key);
|
|
Assert.AreEqual(textPage.Id, updatedPickerValue.Id);
|
|
Assert.AreEqual(textPage.Name, updatedPickerValue.Name);
|
|
Assert.AreEqual("Updated title", updatedPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
}
|
|
|
|
private async Task<IContent> CreateContentPickerDocument(Guid templateKey, Guid textPageKey)
|
|
{
|
|
var pickerContentType = ContentTypeEditingBuilder.CreateContentTypeWithContentPicker(templateKey: templateKey);
|
|
await ContentTypeEditingService.CreateAsync(pickerContentType, Constants.Security.SuperUserKey);
|
|
|
|
var createOtherModel = ContentEditingBuilder.CreateContentWithOneInvariantProperty(pickerContentType.Key.Value,
|
|
"Test Create", "contentPicker", textPageKey);
|
|
var result = await ContentEditingService.CreateAsync(createOtherModel, Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(result.Success);
|
|
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
result.Result.Content!.Key,
|
|
[new CulturePublishScheduleModel { Culture = "*" }],
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult.Success);
|
|
return result.Result.Content;
|
|
}
|
|
|
|
private async Task<IContent> CreateTextPageDocument(Guid templateKey)
|
|
{
|
|
var textContentType = ContentTypeEditingBuilder.CreateTextPageContentType(defaultTemplateKey: templateKey);
|
|
await ContentTypeEditingService.CreateAsync(textContentType, Constants.Security.SuperUserKey);
|
|
|
|
var contentCreateModel = ContentEditingBuilder.CreateContentWithTwoInvariantProperties(
|
|
textContentType.Key.Value, "Root Create", "title", "The title value", "bodyText", "The body text",
|
|
Constants.System.RootKey);
|
|
|
|
var createResult = await ContentEditingService.CreateAsync(contentCreateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(createResult.Success);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
createResult.Result.Content!.Key,
|
|
[new CulturePublishScheduleModel { Culture = "*" }],
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult.Success);
|
|
return createResult.Result.Content;
|
|
}
|
|
}
|