diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs index be7d64bf97..119a578833 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs @@ -10,17 +10,17 @@ namespace Umbraco.Cms.Api.Management.Controllers.Document; public class ByKeyDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; - private readonly IDocumentViewModelFactory _documentViewModelFactory; + private readonly IDocumentPresentationModelFactory _documentPresentationModelFactory; - public ByKeyDocumentController(IContentEditingService contentEditingService, IDocumentViewModelFactory documentViewModelFactory) + public ByKeyDocumentController(IContentEditingService contentEditingService, IDocumentPresentationModelFactory documentPresentationModelFactory) { _contentEditingService = contentEditingService; - _documentViewModelFactory = documentViewModelFactory; + _documentPresentationModelFactory = documentPresentationModelFactory; } [HttpGet("{key:guid}")] [MapToApiVersion("1.0")] - [ProducesResponseType(typeof(DocumentViewModel), StatusCodes.Status200OK)] + [ProducesResponseType(typeof(DocumentResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] public async Task ByKey(Guid key) { @@ -30,7 +30,7 @@ public class ByKeyDocumentController : DocumentControllerBase return NotFound(); } - DocumentViewModel model = await _documentViewModelFactory.CreateViewModelAsync(content); + DocumentResponseModel model = await _documentPresentationModelFactory.CreateResponseModelAsync(content); return Ok(model); } } diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/DocumentBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/DocumentBuilderExtensions.cs index aa374a8692..e6563bb421 100644 --- a/src/Umbraco.Cms.Api.Management/DependencyInjection/DocumentBuilderExtensions.cs +++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/DocumentBuilderExtensions.cs @@ -10,7 +10,7 @@ internal static class DocumentBuilderExtensions { internal static IUmbracoBuilder AddDocuments(this IUmbracoBuilder builder) { - builder.Services.AddTransient(); + builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentViewModelFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationModelFactory.cs similarity index 60% rename from src/Umbraco.Cms.Api.Management/Factories/DocumentViewModelFactory.cs rename to src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationModelFactory.cs index 93f2e553a7..7d498dc188 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DocumentViewModelFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationModelFactory.cs @@ -5,13 +5,13 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Factories; -public class DocumentViewModelFactory : IDocumentViewModelFactory +public class DocumentPresentationModelFactory : IDocumentPresentationModelFactory { private readonly IUmbracoMapper _umbracoMapper; private readonly IContentUrlFactory _contentUrlFactory; private readonly IFileService _fileService; - public DocumentViewModelFactory( + public DocumentPresentationModelFactory( IUmbracoMapper umbracoMapper, IContentUrlFactory contentUrlFactory, IFileService fileService) @@ -21,16 +21,16 @@ public class DocumentViewModelFactory : IDocumentViewModelFactory _fileService = fileService; } - public async Task CreateViewModelAsync(IContent content) + public async Task CreateResponseModelAsync(IContent content) { - DocumentViewModel viewModel = _umbracoMapper.Map(content)!; + DocumentResponseModel responseModel = _umbracoMapper.Map(content)!; - viewModel.Urls = await _contentUrlFactory.GetUrlsAsync(content); + responseModel.Urls = await _contentUrlFactory.GetUrlsAsync(content); - viewModel.TemplateKey = content.TemplateId.HasValue + responseModel.TemplateKey = content.TemplateId.HasValue ? _fileService.GetTemplate(content.TemplateId.Value)?.Key : null; - return viewModel; + return responseModel; } } diff --git a/src/Umbraco.Cms.Api.Management/Factories/IDocumentViewModelFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IDocumentPresentationModelFactory.cs similarity index 52% rename from src/Umbraco.Cms.Api.Management/Factories/IDocumentViewModelFactory.cs rename to src/Umbraco.Cms.Api.Management/Factories/IDocumentPresentationModelFactory.cs index 46da5746b6..f82d2106e0 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/IDocumentViewModelFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/IDocumentPresentationModelFactory.cs @@ -3,7 +3,7 @@ using Umbraco.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Factories; -public interface IDocumentViewModelFactory +public interface IDocumentPresentationModelFactory { - Task CreateViewModelAsync(IContent content); + Task CreateResponseModelAsync(IContent content); } diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs index 69339218fe..55a58e0c02 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs @@ -8,7 +8,7 @@ namespace Umbraco.Cms.Api.Management.Mapping.Content; public abstract class ContentMapDefinition where TContent : IContentBase where TValueViewModel : ValueModelBase, new() - where TVariantViewModel : VariantViewModelBase, new() + where TVariantViewModel : VariantResponseModelBase, new() { private readonly PropertyEditorCollection _propertyEditorCollection; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs index f3df6f7797..a30ba6e76c 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs @@ -7,7 +7,7 @@ using Umbraco.Cms.Core.PropertyEditors; namespace Umbraco.Cms.Api.Management.Mapping.Document; -public class DocumentMapDefinition : ContentMapDefinition, IMapDefinition +public class DocumentMapDefinition : ContentMapDefinition, IMapDefinition { public DocumentMapDefinition(PropertyEditorCollection propertyEditorCollection) : base(propertyEditorCollection) @@ -15,10 +15,10 @@ public class DocumentMapDefinition : ContentMapDefinition mapper.Define((_, _) => new DocumentViewModel(), Map); + => mapper.Define((_, _) => new DocumentResponseModel(), Map); // Umbraco.Code.MapAll -Urls -TemplateKey - private void Map(IContent source, DocumentViewModel target, MapperContext context) + private void Map(IContent source, DocumentResponseModel target, MapperContext context) { target.Key = source.Key; target.ContentTypeKey = source.ContentType.Key; diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs new file mode 100644 index 0000000000..667e93e6c8 --- /dev/null +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs @@ -0,0 +1,11 @@ +namespace Umbraco.Cms.Api.Management.ViewModels.Content; + +public abstract class ContentResponseModelBase + : ContentModelBase + where TValueResponseModelBase : ValueModelBase + where TVariantResponseModel : VariantResponseModelBase +{ + public Guid Key { get; set; } + + public Guid ContentTypeKey { get; set; } +} diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentViewModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentViewModelBase.cs deleted file mode 100644 index 7a4c1cb987..0000000000 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentViewModelBase.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Umbraco.Cms.Api.Management.ViewModels.Content; - -public abstract class ContentViewModelBase - : ContentModelBase - where TValueViewModelBase : ValueModelBase - where TVariantViewModel : VariantViewModelBase -{ - public Guid Key { get; set; } - - public Guid ContentTypeKey { get; set; } -} diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Content/VariantViewModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Content/VariantResponseModelBase.cs similarity index 70% rename from src/Umbraco.Cms.Api.Management/ViewModels/Content/VariantViewModelBase.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/Content/VariantResponseModelBase.cs index 23ff92e4df..b2adb9ce10 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Content/VariantViewModelBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Content/VariantResponseModelBase.cs @@ -1,6 +1,6 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Content; -public abstract class VariantViewModelBase : VariantModelBase +public abstract class VariantResponseModelBase : VariantModelBase { public DateTime CreateDate { get; set; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentViewModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs similarity index 69% rename from src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentViewModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs index 361bc64af0..5431a57f92 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentViewModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs @@ -2,7 +2,7 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Document; -public class DocumentViewModel : ContentViewModelBase +public class DocumentResponseModel : ContentResponseModelBase { public IEnumerable Urls { get; set; } = Array.Empty(); diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantViewModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantResponseModel.cs similarity index 75% rename from src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantViewModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantResponseModel.cs index 501778f03c..adf0941681 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantViewModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentVariantResponseModel.cs @@ -2,7 +2,7 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Document; -public class DocumentVariantViewModel : VariantViewModelBase +public class DocumentVariantResponseModel : VariantResponseModelBase { public ContentState State { get; set; }