diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs index ed168d3b62..b047d53030 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs @@ -23,9 +23,9 @@ public class ByKeyUserGroupController : UserGroupControllerBase [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] - [ProducesResponseType(typeof(UserGroupPresentationModel), StatusCodes.Status200OK)] + [ProducesResponseType(typeof(UserGroupResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task> ByKey(Guid id) + public async Task> ByKey(Guid id) { IUserGroup? userGroup = await _userGroupService.GetAsync(id); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs index 073ace49ea..1e6a12f035 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs @@ -24,8 +24,8 @@ public class GetAllUserGroupController : UserGroupControllerBase [HttpGet] [MapToApiVersion("1.0")] - [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> GetAll(int skip = 0, int take = 100) + [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] + public async Task>> GetAll(int skip = 0, int take = 100) { // FIXME: In the old controller this endpoint had a switch "onlyCurrentUserGroup" // If this was enabled we'd only return the groups the current user was in @@ -35,6 +35,6 @@ public class GetAllUserGroupController : UserGroupControllerBase PagedModel userGroups = await _userGroupService.GetAllAsync(skip, take); var viewModels = (await _userPresentationFactory.CreateMultipleAsync(userGroups.Items)).ToList(); - return new PagedViewModel { Total = userGroups.Total, Items = viewModels }; + return new PagedViewModel { Total = userGroups.Total, Items = viewModels }; } } diff --git a/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs index 5632d233d3..e073a5a884 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/IUserGroupPresentationFactory.cs @@ -6,23 +6,23 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Factories; /// -/// A factory for creating +/// A factory for creating /// public interface IUserGroupPresentationFactory { /// - /// Creates a based on a + /// Creates a based on a /// /// /// - Task CreateAsync(IUserGroup userGroup); + Task CreateAsync(IUserGroup userGroup); /// - /// Creates multiple base on multiple + /// Creates multiple base on multiple /// /// /// - Task> CreateMultipleAsync(IEnumerable userGroups); + Task> CreateMultipleAsync(IEnumerable userGroups); /// /// Creates an based on a diff --git a/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs index 137a4a1fc6..d99100d0f8 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs @@ -28,7 +28,7 @@ public class UserGroupPresentationFactory : IUserGroupPresentationFactory } /// - public async Task CreateAsync(IUserGroup userGroup) + public async Task CreateAsync(IUserGroup userGroup) { Guid? contentStartNodeKey = GetKeyFromId(userGroup.StartContentId, UmbracoObjectTypes.Document); Guid? mediaStartNodeKey = GetKeyFromId(userGroup.StartMediaId, UmbracoObjectTypes.Media); @@ -40,7 +40,7 @@ public class UserGroupPresentationFactory : IUserGroupPresentationFactory throw new InvalidOperationException($"Unknown language ID in User Group: {userGroup.Name}"); } - return new UserGroupPresentationModel + return new UserGroupResponseModel { Name = userGroup.Name ?? string.Empty, Id = userGroup.Key, @@ -55,9 +55,9 @@ public class UserGroupPresentationFactory : IUserGroupPresentationFactory } /// - public async Task> CreateMultipleAsync(IEnumerable userGroups) + public async Task> CreateMultipleAsync(IEnumerable userGroups) { - var userGroupViewModels = new List(); + var userGroupViewModels = new List(); foreach (IUserGroup userGroup in userGroups) { userGroupViewModels.Add(await CreateAsync(userGroup)); diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupPresentationModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupResponseModel.cs similarity index 69% rename from src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupPresentationModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupResponseModel.cs index 178aca4021..0bd06876e0 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupPresentationModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroup/UserGroupResponseModel.cs @@ -1,6 +1,6 @@ namespace Umbraco.Cms.Api.Management.ViewModels.UserGroup; -public class UserGroupPresentationModel : UserGroupBase, INamedEntityPresentationModel +public class UserGroupResponseModel : UserGroupBase, INamedEntityPresentationModel { /// /// The key identifier for the user group.