yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align presentation model factory naming (#15663)

Browse Source
This commit is contained in:
Kenn Jacobsen
2024-02-01 11:22:16 +01:00
committed by GitHub
parent a562198520
commit 296b7e061a
19 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs
View File

@@ -18,16 +18,16 @@ public class ByKeyMediaController : MediaControllerBase
{
private readonly IAuthorizationService _authorizationService;
private readonly IMediaEditingService _mediaEditingService;
private readonly IMediaPresentationModelFactory _mediaPresentationModelFactory;
private readonly IMediaPresentationFactory _mediaPresentationFactory;
public ByKeyMediaController(
IAuthorizationService authorizationService,
IMediaEditingService mediaEditingService,
IMediaPresentationModelFactory mediaPresentationModelFactory)
IMediaPresentationFactory mediaPresentationFactory)
{
_authorizationService = authorizationService;
_mediaEditingService = mediaEditingService;
_mediaPresentationModelFactory = mediaPresentationModelFactory;
_mediaPresentationFactory = mediaPresentationFactory;
}
[HttpGet("{id:guid}")]
@@ -52,7 +52,7 @@ public class ByKeyMediaController : MediaControllerBase
return MediaNotFound();
}
MediaResponseModel model = await _mediaPresentationModelFactory.CreateResponseModelAsync(media);
MediaResponseModel model = await _mediaPresentationFactory.CreateResponseModelAsync(media);
return Ok(model);
}
}

8
src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs
View File

@@ -14,12 +14,12 @@ namespace Umbraco.Cms.Api.Management.Controllers.Media.Item;
public class ItemMediaItemController : MediaItemControllerBase
{
private readonly IEntityService _entityService;
private readonly IMediaPresentationModelFactory _mediaPresentationModelFactory;
private readonly IMediaPresentationFactory _mediaPresentationFactory;
public ItemMediaItemController(IEntityService entityService, IMediaPresentationModelFactory mediaPresentationModelFactory)
public ItemMediaItemController(IEntityService entityService, IMediaPresentationFactory mediaPresentationFactory)
{
_entityService = entityService;
_mediaPresentationModelFactory = mediaPresentationModelFactory;
_mediaPresentationFactory = mediaPresentationFactory;
}
[HttpGet("item")]
@@ -31,7 +31,7 @@ public class ItemMediaItemController : MediaItemControllerBase
.GetAll(UmbracoObjectTypes.Media, ids.ToArray())
.OfType<IMediaEntitySlim>();
IEnumerable<MediaItemResponseModel> responseModels = media.Select(_mediaPresentationModelFactory.CreateItemResponseModel);
IEnumerable<MediaItemResponseModel> responseModels = media.Select(_mediaPresentationFactory.CreateItemResponseModel);
return await Task.FromResult(Ok(responseModels));
}
}

4
src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs
View File

@@ -11,8 +11,8 @@ namespace Umbraco.Cms.Api.Management.Controllers.Media.RecycleBin;
[ApiVersion("1.0")]
public class ChildrenMediaRecycleBinController : MediaRecycleBinControllerBase
{
public ChildrenMediaRecycleBinController(IEntityService entityService, IMediaPresentationModelFactory mediaPresentationModelFactory)
: base(entityService, mediaPresentationModelFactory)
public ChildrenMediaRecycleBinController(IEntityService entityService, IMediaPresentationFactory mediaPresentationFactory)
: base(entityService, mediaPresentationFactory)
{
}

4
src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/EmptyMediaRecycleBinController.cs
View File

@@ -24,8 +24,8 @@ public class EmptyMediaRecycleBinController : MediaRecycleBinControllerBase
IAuthorizationService authorizationService,
IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
IMediaService mediaService,
IMediaPresentationModelFactory mediaPresentationModelFactory)
: base(entityService, mediaPresentationModelFactory)
IMediaPresentationFactory mediaPresentationFactory)
: base(entityService, mediaPresentationFactory)
{
_authorizationService = authorizationService;
_backOfficeSecurityAccessor = backOfficeSecurityAccessor;

10
src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/MediaRecycleBinControllerBase.cs
View File

@@ -22,11 +22,11 @@ namespace Umbraco.Cms.Api.Management.Controllers.Media.RecycleBin;
[Authorize(Policy = "New" + AuthorizationPolicies.SectionAccessMedia)]
public class MediaRecycleBinControllerBase : RecycleBinControllerBase<MediaRecycleBinItemResponseModel>
{
private readonly IMediaPresentationModelFactory _mediaPresentationModelFactory;
private readonly IMediaPresentationFactory _mediaPresentationFactory;
public MediaRecycleBinControllerBase(IEntityService entityService, IMediaPresentationModelFactory mediaPresentationModelFactory)
public MediaRecycleBinControllerBase(IEntityService entityService, IMediaPresentationFactory mediaPresentationFactory)
: base(entityService)
=> _mediaPresentationModelFactory = mediaPresentationModelFactory;
=> _mediaPresentationFactory = mediaPresentationFactory;
protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Media;
@@ -38,8 +38,8 @@ public class MediaRecycleBinControllerBase : RecycleBinControllerBase<MediaRecyc
if (entity is IMediaEntitySlim mediaEntitySlim)
{
responseModel.Variants = _mediaPresentationModelFactory.CreateVariantsItemResponseModels(mediaEntitySlim);
responseModel.MediaType = _mediaPresentationModelFactory.CreateMediaTypeReferenceResponseModel(mediaEntitySlim);
responseModel.Variants = _mediaPresentationFactory.CreateVariantsItemResponseModels(mediaEntitySlim);
responseModel.MediaType = _mediaPresentationFactory.CreateMediaTypeReferenceResponseModel(mediaEntitySlim);
}
return responseModel;

4
src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/RootMediaRecycleBinController.cs
View File

@@ -11,8 +11,8 @@ namespace Umbraco.Cms.Api.Management.Controllers.Media.RecycleBin;
[ApiVersion("1.0")]
public class RootMediaRecycleBinController : MediaRecycleBinControllerBase
{
public RootMediaRecycleBinController(IEntityService entityService, IMediaPresentationModelFactory mediaPresentationModelFactory)
: base(entityService, mediaPresentationModelFactory)
public RootMediaRecycleBinController(IEntityService entityService, IMediaPresentationFactory mediaPresentationFactory)
: base(entityService, mediaPresentationFactory)
{
}

4
src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs
View File

@@ -20,8 +20,8 @@ public class ChildrenMediaTreeController : MediaTreeControllerBase
IDataTypeService dataTypeService,
AppCaches appCaches,
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
IMediaPresentationModelFactory mediaPresentationModelFactory)
: base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor, mediaPresentationModelFactory)
IMediaPresentationFactory mediaPresentationFactory)
: base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor, mediaPresentationFactory)
{
}

10
src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/MediaTreeControllerBase.cs
View File

@@ -23,7 +23,7 @@ public class MediaTreeControllerBase : UserStartNodeTreeControllerBase<MediaTree
{
private readonly AppCaches _appCaches;
private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
private readonly IMediaPresentationModelFactory _mediaPresentationModelFactory;
private readonly IMediaPresentationFactory _mediaPresentationFactory;
public MediaTreeControllerBase(
IEntityService entityService,
@@ -31,12 +31,12 @@ public class MediaTreeControllerBase : UserStartNodeTreeControllerBase<MediaTree
IDataTypeService dataTypeService,
AppCaches appCaches,
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
IMediaPresentationModelFactory mediaPresentationModelFactory)
IMediaPresentationFactory mediaPresentationFactory)
: base(entityService, userStartNodeEntitiesService, dataTypeService)
{
_appCaches = appCaches;
_backofficeSecurityAccessor = backofficeSecurityAccessor;
_mediaPresentationModelFactory = mediaPresentationModelFactory;
_mediaPresentationFactory = mediaPresentationFactory;
}
protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Media;
@@ -52,8 +52,8 @@ public class MediaTreeControllerBase : UserStartNodeTreeControllerBase<MediaTree
responseModel.IsTrashed = entity.Trashed;
responseModel.Id = entity.Key;
responseModel.Variants = _mediaPresentationModelFactory.CreateVariantsItemResponseModels(mediaEntitySlim);
responseModel.MediaType = _mediaPresentationModelFactory.CreateMediaTypeReferenceResponseModel(mediaEntitySlim);
responseModel.Variants = _mediaPresentationFactory.CreateVariantsItemResponseModels(mediaEntitySlim);
responseModel.MediaType = _mediaPresentationFactory.CreateMediaTypeReferenceResponseModel(mediaEntitySlim);
}
return responseModel;

4
src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs
View File

@@ -20,8 +20,8 @@ public class RootMediaTreeController : MediaTreeControllerBase
IDataTypeService dataTypeService,
AppCaches appCaches,
IBackOfficeSecurityAccessor backofficeSecurityAccessor,
IMediaPresentationModelFactory mediaPresentationModelFactory)
: base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor, mediaPresentationModelFactory)
IMediaPresentationFactory mediaPresentationFactory)
: base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor, mediaPresentationFactory)
{
}

8
src/Umbraco.Cms.Api.Management/Controllers/PartialView/Item/ItemPartialViewItemController.cs
View File

@@ -10,10 +10,10 @@ namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Item;
[ApiVersion("1.0")]
public class ItemPartialViewItemController : PartialViewItemControllerBase
{
private readonly IFileItemPresentationModelFactory _fileItemPresentationModelFactory;
private readonly IFileItemPresentationFactory _fileItemPresentationFactory;
public ItemPartialViewItemController(IFileItemPresentationModelFactory fileItemPresentationModelFactory)
=> _fileItemPresentationModelFactory = fileItemPresentationModelFactory;
public ItemPartialViewItemController(IFileItemPresentationFactory fileItemPresentationFactory)
=> _fileItemPresentationFactory = fileItemPresentationFactory;
[HttpGet("item")]
[MapToApiVersion("1.0")]
@@ -21,7 +21,7 @@ public class ItemPartialViewItemController : PartialViewItemControllerBase
public async Task<IActionResult> Item([FromQuery(Name = "path")] HashSet<string> paths)
{
paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
IEnumerable<PartialViewItemResponseModel> responseModels = _fileItemPresentationModelFactory.CreatePartialViewItemResponseModels(paths);
IEnumerable<PartialViewItemResponseModel> responseModels = _fileItemPresentationFactory.CreatePartialViewItemResponseModels(paths);
return await Task.FromResult(Ok(responseModels));
}
}

8
src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs
View File

@@ -10,10 +10,10 @@ namespace Umbraco.Cms.Api.Management.Controllers.Script.Item;
[ApiVersion("1.0")]
public class ItemScriptItemController : ScriptItemControllerBase
{
private readonly IFileItemPresentationModelFactory _fileItemPresentationModelFactory;
private readonly IFileItemPresentationFactory _fileItemPresentationFactory;
public ItemScriptItemController(IFileItemPresentationModelFactory fileItemPresentationModelFactory)
=> _fileItemPresentationModelFactory = fileItemPresentationModelFactory;
public ItemScriptItemController(IFileItemPresentationFactory fileItemPresentationFactory)
=> _fileItemPresentationFactory = fileItemPresentationFactory;
[HttpGet("item")]
[MapToApiVersion("1.0")]
@@ -21,7 +21,7 @@ public class ItemScriptItemController : ScriptItemControllerBase
public async Task<IActionResult> Item([FromQuery(Name = "path")] HashSet<string> paths)
{
paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
IEnumerable<ScriptItemResponseModel> responseModels = _fileItemPresentationModelFactory.CreateScriptItemResponseModels(paths);
IEnumerable<ScriptItemResponseModel> responseModels = _fileItemPresentationFactory.CreateScriptItemResponseModels(paths);
return await Task.FromResult(Ok(responseModels));
}
}

8
src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs
View File

@@ -10,10 +10,10 @@ namespace Umbraco.Cms.Api.Management.Controllers.StaticFile.Item;
[ApiVersion("1.0")]
public class ItemStaticFileItemController : StaticFileItemControllerBase
{
private readonly IFileItemPresentationModelFactory _fileItemPresentationModelFactory;
private readonly IFileItemPresentationFactory _fileItemPresentationFactory;
public ItemStaticFileItemController(IFileItemPresentationModelFactory fileItemPresentationModelFactory)
=> _fileItemPresentationModelFactory = fileItemPresentationModelFactory;
public ItemStaticFileItemController(IFileItemPresentationFactory fileItemPresentationFactory)
=> _fileItemPresentationFactory = fileItemPresentationFactory;
[HttpGet("item")]
[MapToApiVersion("1.0")]
@@ -21,7 +21,7 @@ public class ItemStaticFileItemController : StaticFileItemControllerBase
public async Task<IActionResult> Item([FromQuery(Name = "path")] HashSet<string> paths)
{
paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
IEnumerable<StaticFileItemResponseModel> responseModels = _fileItemPresentationModelFactory.CreateStaticFileItemResponseModels(paths);
IEnumerable<StaticFileItemResponseModel> responseModels = _fileItemPresentationFactory.CreateStaticFileItemResponseModels(paths);
return await Task.FromResult(Ok(responseModels));
}
}

8
src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs
View File

@@ -10,10 +10,10 @@ namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Item;
[ApiVersion("1.0")]
public class ItemStylesheetItemController : StylesheetItemControllerBase
{
private readonly IFileItemPresentationModelFactory _fileItemPresentationModelFactory;
private readonly IFileItemPresentationFactory _fileItemPresentationFactory;
public ItemStylesheetItemController(IFileItemPresentationModelFactory fileItemPresentationModelFactory)
=> _fileItemPresentationModelFactory = fileItemPresentationModelFactory;
public ItemStylesheetItemController(IFileItemPresentationFactory fileItemPresentationFactory)
=> _fileItemPresentationFactory = fileItemPresentationFactory;
[HttpGet("item")]
[MapToApiVersion("1.0")]
@@ -21,7 +21,7 @@ public class ItemStylesheetItemController : StylesheetItemControllerBase
public async Task<IActionResult> Item([FromQuery(Name = "path")] HashSet<string> paths)
{
paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
IEnumerable<StylesheetItemResponseModel> responseModels = _fileItemPresentationModelFactory.CreateStylesheetItemResponseModels(paths);
IEnumerable<StylesheetItemResponseModel> responseModels = _fileItemPresentationFactory.CreateStylesheetItemResponseModels(paths);
return await Task.FromResult(Ok(responseModels));
}
}

2
src/Umbraco.Cms.Api.Management/DependencyInjection/EntityBuilderExtensions.cs
View File

@@ -12,7 +12,7 @@ internal static class EntityBuilderExtensions
{
builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>()
.Add<ItemTypeMapDefinition>();
builder.Services.AddUnique<IFileItemPresentationModelFactory, FileItemPresentationModelFactory>();
builder.Services.AddUnique<IFileItemPresentationFactory, FileItemPresentationFactory>();
return builder;
}

2
src/Umbraco.Cms.Api.Management/DependencyInjection/MediaBuilderExtensions.cs
View File

@@ -12,7 +12,7 @@ internal static class MediaBuilderExtensions
{
internal static IUmbracoBuilder AddMedia(this IUmbracoBuilder builder)
{
builder.Services.AddTransient<IMediaPresentationModelFactory, MediaPresentationModelFactory>();
builder.Services.AddTransient<IMediaPresentationFactory, MediaPresentationFactory>();
builder.Services.AddTransient<IMediaEditingPresentationFactory, MediaEditingPresentationFactory>();
builder.Services.AddTransient<IUrlAssembler, DefaultUrlAssembler>();
builder.Services.AddScoped<IAbsoluteUrlBuilder, DefaultAbsoluteUrlBuilder>();

4
src/Umbraco.Cms.Api.Management/Factories/FileItemPresentationModelFactory.cs → src/Umbraco.Cms.Api.Management/Factories/FileItemPresentationFactory.cs
View File

@@ -9,12 +9,12 @@ using Umbraco.Extensions;
namespace Umbraco.Cms.Api.Management.Factories;
public class FileItemPresentationModelFactory : IFileItemPresentationModelFactory
public class FileItemPresentationFactory : IFileItemPresentationFactory
{
private readonly FileSystems _fileSystems;
private readonly IPhysicalFileSystem _physicalFileSystem;
public FileItemPresentationModelFactory(FileSystems fileSystems, IPhysicalFileSystem physicalFileSystem)
public FileItemPresentationFactory(FileSystems fileSystems, IPhysicalFileSystem physicalFileSystem)
{
_fileSystems = fileSystems;
_physicalFileSystem = physicalFileSystem;

3
src/Umbraco.Cms.Api.Management/Factories/IFileItemPresentationModelFactory.cs → src/Umbraco.Cms.Api.Management/Factories/IFileItemPresentationFactory.cs
View File

@@ -2,11 +2,10 @@
using Umbraco.Cms.Api.Management.ViewModels.Script.Item;
using Umbraco.Cms.Api.Management.ViewModels.StaticFile.Item;
using Umbraco.Cms.Api.Management.ViewModels.Stylesheet.Item;
using Umbraco.Cms.Core.IO;
namespace Umbraco.Cms.Api.Management.Factories;
public interface IFileItemPresentationModelFactory
public interface IFileItemPresentationFactory
{
IEnumerable<PartialViewItemResponseModel> CreatePartialViewItemResponseModels(IEnumerable<string> path);

2
src/Umbraco.Cms.Api.Management/Factories/IMediaPresentationModelFactory.cs → src/Umbraco.Cms.Api.Management/Factories/IMediaPresentationFactory.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Cms.Core.Models.Entities;
namespace Umbraco.Cms.Api.Management.Factories;
public interface IMediaPresentationModelFactory
public interface IMediaPresentationFactory
{
Task<MediaResponseModel> CreateResponseModelAsync(IMedia media);

6
src/Umbraco.Cms.Api.Management/Factories/MediaPresentationModelFactory.cs → src/Umbraco.Cms.Api.Management/Factories/MediaPresentationFactory.cs
View File

@@ -14,8 +14,8 @@ using Umbraco.Extensions;
namespace Umbraco.Cms.Api.Management.Factories;
internal sealed class MediaPresentationModelFactory
: ContentPresentationFactoryBase<IMediaType, IMediaTypeService>, IMediaPresentationModelFactory
internal sealed class MediaPresentationFactory
: ContentPresentationFactoryBase<IMediaType, IMediaTypeService>, IMediaPresentationFactory
{
private readonly IUmbracoMapper _umbracoMapper;
private readonly ContentSettings _contentSettings;
@@ -23,7 +23,7 @@ internal sealed class MediaPresentationModelFactory
private readonly IAbsoluteUrlBuilder _absoluteUrlBuilder;
private readonly IMediaTypeService _mediaTypeService;
public MediaPresentationModelFactory(
public MediaPresentationFactory(
IUmbracoMapper umbracoMapper,
IOptions<ContentSettings> contentSettings,
MediaUrlGeneratorCollection mediaUrlGenerators,