From 6313b8b3a19e4726246ada60127e49a887666b60 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 4 Apr 2023 13:20:29 +0200 Subject: [PATCH] Changed "Key" to "Id" in management API (#14045) --- .../AuditLog/ByKeyAuditLogController.cs | 6 +- .../DataType/CopyDataTypeController.cs | 2 +- .../Folder/DataTypeFolderControllerBase.cs | 16 +- .../DataType/MoveDataTypeController.cs | 2 +- .../Tree/ChildrenDataTypeTreeController.cs | 4 +- .../Tree/DataTypeTreeControllerBase.cs | 4 +- .../Tree/ItemsDataTypeTreeController.cs | 4 +- .../Dictionary/ByKeyDictionaryController.cs | 6 +- .../Dictionary/DeleteDictionaryController.cs | 6 +- .../Dictionary/ExportDictionaryController.cs | 6 +- .../Dictionary/ImportDictionaryController.cs | 6 +- .../Dictionary/MoveDictionaryController.cs | 8 +- .../Tree/ChildrenDictionaryTreeController.cs | 4 +- .../Tree/DictionaryTreeControllerBase.cs | 2 +- .../Tree/ItemsDictionaryTreeController.cs | 4 +- .../Dictionary/UpdateDictionaryController.cs | 6 +- .../Document/ByKeyDocumentController.cs | 6 +- .../Controllers/Document/DomainsController.cs | 6 +- .../MoveToRecycleBinDocumentController.cs | 6 +- .../Document/NotificationsController.cs | 6 +- .../ChildrenDocumentRecycleBinController.cs | 4 +- .../DocumentRecycleBinControllerBase.cs | 4 +- .../Tree/ChildrenDocumentTreeController.cs | 6 +- .../Tree/DocumentTreeControllerBase.cs | 4 +- .../Tree/ItemsDocumentTreeController.cs | 6 +- .../Tree/RootDocumentTreeController.cs | 4 +- .../Document/UpdateDocumentController.cs | 6 +- .../Document/UpdateDomainsController.cs | 6 +- .../Document/UpdateNotificationsController.cs | 6 +- .../DocumentBlueprintTreeControllerBase.cs | 6 +- .../ItemsDocumentBlueprintTreeController.cs | 4 +- .../ByKeyDocumentTypeController.cs | 6 +- .../ChildrenDocumentTypeTreeController.cs | 4 +- .../Tree/ItemsDocumentTypeTreeController.cs | 4 +- .../FolderManagementControllerBase.cs | 2 +- .../ExecuteActionHealthCheckController.cs | 4 +- .../Indexer/DetailsIndexerController.cs | 2 +- .../Controllers/Media/ByKeyMediaController.cs | 6 +- .../Media/MoveToRecycleBinMediaController.cs | 6 +- .../ChildrenMediaRecycleBinController.cs | 4 +- .../Media/Tree/ChildrenMediaTreeController.cs | 6 +- .../Media/Tree/ItemsMediaTreeController.cs | 6 +- .../Media/Tree/RootMediaTreeController.cs | 4 +- .../Media/UpdateMediaController.cs | 6 +- .../MediaType/ByKeyMediaTypeController.cs | 6 +- .../Tree/ChildrenMediaTypeTreeController.cs | 4 +- .../Tree/ItemsMediaTypeTreeController.cs | 4 +- .../Tree/ItemsMemberGroupTreeController.cs | 4 +- .../Tree/ItemsMemberTypeTreeController.cs | 4 +- .../Created/ByKeyCreatedPackageController.cs | 10 +- .../Created/DeleteCreatedPackageController.cs | 10 +- .../DownloadCreatedPackageController.cs | 8 +- .../Created/UpdateCreatedPackageController.cs | 8 +- .../RecycleBin/RecycleBinControllerBase.cs | 2 +- .../ByKeyRedirectUrlManagementController.cs | 6 +- ...eteByKeyRedirectUrlManagementController.cs | 6 +- .../ByRelationTypeKeyRelationController.cs | 6 +- .../Query/ByKeyRelationTypeController.cs | 6 +- .../Query/DeleteRelationTypeController.cs | 6 +- .../Query/UpdateRelationTypeController.cs | 8 +- .../Tree/ItemsRelationTypeTreeController.cs | 4 +- .../Tree/RelationTypeTreeControllerBase.cs | 2 +- .../Security/BackOfficeController.cs | 2 +- .../Template/ByKeyTemplateController.cs | 6 +- .../Template/DeleteTemplateController.cs | 6 +- .../Query/ExecuteTemplateQueryController.cs | 6 +- .../Tree/ChildrenTemplateTreeController.cs | 4 +- .../Tree/ItemsTemplateTreeController.cs | 4 +- .../Template/UpdateTemplateController.cs | 6 +- .../ByKeyTemporaryFileController.cs | 6 +- .../CreateTemporaryFileController.cs | 2 +- .../DeleteTemporaryFileController.cs | 6 +- .../ByIdTrackedReferenceController.cs | 6 +- .../DescendantsTrackedReferenceController.cs | 6 +- .../ItemsTrackedReferenceController.cs | 4 +- .../Tree/EntityTreeControllerBase.cs | 18 +- .../UserGroups/ByKeyUserGroupController.cs | 6 +- .../UserGroups/DeleteUserGroupController.cs | 6 +- .../UserGroups/UpdateUserGroupController.cs | 6 +- .../Users/SetAvatarUsersController.cs | 2 +- .../Factories/AuditLogPresentationFactory.cs | 8 +- .../DataTypeReferencePresentationFactory.cs | 2 +- .../DictionaryPresentationFactory.cs | 2 +- .../DocumentEditingPresentationFactory.cs | 8 +- .../Factories/DocumentPresentationFactory.cs | 2 +- .../HealthCheckGroupPresentationFactory.cs | 2 +- .../MediaEditingPresentationFactory.cs | 4 +- .../RedirectUrlPresentationFactory.cs | 4 +- .../RelationTypePresentationFactory.cs | 2 +- .../Factories/UserGroupPresentationFactory.cs | 12 +- .../Factories/UserPresentationFactory.cs | 6 +- .../ContentType/ContentTypeMapDefinition.cs | 14 +- .../DataTypeViewModelMapDefinition.cs | 2 +- .../Dictionary/DictionaryMapDefinition.cs | 6 +- .../Mapping/Document/DocumentMapDefinition.cs | 6 +- .../DocumentType/DocumentTypeMapDefinition.cs | 6 +- .../HealthCheckViewModelsMapDefinition.cs | 6 +- .../Mapping/Media/MediaMapDefinition.cs | 4 +- .../MediaType/MediaTypeMapDefinition.cs | 2 +- .../Package/PackageViewModelMapDefinition.cs | 6 +- .../RelationTypeViewModelsMapDefinition.cs | 2 +- ...poraryFileUploadViewModelsMapDefinition.cs | 4 +- ...TrackedReferenceViewModelsMapDefinition.cs | 2 +- src/Umbraco.Cms.Api.Management/OpenApi.json | 354 +++++++++--------- .../ViewModels/AuditLogs/AuditLogBaseModel.cs | 4 +- .../Content/ContentResponseModelBase.cs | 4 +- .../Content/CreateContentRequestModelBase.cs | 2 +- .../ContentType/ContentTypeComposition.cs | 2 +- .../ContentTypeResponseModelBase.cs | 2 +- .../ViewModels/ContentType/ContentTypeSort.cs | 2 +- .../PropertyTypeContainerResponseModelBase.cs | 4 +- .../PropertyTypeResponseModelBase.cs | 6 +- .../DataType/CopyDataTypeRequestModel.cs | 2 +- .../DataTypeReferenceResponseModel.cs | 2 +- .../DataType/DataTypeResponseModel.cs | 2 +- .../DataType/MoveDataTypeRequestModel.cs | 2 +- .../CreateDictionaryItemRequestModel.cs | 2 +- .../DictionaryOverviewResponseModel.cs | 4 +- .../ImportDictionaryItemsPresentationModel.cs | 4 +- .../ImportDictionaryRequestModel.cs | 4 +- .../Dictionary/MoveDictionaryRequestModel.cs | 2 +- .../Document/CreateDocumentRequestModel.cs | 4 +- .../Document/DocumentResponseModel.cs | 2 +- .../Document/UpdateDocumentRequestModel.cs | 2 +- .../DocumentType/DocumentTypeResponseModel.cs | 4 +- .../HealthCheckActionRequestModel.cs | 2 +- .../HealthCheck/HealthCheckModelBase.cs | 2 +- .../Media/CreateMediaRequestModel.cs | 2 +- .../Package/PackageDefinitionResponseModel.cs | 2 +- .../ViewModels/Package/PackageModelBase.cs | 2 +- .../RecycleBin/RecycleBinItemResponseModel.cs | 2 +- .../RedirectUrlResponseModel.cs | 4 +- .../CreateRelationTypeRequestModel.cs | 2 +- .../RelationType/RelationTypeResponseModel.cs | 2 +- .../Query/TemplateQueryExecuteModel.cs | 2 +- .../CreateTemporaryFileRequestModel.cs | 2 +- .../TemporaryFileResponseModel.cs | 2 +- .../RelationItemResponseModel.cs | 2 +- .../DocumentBlueprintTreeItemResponseModel.cs | 2 +- .../Tree/EntityTreeItemResponseModel.cs | 2 +- .../ViewModels/UserGroups/UserGroupBase.cs | 6 +- .../Users/CreateUserResponseModel.cs | 2 +- .../ViewModels/Users/SetAvatarRequestModel.cs | 2 +- .../ViewModels/Users/UserResponseModel.cs | 4 +- 144 files changed, 503 insertions(+), 503 deletions(-) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs index a6e0aeb8de..e7a1704f3c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs @@ -21,12 +21,12 @@ public class ByKeyAuditLogController : AuditLogControllerBase _auditLogPresentationFactory = auditLogPresentationFactory; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task ByKey(Guid key, Direction orderDirection = Direction.Descending, DateTime? sinceDate = null, int skip = 0, int take = 100) + public async Task ByKey(Guid id, Direction orderDirection = Direction.Descending, DateTime? sinceDate = null, int skip = 0, int take = 100) { - PagedModel result = await _auditService.GetItemsByKeyAsync(key, skip, take, orderDirection, sinceDate); + PagedModel result = await _auditService.GetItemsByKeyAsync(id, skip, take, orderDirection, sinceDate); IEnumerable mapped = _auditLogPresentationFactory.CreateAuditLogViewModel(result.Items); var viewModel = new PagedViewModel { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs index 7a580185a6..fd0954a04d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs @@ -32,7 +32,7 @@ public class CopyDataTypeController : DataTypeControllerBase return NotFound(); } - Attempt result = await _dataTypeService.CopyAsync(source, copyDataTypeRequestModel.TargetKey, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _dataTypeService.CopyAsync(source, copyDataTypeRequestModel.TargetId, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? CreatedAtAction(controller => nameof(controller.ByKey), result.Result.Key) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs index 4f60783fdf..297869a133 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs @@ -24,20 +24,20 @@ public abstract class DataTypeFolderControllerBase : FolderManagementControllerB protected override Guid ContainerObjectType => Constants.ObjectTypes.DataType; - protected override async Task GetContainerAsync(Guid key) - => await _dataTypeContainerService.GetAsync(key); + protected override async Task GetContainerAsync(Guid id) + => await _dataTypeContainerService.GetAsync(id); protected override async Task GetParentContainerAsync(EntityContainer container) => await _dataTypeContainerService.GetParentAsync(container); - protected override async Task> CreateContainerAsync(EntityContainer container, Guid? parentId, Guid userKey) - => await _dataTypeContainerService.CreateAsync(container, parentId, userKey); + protected override async Task> CreateContainerAsync(EntityContainer container, Guid? parentId, Guid userId) + => await _dataTypeContainerService.CreateAsync(container, parentId, userId); - protected override async Task> UpdateContainerAsync(EntityContainer container, Guid userKey) - => await _dataTypeContainerService.UpdateAsync(container, userKey); + protected override async Task> UpdateContainerAsync(EntityContainer container, Guid userId) + => await _dataTypeContainerService.UpdateAsync(container, userId); - protected override async Task> DeleteContainerAsync(Guid id, Guid userKey) - => await _dataTypeContainerService.DeleteAsync(id, userKey); + protected override async Task> DeleteContainerAsync(Guid id, Guid userId) + => await _dataTypeContainerService.DeleteAsync(id, userId); protected override IActionResult OperationStatusResult(DataTypeContainerOperationStatus status) => status switch diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs index 66d51d9868..552eadd4cf 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs @@ -32,7 +32,7 @@ public class MoveDataTypeController : DataTypeControllerBase return NotFound(); } - Attempt result = await _dataTypeService.MoveAsync(source, moveDataTypeRequestModel.TargetKey, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _dataTypeService.MoveAsync(source, moveDataTypeRequestModel.TargetId, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? Ok() diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs index 9631c88deb..3695e38e5a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs @@ -16,9 +16,9 @@ public class ChildrenDataTypeTreeController : DataTypeTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100, bool foldersOnly = false) + public async Task>> Children(Guid parentId, int skip = 0, int take = 100, bool foldersOnly = false) { RenderFoldersOnly(foldersOnly); - return await GetChildren(parentKey, skip, take); + return await GetChildren(parentId, skip, take); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs index 389c58901e..ce91cff57b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs @@ -25,7 +25,7 @@ public class DataTypeTreeControllerBase : FolderTreeControllerBase UmbracoObjectTypes.DataTypeContainer; - protected override FolderTreeItemResponseModel[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities) + protected override FolderTreeItemResponseModel[] MapTreeItemViewModels(Guid? parentId, IEntitySlim[] entities) { var dataTypes = _dataTypeService .GetAll(entities.Select(entity => entity.Id).ToArray()) @@ -33,7 +33,7 @@ public class DataTypeTreeControllerBase : FolderTreeControllerBase { - FolderTreeItemResponseModel responseModel = MapTreeItemViewModel(parentKey, entity); + FolderTreeItemResponseModel responseModel = MapTreeItemViewModel(parentId, entity); if (dataTypes.TryGetValue(entity.Id, out IDataType? dataType)) { responseModel.Icon = dataType.Editor?.Icon ?? responseModel.Icon; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ItemsDataTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ItemsDataTypeTreeController.cs index 2a910f517e..c084760e43 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ItemsDataTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ItemsDataTypeTreeController.cs @@ -15,6 +15,6 @@ public class ItemsDataTypeTreeController : DataTypeTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs index cef3b01572..b53481b4a6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs @@ -18,13 +18,13 @@ public class ByKeyDictionaryController : DictionaryControllerBase _dictionaryPresentationFactory = dictionaryPresentationFactory; } - [HttpGet($"{{{nameof(key)}:guid}}")] + [HttpGet($"{{{nameof(id)}:guid}}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(DictionaryItemResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task> ByKey(Guid key) + public async Task> ByKey(Guid id) { - IDictionaryItem? dictionary = await _dictionaryItemService.GetAsync(key); + IDictionaryItem? dictionary = await _dictionaryItemService.GetAsync(id); if (dictionary == null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs index 186d9925d9..c3a7697b5a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs @@ -19,14 +19,14 @@ public class DeleteDictionaryController : DictionaryControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpDelete($"{{{nameof(key)}:guid}}")] + [HttpDelete($"{{{nameof(id)}:guid}}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Delete(Guid key) + public async Task Delete(Guid id) { - Attempt result = await _dictionaryItemService.DeleteAsync(key, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _dictionaryItemService.DeleteAsync(id, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? Ok() diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs index a87c99cef2..a230fd88b0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs @@ -20,13 +20,13 @@ public class ExportDictionaryController : DictionaryControllerBase _entityXmlSerializer = entityXmlSerializer; } - [HttpGet("{key:guid}/export")] + [HttpGet("{id:guid}/export")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Export(Guid key, bool includeChildren = false) + public async Task Export(Guid id, bool includeChildren = false) { - IDictionaryItem? dictionaryItem = await _dictionaryItemService.GetAsync(key); + IDictionaryItem? dictionaryItem = await _dictionaryItemService.GetAsync(id); if (dictionaryItem is null) { return await Task.FromResult(NotFound()); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs index 4c53ccba9b..193203c13f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs @@ -32,15 +32,15 @@ public class ImportDictionaryController : DictionaryControllerBase { Attempt result = await _dictionaryItemImportService .ImportDictionaryItemFromUdtFileAsync( - importDictionaryRequestModel.TemporaryFileKey, - importDictionaryRequestModel.ParentKey, + importDictionaryRequestModel.TemporaryFileId, + importDictionaryRequestModel.ParentId, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Status switch { DictionaryImportOperationStatus.Success => CreatedAtAction(controller => nameof(controller.ByKey), result.Result!.Key), DictionaryImportOperationStatus.ParentNotFound => NotFound("The parent dictionary item could not be found."), - DictionaryImportOperationStatus.TemporaryFileNotFound => NotFound("The temporary file with specified key could not be found."), + DictionaryImportOperationStatus.TemporaryFileNotFound => NotFound("The temporary file with specified id could not be found."), DictionaryImportOperationStatus.InvalidFileType => BadRequest(new ProblemDetailsBuilder() .WithTitle("Invalid file type") .WithDetail("The dictionary import only supports UDT files.") diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs index 853268351e..e55259e593 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs @@ -20,14 +20,14 @@ public class MoveDictionaryController : DictionaryControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpPost("{key:guid}/move")] + [HttpPost("{id:guid}/move")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Move(Guid key, MoveDictionaryRequestModel moveDictionaryRequestModel) + public async Task Move(Guid id, MoveDictionaryRequestModel moveDictionaryRequestModel) { - IDictionaryItem? source = await _dictionaryItemService.GetAsync(key); + IDictionaryItem? source = await _dictionaryItemService.GetAsync(id); if (source == null) { return NotFound(); @@ -35,7 +35,7 @@ public class MoveDictionaryController : DictionaryControllerBase Attempt result = await _dictionaryItemService.MoveAsync( source, - moveDictionaryRequestModel.TargetKey, + moveDictionaryRequestModel.TargetId, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs index 87173121cd..506ae53d61 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs @@ -18,7 +18,7 @@ public class ChildrenDictionaryTreeController : DictionaryTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100) + public async Task>> Children(Guid parentId, int skip = 0, int take = 100) { if (PaginationService.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize, out ProblemDetails? error) == false) { @@ -28,7 +28,7 @@ public class ChildrenDictionaryTreeController : DictionaryTreeControllerBase IDictionaryItem[] dictionaryItems = PaginatedDictionaryItems( pageNumber, pageSize, - await DictionaryItemService.GetChildrenAsync(parentKey), + await DictionaryItemService.GetChildrenAsync(parentId), out var totalItems); EntityTreeItemResponseModel[] viewModels = await MapTreeItemViewModels(null, dictionaryItems); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs index 177293a6e6..4f269aa47a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs @@ -38,7 +38,7 @@ public class DictionaryTreeControllerBase : EntityTreeControllerBase), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) { - IDictionaryItem[] dictionaryItems = (await DictionaryItemService.GetManyAsync(keys)).ToArray(); + IDictionaryItem[] dictionaryItems = (await DictionaryItemService.GetManyAsync(ids)).ToArray(); EntityTreeItemResponseModel[] viewModels = await MapTreeItemViewModels(null, dictionaryItems); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs index 0a8f0e28f0..120e16b38f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs @@ -26,14 +26,14 @@ public class UpdateDictionaryController : DictionaryControllerBase _dictionaryPresentationFactory = dictionaryPresentationFactory; } - [HttpPut($"{{{nameof(key)}:guid}}")] + [HttpPut($"{{{nameof(id)}:guid}}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Update(Guid key, UpdateDictionaryItemRequestModel updateDictionaryItemRequestModel) + public async Task Update(Guid id, UpdateDictionaryItemRequestModel updateDictionaryItemRequestModel) { - IDictionaryItem? current = await _dictionaryItemService.GetAsync(key); + IDictionaryItem? current = await _dictionaryItemService.GetAsync(id); if (current == null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs index 86f0d103b0..7ff436f264 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs @@ -18,13 +18,13 @@ public class ByKeyDocumentController : DocumentControllerBase _documentPresentationFactory = documentPresentationFactory; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(DocumentResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByKey(Guid key) + public async Task ByKey(Guid id) { - IContent? content = await _contentEditingService.GetAsync(key); + IContent? content = await _contentEditingService.GetAsync(id); if (content == null) { return DocumentNotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs index 2979332dfe..95f9fb8746 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs @@ -17,10 +17,10 @@ public class DomainsController : DocumentControllerBase _umbracoMapper = umbracoMapper; } - [HttpGet("{key:guid}/domains")] - public async Task DomainsAsync(Guid key) + [HttpGet("{id:guid}/domains")] + public async Task DomainsAsync(Guid id) { - IDomain[] assignedDomains = (await _domainService.GetAssignedDomainsAsync(key, true)) + IDomain[] assignedDomains = (await _domainService.GetAssignedDomainsAsync(id, true)) .OrderBy(d => d.SortOrder) .ToArray(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs index 45e17fcbd3..c0867031cf 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs @@ -19,14 +19,14 @@ public class MoveToRecycleBinDocumentController : DocumentControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task MoveToRecycleBin(Guid key) + public async Task MoveToRecycleBin(Guid id) { - Attempt result = await _contentEditingService.MoveToRecycleBinAsync(key, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _contentEditingService.MoveToRecycleBinAsync(id, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? Ok() : ContentEditingOperationStatusResult(result.Status); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs index e5917d0a07..19294f2f32 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs @@ -18,12 +18,12 @@ public class NotificationsController : DocumentControllerBase _documentNotificationPresentationFactory = documentNotificationPresentationFactory; } - [HttpGet("{key:guid}/notifications")] + [HttpGet("{id:guid}/notifications")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Notifications(Guid key) + public async Task Notifications(Guid id) { - IContent? content = await _contentEditingService.GetAsync(key); + IContent? content = await _contentEditingService.GetAsync(id); return content != null ? Ok(await _documentNotificationPresentationFactory.CreateNotificationModelsAsync(content)) : DocumentNotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs index f95d5ba2e4..293e8e011a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs @@ -16,6 +16,6 @@ public class ChildrenDocumentRecycleBinController : DocumentRecycleBinController [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100) - => await GetChildren(parentKey, skip, take); + public async Task>> Children(Guid parentId, int skip = 0, int take = 100) + => await GetChildren(parentId, skip, take); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs index b3bf690cf9..d4f59d7712 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs @@ -28,9 +28,9 @@ public class DocumentRecycleBinControllerBase : RecycleBinControllerBase Constants.System.RecycleBinContent; - protected override RecycleBinItemResponseModel MapRecycleBinViewModel(Guid? parentKey, IEntitySlim entity) + protected override RecycleBinItemResponseModel MapRecycleBinViewModel(Guid? parentId, IEntitySlim entity) { - RecycleBinItemResponseModel responseModel = base.MapRecycleBinViewModel(parentKey, entity); + RecycleBinItemResponseModel responseModel = base.MapRecycleBinViewModel(parentId, entity); if (entity is IDocumentEntitySlim documentEntitySlim) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs index 661db794ca..889c6810e5 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs @@ -25,10 +25,10 @@ public class ChildrenDocumentTreeController : DocumentTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100, Guid? dataTypeKey = null, string? culture = null) + public async Task>> Children(Guid parentId, int skip = 0, int take = 100, Guid? dataTypeId = null, string? culture = null) { - IgnoreUserStartNodesForDataType(dataTypeKey); + IgnoreUserStartNodesForDataType(dataTypeId); RenderForClientCulture(culture); - return await GetChildren(parentKey, skip, take); + return await GetChildren(parentId, skip, take); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs index 82b6d31d58..70ead04951 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs @@ -44,9 +44,9 @@ public abstract class DocumentTreeControllerBase : UserStartNodeTreeControllerBa protected void RenderForClientCulture(string? culture) => _culture = culture; - protected override DocumentTreeItemResponseModel MapTreeItemViewModel(Guid? parentKey, IEntitySlim entity) + protected override DocumentTreeItemResponseModel MapTreeItemViewModel(Guid? parentId, IEntitySlim entity) { - DocumentTreeItemResponseModel responseModel = base.MapTreeItemViewModel(parentKey, entity); + DocumentTreeItemResponseModel responseModel = base.MapTreeItemViewModel(parentId, entity); if (entity is IDocumentEntitySlim documentEntitySlim) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ItemsDocumentTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ItemsDocumentTreeController.cs index 9528d02fec..1a996fbcbc 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ItemsDocumentTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ItemsDocumentTreeController.cs @@ -24,10 +24,10 @@ public class ItemsDocumentTreeController : DocumentTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys, Guid? dataTypeKey = null, string? culture = null) + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids, Guid? dataTypeId = null, string? culture = null) { - IgnoreUserStartNodesForDataType(dataTypeKey); + IgnoreUserStartNodesForDataType(dataTypeId); RenderForClientCulture(culture); - return await GetItems(keys); + return await GetItems(ids); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs index b6b613c808..e50f7af14c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs @@ -25,9 +25,9 @@ public class RootDocumentTreeController : DocumentTreeControllerBase [HttpGet("root")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Root(int skip = 0, int take = 100, Guid? dataTypeKey = null, string? culture = null) + public async Task>> Root(int skip = 0, int take = 100, Guid? dataTypeId = null, string? culture = null) { - IgnoreUserStartNodesForDataType(dataTypeKey); + IgnoreUserStartNodesForDataType(dataTypeId); RenderForClientCulture(culture); return await GetRoot(skip, take); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs index a81279e66a..07f3a069c6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs @@ -27,14 +27,14 @@ public class UpdateDocumentController : DocumentControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpPut("{key:guid}")] + [HttpPut("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Update(Guid key, UpdateDocumentRequestModel requestModel) + public async Task Update(Guid id, UpdateDocumentRequestModel requestModel) { - IContent? content = await _contentEditingService.GetAsync(key); + IContent? content = await _contentEditingService.GetAsync(id); if (content == null) { return DocumentNotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs index 638aac5d1c..df2c87e76f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs @@ -22,12 +22,12 @@ public class UpdateDomainsController : DocumentControllerBase _umbracoMapper = umbracoMapper; } - [HttpPut("{key:guid}/domains")] - public async Task UpdateDomainsAsync(Guid key, UpdateDomainsRequestModel updateModel) + [HttpPut("{id:guid}/domains")] + public async Task UpdateDomainsAsync(Guid id, UpdateDomainsRequestModel updateModel) { DomainsUpdateModel domainsUpdateModel = _umbracoMapper.Map(updateModel)!; - Attempt, DomainOperationStatus> result = await _domainService.UpdateDomainsAsync(key, domainsUpdateModel); + Attempt, DomainOperationStatus> result = await _domainService.UpdateDomainsAsync(id, domainsUpdateModel); return result.Status switch { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs index 1fc558e369..e08deebfa9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs @@ -20,12 +20,12 @@ public class UpdateNotificationsController : DocumentControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpPut("{key:guid}/notifications")] + [HttpPut("{id:guid}/notifications")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task UpdateNotifications(Guid key, UpdateDocumentNotificationsRequestModel updateModel) + public async Task UpdateNotifications(Guid id, UpdateDocumentNotificationsRequestModel updateModel) { - IContent? content = await _contentEditingService.GetAsync(key); + IContent? content = await _contentEditingService.GetAsync(id); if (content == null) { return DocumentNotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs index e1982563c4..de71b57595 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs @@ -23,7 +23,7 @@ public class DocumentBlueprintTreeControllerBase : EntityTreeControllerBase UmbracoObjectTypes.DocumentBlueprint; - protected override DocumentBlueprintTreeItemResponseModel[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities) + protected override DocumentBlueprintTreeItemResponseModel[] MapTreeItemViewModels(Guid? parentId, IEntitySlim[] entities) { var contentTypeAliases = entities .OfType() @@ -37,14 +37,14 @@ public class DocumentBlueprintTreeControllerBase : EntityTreeControllerBase { - DocumentBlueprintTreeItemResponseModel responseModel = base.MapTreeItemViewModel(parentKey, entity); + DocumentBlueprintTreeItemResponseModel responseModel = base.MapTreeItemViewModel(parentId, entity); responseModel.Icon = Constants.Icons.Blueprint; responseModel.HasChildren = false; if (entity is IDocumentEntitySlim documentEntitySlim && contentTypeByAlias.TryGetValue(documentEntitySlim.ContentTypeAlias, out IContentType? contentType)) { - responseModel.DocumentTypeKey = contentType.Key; + responseModel.DocumentTypeId = contentType.Key; responseModel.DocumentTypeAlias = contentType.Alias; responseModel.DocumentTypeName = contentType.Name; } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/ItemsDocumentBlueprintTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/ItemsDocumentBlueprintTreeController.cs index cae932b1fe..f31cbacf11 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/ItemsDocumentBlueprintTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/ItemsDocumentBlueprintTreeController.cs @@ -16,6 +16,6 @@ public class ItemsDocumentBlueprintTreeController : DocumentBlueprintTreeControl [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs index c8bfe27ae9..b68b939a98 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs @@ -18,14 +18,14 @@ public class ByKeyDocumentTypeController : DocumentTypeControllerBase _umbracoMapper = umbracoMapper; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(DocumentTypeResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByKey(Guid key) + public async Task ByKey(Guid id) { // FIXME: create and use an async get method here. - IContentType? contentType = _contentTypeService.Get(key); + IContentType? contentType = _contentTypeService.Get(id); if (contentType == null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs index d576bbcaf8..1cfbf58ead 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs @@ -16,9 +16,9 @@ public class ChildrenDocumentTypeTreeController : DocumentTypeTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100, bool foldersOnly = false) + public async Task>> Children(Guid parentId, int skip = 0, int take = 100, bool foldersOnly = false) { RenderFoldersOnly(foldersOnly); - return await GetChildren(parentKey, skip, take); + return await GetChildren(parentId, skip, take); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ItemsDocumentTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ItemsDocumentTypeTreeController.cs index 7b33265e97..4b79b68e7e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ItemsDocumentTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ItemsDocumentTypeTreeController.cs @@ -15,6 +15,6 @@ public class ItemsDocumentTypeTreeController : DocumentTypeTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/FolderManagementControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/FolderManagementControllerBase.cs index aea3464988..8676afd189 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/FolderManagementControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/FolderManagementControllerBase.cs @@ -20,7 +20,7 @@ public abstract class FolderManagementControllerBase : ManagementApiCon EntityContainer? container = await GetContainerAsync(key); if (container == null) { - return NotFound($"Could not find the folder with key: {key}"); + return NotFound($"Could not find the folder with id: {key}"); } EntityContainer? parentContainer = await GetParentContainerAsync(container); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs index 2aeda94df3..830ec7bb3a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs @@ -38,7 +38,7 @@ public class ExecuteActionHealthCheckController : HealthCheckControllerBase [ProducesResponseType(typeof(HealthCheckResultResponseModel), StatusCodes.Status200OK)] public async Task> ExecuteAction(HealthCheckActionRequestModel action) { - Guid healthCheckKey = action.HealthCheckKey; + Guid healthCheckKey = action.HealthCheckId; Core.HealthChecks.HealthCheck? healthCheck = _healthChecks .Where(x => _disabledCheckIds.Contains(healthCheckKey) == false) @@ -49,7 +49,7 @@ public class ExecuteActionHealthCheckController : HealthCheckControllerBase var invalidModelProblem = new ProblemDetails { Title = "Health Check Not Found", - Detail = $"No health check found with key = {healthCheckKey}", + Detail = $"No health check found with id = {healthCheckKey}", Status = StatusCodes.Status400BadRequest, Type = "Error", }; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs index 2403ba666b..8316c68d70 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs @@ -27,7 +27,7 @@ public class DetailsIndexerController : IndexerControllerBase /// /// /// This is kind of rudimentary since there's no way we can know that the index has rebuilt, we - /// have a listener for the index op complete so we'll just check if that key is no longer there in the runtime cache + /// have a listener for the index op complete so we'll just check if that id is no longer there in the runtime cache /// [HttpGet("{indexName}")] [MapToApiVersion("1.0")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs index 3e8700fa72..237d931b2b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs @@ -19,13 +19,13 @@ public class ByKeyMediaController : MediaControllerBase _mediaPresentationModelFactory = mediaPresentationModelFactory; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(DocumentResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByKey(Guid key) + public async Task ByKey(Guid id) { - IMedia? media = await _mediaEditingService.GetAsync(key); + IMedia? media = await _mediaEditingService.GetAsync(id); if (media == null) { return MediaNotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs index 7137521b4f..dfcc589a61 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs @@ -19,14 +19,14 @@ public class MoveToRecycleBinMediaController : MediaControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task MoveToRecycleBin(Guid key) + public async Task MoveToRecycleBin(Guid id) { - Attempt result = await _mediaEditingService.MoveToRecycleBinAsync(key, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _mediaEditingService.MoveToRecycleBinAsync(id, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? Ok() : ContentEditingOperationStatusResult(result.Status); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs index 73fd85aaa9..c038d5f835 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs @@ -16,6 +16,6 @@ public class ChildrenMediaRecycleBinController : MediaRecycleBinControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100) - => await GetChildren(parentKey, skip, take); + public async Task>> Children(Guid parentId, int skip = 0, int take = 100) + => await GetChildren(parentId, skip, take); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs index 47b5541d37..a7a4689ee5 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs @@ -24,9 +24,9 @@ public class ChildrenMediaTreeController : MediaTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100, Guid? dataTypeKey = null) + public async Task>> Children(Guid parentId, int skip = 0, int take = 100, Guid? dataTypeId = null) { - IgnoreUserStartNodesForDataType(dataTypeKey); - return await GetChildren(parentKey, skip, take); + IgnoreUserStartNodesForDataType(dataTypeId); + return await GetChildren(parentId, skip, take); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs index 4ecb997c1d..6b4617df69 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs @@ -23,9 +23,9 @@ public class ItemsMediaTreeController : MediaTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys, Guid? dataTypeKey = null) + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids, Guid? dataTypeId = null) { - IgnoreUserStartNodesForDataType(dataTypeKey); - return await GetItems(keys); + IgnoreUserStartNodesForDataType(dataTypeId); + return await GetItems(ids); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs index 9de26dbe3c..69a76dd0ae 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs @@ -24,9 +24,9 @@ public class RootMediaTreeController : MediaTreeControllerBase [HttpGet("root")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Root(int skip = 0, int take = 100, Guid? dataTypeKey = null) + public async Task>> Root(int skip = 0, int take = 100, Guid? dataTypeId = null) { - IgnoreUserStartNodesForDataType(dataTypeKey); + IgnoreUserStartNodesForDataType(dataTypeId); return await GetRoot(skip, take); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs index 9b6e24780d..6ebd3a89ff 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs @@ -27,14 +27,14 @@ public class UpdateMediaController : MediaControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpPut("{key:guid}")] + [HttpPut("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Update(Guid key, UpdateMediaRequestModel updateRequestModel) + public async Task Update(Guid id, UpdateMediaRequestModel updateRequestModel) { - IMedia? media = await _mediaEditingService.GetAsync(key); + IMedia? media = await _mediaEditingService.GetAsync(id); if (media == null) { return MediaNotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs index 5c6d65ce23..2d75162185 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs @@ -18,14 +18,14 @@ public class ByKeyMediaTypeController : MediaTypeControllerBase _umbracoMapper = umbracoMapper; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(MediaTypeResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByKey(Guid key) + public async Task ByKey(Guid id) { // FIXME: create and use an async get method here. - IMediaType? mediaType = _mediaTypeService.Get(key); + IMediaType? mediaType = _mediaTypeService.Get(id); if (mediaType == null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs index f3b0140b6c..12f75b7d63 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs @@ -16,9 +16,9 @@ public class ChildrenMediaTypeTreeController : MediaTypeTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100, bool foldersOnly = false) + public async Task>> Children(Guid parentId, int skip = 0, int take = 100, bool foldersOnly = false) { RenderFoldersOnly(foldersOnly); - return await GetChildren(parentKey, skip, take); + return await GetChildren(parentId, skip, take); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ItemsMediaTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ItemsMediaTypeTreeController.cs index eabed1645f..89c4bf3d68 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ItemsMediaTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ItemsMediaTypeTreeController.cs @@ -15,6 +15,6 @@ public class ItemsMediaTypeTreeController : MediaTypeTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/ItemsMemberGroupTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/ItemsMemberGroupTreeController.cs index 363bd7b3cf..60b625e6f3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/ItemsMemberGroupTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/ItemsMemberGroupTreeController.cs @@ -15,6 +15,6 @@ public class ItemsMemberGroupTreeController : MemberGroupTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/ItemsMemberTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/ItemsMemberTypeTreeController.cs index 82754c3d78..6daa4494a9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/ItemsMemberTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/ItemsMemberTypeTreeController.cs @@ -15,6 +15,6 @@ public class ItemsMemberTypeTreeController : MemberTypeTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs index d709b24b99..24cd1601e1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs @@ -19,17 +19,17 @@ public class ByKeyCreatedPackageController : CreatedPackageControllerBase } /// - /// Gets a package by key. + /// Gets a package by id. /// - /// The key of the package. + /// The id of the package. /// The package or not found result. - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(typeof(PackageDefinitionResponseModel), StatusCodes.Status200OK)] - public async Task> ByKey(Guid key) + public async Task> ByKey(Guid id) { - PackageDefinition? package = await _packagingService.GetCreatedPackageByKeyAsync(key); + PackageDefinition? package = await _packagingService.GetCreatedPackageByKeyAsync(id); if (package is null) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs index 427d5686a8..414d571541 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs @@ -20,18 +20,18 @@ public class DeleteCreatedPackageController : CreatedPackageControllerBase } /// - /// Deletes a package with a given key. + /// Deletes a package with a given id. /// - /// The key of the package. + /// The id of the package. /// The result of the deletion. - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task Delete(Guid key) + public async Task Delete(Guid id) { Attempt result = - await _packagingService.DeleteCreatedPackageAsync(key, CurrentUserKey(_backOfficeSecurityAccessor)); + await _packagingService.DeleteCreatedPackageAsync(id, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? Ok() diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs index 1c13d0596b..3393623d13 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs @@ -18,15 +18,15 @@ public class DownloadCreatedPackageController : CreatedPackageControllerBase /// /// Downloads a package XML or ZIP file. /// - /// The key of the package. + /// The id of the package. /// The XML or ZIP file of the package or not found result. - [HttpGet("{key:guid}/download")] + [HttpGet("{id:guid}/download")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)] - public async Task Download(Guid key) + public async Task Download(Guid id) { - PackageDefinition? package = await _packagingService.GetCreatedPackageByKeyAsync(key); + PackageDefinition? package = await _packagingService.GetCreatedPackageByKeyAsync(id); if (package is null) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs index e6e281b2d7..613f6d1d24 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs @@ -29,16 +29,16 @@ public class UpdateCreatedPackageController : CreatedPackageControllerBase /// /// Updates a package. /// - /// The key of the package. + /// The id of the package. /// The model containing the data for updating a package. /// The created package. - [HttpPut("{key:guid}")] + [HttpPut("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task Update(Guid key, UpdatePackageRequestModel updatePackageRequestModel) + public async Task Update(Guid id, UpdatePackageRequestModel updatePackageRequestModel) { - PackageDefinition? package = await _packagingService.GetCreatedPackageByKeyAsync(key); + PackageDefinition? package = await _packagingService.GetCreatedPackageByKeyAsync(id); if (package is null) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs index a0170788c9..807bf6ead0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs @@ -71,7 +71,7 @@ public abstract class RecycleBinControllerBase : Controller Type = _itemUdiType, HasChildren = entity.HasChildren, IsContainer = entity.IsContainer, - ParentKey = parentKey + ParentId = parentKey }; return viewModel; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs index fb49455cd3..daf5395433 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs @@ -21,11 +21,11 @@ public class ByKeyRedirectUrlManagementController : RedirectUrlManagementBaseCon _redirectUrlPresentationFactory = redirectUrlPresentationFactory; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public Task>> ByKey(Guid key, int skip, int take) + public Task>> ByKey(Guid id, int skip, int take) { - IRedirectUrl[] redirects = _redirectUrlService.GetContentRedirectUrls(key).ToArray(); + IRedirectUrl[] redirects = _redirectUrlService.GetContentRedirectUrls(id).ToArray(); IEnumerable viewModels = _redirectUrlPresentationFactory.CreateMany(redirects); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs index fbab340a73..5b36bb6196 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs @@ -13,11 +13,11 @@ public class DeleteByKeyRedirectUrlManagementController : RedirectUrlManagementB _redirectUrlService = redirectUrlService; } - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task DeleteByKey(Guid key) + public async Task DeleteByKey(Guid id) { - _redirectUrlService.Delete(key); + _redirectUrlService.Delete(id); return Ok(); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs index 48f0dfdf5f..60b0cebcfd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs @@ -22,12 +22,12 @@ public class ByRelationTypeKeyRelationController : RelationControllerBase _relationPresentationFactory = relationPresentationFactory; } - [HttpGet("type/{key:guid}")] + [HttpGet("type/{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task ByRelationTypeKey(Guid key, int skip = 0, int take = 100) + public async Task ByRelationTypeKey(Guid id, int skip = 0, int take = 100) { - Attempt, RelationOperationStatus> relationsAttempt = await _relationService.GetPagedByRelationTypeKey(key, skip, take); + Attempt, RelationOperationStatus> relationsAttempt = await _relationService.GetPagedByRelationTypeKey(id, skip, take); if (relationsAttempt.Success is false) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs index 6b7f9c0a8e..451dd708dd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs @@ -18,13 +18,13 @@ public class ByKeyRelationTypeController : RelationTypeControllerBase _mapper = mapper; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(RelationTypeResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task ByKey(Guid key) + public async Task ByKey(Guid id) { - IRelationType? relationType = _relationService.GetRelationTypeById(key); + IRelationType? relationType = _relationService.GetRelationTypeById(id); if (relationType is null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs index 9a2676143a..43ee789ebf 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs @@ -19,13 +19,13 @@ public class DeleteRelationTypeController : RelationTypeControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] - public async Task Delete(Guid key) + public async Task Delete(Guid id) { - Attempt result = await _relationService.DeleteAsync(key, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _relationService.DeleteAsync(id, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? await Task.FromResult(Ok()) : RelationTypeOperationStatusResult(result.Status); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs index 08eaa260f2..f0873d4534 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs @@ -27,20 +27,20 @@ public class UpdateRelationTypeController : RelationTypeControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpPut("{key:guid}")] + [HttpPut("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(RelationTypeResponseModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] - public async Task Update(Guid key, UpdateRelationTypeRequestModel updateRelationTypeSavingViewModel) + public async Task Update(Guid id, UpdateRelationTypeRequestModel updateRelationTypeSavingViewModel) { - IRelationType? persistedRelationType = _relationService.GetRelationTypeById(key); + IRelationType? persistedRelationType = _relationService.GetRelationTypeById(id); if (persistedRelationType is null) { ProblemDetails problemDetails = new ProblemDetailsBuilder() .WithTitle("Could not find relation type") - .WithDetail($"Relation type with key {key} could not be found") + .WithDetail($"Relation type with id {id} could not be found") .Build(); return NotFound(problemDetails); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/ItemsRelationTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/ItemsRelationTypeTreeController.cs index 884cb337be..f250a6040d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/ItemsRelationTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/ItemsRelationTypeTreeController.cs @@ -17,13 +17,13 @@ public class ItemsRelationTypeTreeController : RelationTypeTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) { // relation service does not allow fetching a collection of relation types by their ids; instead it relies // heavily on caching, which means this is as fast as it gets - even if it looks less than performant IRelationType[] relationTypes = _relationService .GetAllRelationTypes() - .Where(relationType => keys.Contains(relationType.Key)).ToArray(); + .Where(relationType => ids.Contains(relationType.Key)).ToArray(); EntityTreeItemResponseModel[] viewModels = MapTreeItemViewModels(null, relationTypes); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs index 422c4e7478..f540a8c7a0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs @@ -32,6 +32,6 @@ public class RelationTypeTreeControllerBase : EntityTreeControllerBase> ByKey(Guid key) + public async Task> ByKey(Guid id) { - ITemplate? template = await _templateService.GetAsync(key); + ITemplate? template = await _templateService.GetAsync(id); return template == null ? NotFound() : Ok(_umbracoMapper.Map(template)); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs index 676e835d45..2e1f5efff8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs @@ -19,14 +19,14 @@ public class DeleteTemplateController : TemplateControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Delete(Guid key) + public async Task Delete(Guid id) { - Attempt result = await _templateService.DeleteAsync(key, CurrentUserKey(_backOfficeSecurityAccessor)); + Attempt result = await _templateService.DeleteAsync(id, CurrentUserKey(_backOfficeSecurityAccessor)); return result.Success ? Ok() : TemplateOperationStatusResult(result.Status); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs index 3d219ffc6c..0123f3792f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs @@ -82,10 +82,10 @@ public class ExecuteTemplateQueryController : TemplateQueryControllerBase { IPublishedContent? rootContent; - if (model.RootContentKey != null && model.RootContentKey != Guid.Empty) + if (model.RootContentId != null && model.RootContentId != Guid.Empty) { - rootContent = _publishedContentQuery.Content(model.RootContentKey); - queryExpression.Append($"Umbraco.Content(Guid.Parse(\"{model.RootContentKey}\"))"); + rootContent = _publishedContentQuery.Content(model.RootContentId); + queryExpression.Append($"Umbraco.Content(Guid.Parse(\"{model.RootContentId}\"))"); } else { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs index c2224c4db0..f159f2e4ea 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs @@ -16,6 +16,6 @@ public class ChildrenTemplateTreeController : TemplateTreeControllerBase [HttpGet("children")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Children(Guid parentKey, int skip = 0, int take = 100) - => await GetChildren(parentKey, skip, take); + public async Task>> Children(Guid parentId, int skip = 0, int take = 100) + => await GetChildren(parentId, skip, take); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ItemsTemplateTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ItemsTemplateTreeController.cs index 6915a87dc0..77e2eacc7e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ItemsTemplateTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ItemsTemplateTreeController.cs @@ -15,6 +15,6 @@ public class ItemsTemplateTreeController : TemplateTreeControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - public async Task>> Items([FromQuery(Name = "key")] Guid[] keys) - => await GetItems(keys); + public async Task>> Items([FromQuery(Name = "id")] Guid[] ids) + => await GetItems(ids); } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs index 801a55832d..7f4f641e2b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs @@ -26,14 +26,14 @@ public class UpdateTemplateController : TemplateControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } - [HttpPut("{key:guid}")] + [HttpPut("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Update(Guid key, UpdateTemplateRequestModel requestModel) + public async Task Update(Guid id, UpdateTemplateRequestModel requestModel) { - ITemplate? template = await _templateService.GetAsync(key); + ITemplate? template = await _templateService.GetAsync(id); if (template == null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs index ddc39fa3f8..a55140319a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs @@ -19,14 +19,14 @@ public class ByKeyTemporaryFileController : TemporaryFileControllerBase _umbracoMapper = umbracoMapper; } - [HttpGet($"{{{nameof(key)}}}")] + [HttpGet($"{{{nameof(id)}}}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] [ProducesResponseType(typeof(TemporaryFileResponseModel), StatusCodes.Status200OK)] - public async Task ByKey(Guid key) + public async Task ByKey(Guid id) { - TemporaryFileModel? model = await _temporaryFileService.GetAsync(key); + TemporaryFileModel? model = await _temporaryFileService.GetAsync(id); if (model == null) { return NotFound(); diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs index 0513fdd208..303562ca2b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs @@ -31,7 +31,7 @@ public class CreateTemporaryFileController : TemporaryFileControllerBase Attempt result = await _temporaryFileService.CreateAsync(createModel); return result.Success - ? CreatedAtAction(controller => nameof(controller.ByKey), new { key = result.Result!.Key }) + ? CreatedAtAction(controller => nameof(controller.ByKey), new { id = result.Result!.Key }) : TemporaryFileStatusResult(result.Status); } } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs index 48283c9650..9af909e146 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs @@ -13,14 +13,14 @@ public class DeleteTemporaryFileController : TemporaryFileControllerBase public DeleteTemporaryFileController(ITemporaryFileService temporaryFileService) => _temporaryFileService = temporaryFileService; - [HttpDelete($"{{{nameof(key)}}}")] + [HttpDelete($"{{{nameof(id)}}}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status200OK)] - public async Task Delete(Guid key) + public async Task Delete(Guid id) { - Attempt result = await _temporaryFileService.DeleteAsync(key); + Attempt result = await _temporaryFileService.DeleteAsync(id); return result.Success ? Ok() diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs index 8a851083ca..da3e7ae6e8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs @@ -27,16 +27,16 @@ public class ByIdTrackedReferenceController : TrackedReferenceControllerBase /// Used by info tabs on content, media etc. and for the delete and unpublish of single items. /// This is basically finding parents of relations. /// - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] public async Task>> Get( - Guid key, + Guid id, long skip = 0, long take = 20, bool filterMustBeIsDependency = false) { - PagedModel relationItems = await _trackedReferencesService.GetPagedRelationsForItemAsync(key, skip, take, filterMustBeIsDependency); + PagedModel relationItems = await _trackedReferencesService.GetPagedRelationsForItemAsync(id, skip, take, filterMustBeIsDependency); var pagedViewModel = new PagedViewModel { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs index c7b5a9be22..1aaee67b0a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs @@ -28,12 +28,12 @@ public class DescendantsTrackedReferenceController : TrackedReferenceControllerB /// kind of relation. /// This is basically finding the descending items which are children in relations. /// - [HttpGet("descendants/{parentKey:guid}")] + [HttpGet("descendants/{parentId:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> Descendants(Guid parentKey, long skip, long take, bool filterMustBeIsDependency = true) + public async Task>> Descendants(Guid parentId, long skip, long take, bool filterMustBeIsDependency = true) { - PagedModel relationItems = await _trackedReferencesSkipTakeService.GetPagedDescendantsInReferencesAsync(parentKey, skip, take, filterMustBeIsDependency); + PagedModel relationItems = await _trackedReferencesSkipTakeService.GetPagedDescendantsInReferencesAsync(parentId, skip, take, filterMustBeIsDependency); var pagedViewModel = new PagedViewModel { Total = relationItems.Total, diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs index 6e741571a1..bcf891da2f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs @@ -30,9 +30,9 @@ public class ItemsTrackedReferenceController : TrackedReferenceControllerBase [HttpGet("item")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] - public async Task>> GetPagedReferencedItems([FromQuery(Name="key")]SortedSet keys, long skip = 0, long take = 20, bool filterMustBeIsDependency = true) + public async Task>> GetPagedReferencedItems([FromQuery(Name="id")]SortedSet ids, long skip = 0, long take = 20, bool filterMustBeIsDependency = true) { - PagedModel relationItems = await _trackedReferencesSkipTakeService.GetPagedItemsWithRelationsAsync(keys, skip, take, filterMustBeIsDependency); + PagedModel relationItems = await _trackedReferencesSkipTakeService.GetPagedItemsWithRelationsAsync(ids, skip, take, filterMustBeIsDependency); var pagedViewModel = new PagedViewModel { Total = relationItems.Total, diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs index f352a37ad9..7aa61406d9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs @@ -44,29 +44,29 @@ public abstract class EntityTreeControllerBase : ManagementApiControllerB return await Task.FromResult(Ok(result)); } - protected async Task>> GetChildren(Guid parentKey, int skip, int take) + protected async Task>> GetChildren(Guid parentId, int skip, int take) { if (PaginationService.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize, out ProblemDetails? error) == false) { return BadRequest(error); } - IEntitySlim[] children = GetPagedChildEntities(parentKey, pageNumber, pageSize, out var totalItems); + IEntitySlim[] children = GetPagedChildEntities(parentId, pageNumber, pageSize, out var totalItems); - TItem[] treeItemViewModels = MapTreeItemViewModels(parentKey, children); + TItem[] treeItemViewModels = MapTreeItemViewModels(parentId, children); PagedViewModel result = PagedViewModel(treeItemViewModels, totalItems); return await Task.FromResult(Ok(result)); } - protected async Task>> GetItems(Guid[] keys) + protected async Task>> GetItems(Guid[] ids) { - if (keys.IsCollectionEmpty()) + if (ids.IsCollectionEmpty()) { return await Task.FromResult(Ok(PagedViewModel(Array.Empty(), 0))); } - IEntitySlim[] itemEntities = GetEntities(keys); + IEntitySlim[] itemEntities = GetEntities(ids); TItem[] treeItemViewModels = MapTreeItemViewModels(null, itemEntities); @@ -86,7 +86,7 @@ public abstract class EntityTreeControllerBase : ManagementApiControllerB protected virtual IEntitySlim[] GetPagedChildEntities(Guid parentKey, long pageNumber, int pageSize, out long totalItems) { - // EntityService is only able to get paged children by parent ID, so we must first map parent key to parent ID + // EntityService is only able to get paged children by parent ID, so we must first map parent id to parent ID Attempt parentId = EntityService.GetId(parentKey, ItemObjectType); if (parentId.Success == false) { @@ -106,7 +106,7 @@ public abstract class EntityTreeControllerBase : ManagementApiControllerB return children; } - protected virtual IEntitySlim[] GetEntities(Guid[] keys) => EntityService.GetAll(ItemObjectType, keys).ToArray(); + protected virtual IEntitySlim[] GetEntities(Guid[] ids) => EntityService.GetAll(ItemObjectType, ids).ToArray(); protected virtual TItem[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities) => entities.Select(entity => MapTreeItemViewModel(parentKey, entity)).ToArray(); @@ -121,7 +121,7 @@ public abstract class EntityTreeControllerBase : ManagementApiControllerB Type = _itemUdiType, HasChildren = entity.HasChildren, IsContainer = entity.IsContainer, - ParentKey = parentKey + ParentId = parentKey }; return viewModel; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs index 71350eb87f..737697a8ee 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/ByKeyUserGroupController.cs @@ -21,13 +21,13 @@ public class ByKeyUserGroupController : UserGroupsControllerBase _userGroupPresentationFactory = userGroupPresentationFactory; } - [HttpGet("{key:guid}")] + [HttpGet("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(UserGroupPresentationModel), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task> ByKey(Guid key) + public async Task> ByKey(Guid id) { - IUserGroup? userGroup = await _userGroupService.GetAsync(key); + IUserGroup? userGroup = await _userGroupService.GetAsync(id); if (userGroup is null) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs index ad26e28cc2..bc96fcd722 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/DeleteUserGroupController.cs @@ -15,13 +15,13 @@ public class DeleteUserGroupController : UserGroupsControllerBase _userGroupService = userGroupService; } - [HttpDelete("{key:guid}")] + [HttpDelete("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Delete(Guid key) + public async Task Delete(Guid id) { - Attempt result = await _userGroupService.DeleteAsync(key); + Attempt result = await _userGroupService.DeleteAsync(id); return result.Success ? Ok() diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs index b2de922621..5b2117d50c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroups/UpdateUserGroupController.cs @@ -22,13 +22,13 @@ public class UpdateUserGroupController : UserGroupsControllerBase _userGroupPresentationFactory = userGroupPresentationFactory; } - [HttpPut("{key:guid}")] + [HttpPut("{id:guid}")] [MapToApiVersion("1.0")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task Update(Guid key, UpdateUserGroupRequestModel dataTypeRequestModel) + public async Task Update(Guid id, UpdateUserGroupRequestModel dataTypeRequestModel) { - IUserGroup? existingUserGroup = await _userGroupService.GetAsync(key); + IUserGroup? existingUserGroup = await _userGroupService.GetAsync(id); if (existingUserGroup is null) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs index 0f90aaec3c..e57b0fa578 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Users/SetAvatarUsersController.cs @@ -28,7 +28,7 @@ public class SetAvatarUsersController : UsersControllerBase return NotFound(); } - UserOperationStatus result = await _userService.SetAvatarAsync(user, model.FileKey); + UserOperationStatus result = await _userService.SetAvatarAsync(user, model.FileId); return result is UserOperationStatus.Success ? Ok() diff --git a/src/Umbraco.Cms.Api.Management/Factories/AuditLogPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/AuditLogPresentationFactory.cs index f7064da437..8f69ec3bb4 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/AuditLogPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/AuditLogPresentationFactory.cs @@ -38,7 +38,7 @@ public class AuditLogPresentationFactory : IAuditLogPresentationFactory { Comment = auditItem.Comment, EntityType = auditItem.EntityType, - EntityKey = entitySlim?.Key, + EntityId = entitySlim?.Key, LogType = auditItem.AuditType, Parameters = auditItem.Parameters, Timestamp = auditItem.CreateDate, @@ -50,7 +50,7 @@ public class AuditLogPresentationFactory : IAuditLogPresentationFactory throw new ArgumentException($"Could not find user with id {auditItem.UserId}"); } - target.UserKey = user.Key; + target.UserId = user.Key; target.UserAvatars = user.GetUserAvatarUrls(_appCaches.RuntimeCache, _mediaFileManager, _imageUrlGenerator); target.UserName = user.Name; return target; @@ -63,7 +63,7 @@ public class AuditLogPresentationFactory : IAuditLogPresentationFactory { Comment = auditItem.Comment, EntityType = auditItem.EntityType, - EntityKey = entitySlim?.Key, + EntityId = entitySlim?.Key, LogType = auditItem.AuditType, Parameters = auditItem.Parameters, Timestamp = auditItem.CreateDate, @@ -75,7 +75,7 @@ public class AuditLogPresentationFactory : IAuditLogPresentationFactory throw new ArgumentException($"Could not find user with id {auditItem.UserId}"); } - target.UserKey = user.Key; + target.UserId = user.Key; return target; } } diff --git a/src/Umbraco.Cms.Api.Management/Factories/DataTypeReferencePresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DataTypeReferencePresentationFactory.cs index f34b4c72d5..aa6b150a94 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DataTypeReferencePresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DataTypeReferencePresentationFactory.cs @@ -47,7 +47,7 @@ public class DataTypeReferencePresentationFactory : IDataTypeReferencePresentati IEnumerable propertyAliases = propertyAliasesByGuid[contentType.Key]; yield return new DataTypeReferenceResponseModel { - Key = contentType.Key, + Id = contentType.Key, Type = usagesByEntityType.Key, Properties = contentType .PropertyTypes diff --git a/src/Umbraco.Cms.Api.Management/Factories/DictionaryPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DictionaryPresentationFactory.cs index 670e9774c9..705f007114 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DictionaryPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DictionaryPresentationFactory.cs @@ -78,7 +78,7 @@ public class DictionaryPresentationFactory : IDictionaryPresentationFactory ? key : null; - return new ImportDictionaryItemsPresentationModel { Name = name, Key = itemKey, ParentKey = parentKey }; + return new ImportDictionaryItemsPresentationModel { Name = name, Id = itemKey, ParentId = parentKey }; }) .WhereNotNull() .ToArray(), diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentEditingPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentEditingPresentationFactory.cs index 0cdb64d575..43e75eaa00 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DocumentEditingPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentEditingPresentationFactory.cs @@ -8,9 +8,9 @@ internal sealed class DocumentEditingPresentationFactory : ContentEditingPresent public ContentCreateModel MapCreateModel(CreateDocumentRequestModel requestModel) { ContentCreateModel model = MapContentEditingModel(requestModel); - model.ContentTypeKey = requestModel.ContentTypeKey; - model.TemplateKey = requestModel.TemplateKey; - model.ParentKey = requestModel.ParentKey; + model.ContentTypeKey = requestModel.ContentTypeId; + model.TemplateKey = requestModel.TemplateId; + model.ParentKey = requestModel.ParentId; return model; } @@ -18,7 +18,7 @@ internal sealed class DocumentEditingPresentationFactory : ContentEditingPresent public ContentUpdateModel MapUpdateModel(UpdateDocumentRequestModel requestModel) { ContentUpdateModel model = MapContentEditingModel(requestModel); - model.TemplateKey = requestModel.TemplateKey; + model.TemplateKey = requestModel.TemplateId; return model; } diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs index b462743f25..68aab84c4c 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentPresentationFactory.cs @@ -27,7 +27,7 @@ public class DocumentPresentationFactory : IDocumentPresentationFactory responseModel.Urls = await _contentUrlFactory.GetUrlsAsync(content); - responseModel.TemplateKey = content.TemplateId.HasValue + responseModel.TemplateId = content.TemplateId.HasValue ? _fileService.GetTemplate(content.TemplateId.Value)?.Key : null; diff --git a/src/Umbraco.Cms.Api.Management/Factories/HealthCheckGroupPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/HealthCheckGroupPresentationFactory.cs index 5a64e4434a..f1dd6ec5d8 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/HealthCheckGroupPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/HealthCheckGroupPresentationFactory.cs @@ -65,7 +65,7 @@ public class HealthCheckGroupPresentationFactory : IHealthCheckGroupPresentation var healthCheckViewModel = new HealthCheckWithResultPresentationModel { - Key = healthCheck.Id, + Id = healthCheck.Id, Results = _umbracoMapper.MapEnumerable(results) }; diff --git a/src/Umbraco.Cms.Api.Management/Factories/MediaEditingPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/MediaEditingPresentationFactory.cs index 5a9f305b11..cbde14c5cf 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/MediaEditingPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/MediaEditingPresentationFactory.cs @@ -8,8 +8,8 @@ internal sealed class MediaEditingPresentationFactory : ContentEditingPresentati public MediaCreateModel MapCreateModel(CreateMediaRequestModel createRequestModel) { MediaCreateModel model = MapContentEditingModel(createRequestModel); - model.ContentTypeKey = createRequestModel.ContentTypeKey; - model.ParentKey = createRequestModel.ParentKey; + model.ContentTypeKey = createRequestModel.ContentTypeId; + model.ParentKey = createRequestModel.ParentId; return model; } diff --git a/src/Umbraco.Cms.Api.Management/Factories/RedirectUrlPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/RedirectUrlPresentationFactory.cs index 0517b8044f..7afb19e7e7 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/RedirectUrlPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/RedirectUrlPresentationFactory.cs @@ -25,10 +25,10 @@ public class RedirectUrlPresentationFactory : IRedirectUrlPresentationFactory { OriginalUrl = originalUrl, DestinationUrl = destinationUrl, - ContentKey = source.ContentKey, + ContentId = source.ContentKey, Created = source.CreateDateUtc, Culture = source.Culture, - Key = source.Key, + Id = source.Key, }; } diff --git a/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs index deabe62b2a..4647d36764 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/RelationTypePresentationFactory.cs @@ -19,7 +19,7 @@ public class RelationTypePresentationFactory : IRelationTypePresentationFactory createRelationTypeRequestModel.ParentObjectType, createRelationTypeRequestModel.ChildObjectType, createRelationTypeRequestModel.IsDependency, - createRelationTypeRequestModel.Key); + createRelationTypeRequestModel.Id); public void MapUpdateModelToRelationType(UpdateRelationTypeRequestModel updateRelationTypeRequestModel, IRelationType target) { diff --git a/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs index 112d09139a..3f7877a62e 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/UserGroupPresentationFactory.cs @@ -44,8 +44,8 @@ public class UserGroupPresentationFactory : IUserGroupPresentationFactory { Name = userGroup.Name ?? string.Empty, Id = userGroup.Key, - DocumentStartNodeKey = contentStartNodeKey, - MediaStartNodeKey = mediaStartNodeKey, + DocumentStartNodeId = contentStartNodeKey, + MediaStartNodeId = mediaStartNodeKey, Icon = userGroup.Icon, Languages = languageIsoCodesMappingAttempt.Result, HasAccessToAllLanguages = userGroup.HasAccessToAllLanguages, @@ -169,9 +169,9 @@ public class UserGroupPresentationFactory : IUserGroupPresentationFactory private Attempt AssignStartNodesToUserGroup(UserGroupBase source, IUserGroup target) { - if (source.DocumentStartNodeKey is not null) + if (source.DocumentStartNodeId is not null) { - var contentId = GetIdFromKey(source.DocumentStartNodeKey.Value, UmbracoObjectTypes.Document); + var contentId = GetIdFromKey(source.DocumentStartNodeId.Value, UmbracoObjectTypes.Document); if (contentId is null) { @@ -181,9 +181,9 @@ public class UserGroupPresentationFactory : IUserGroupPresentationFactory target.StartContentId = contentId; } - if (source.MediaStartNodeKey is not null) + if (source.MediaStartNodeId is not null) { - var mediaId = GetIdFromKey(source.MediaStartNodeKey.Value, UmbracoObjectTypes.Media); + var mediaId = GetIdFromKey(source.MediaStartNodeId.Value, UmbracoObjectTypes.Media); if (mediaId is null) { diff --git a/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs index c92dd8cf39..d2aaba7335 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/UserPresentationFactory.cs @@ -44,8 +44,8 @@ public class UserPresentationFactory : IUserPresentationFactory UpdateDate = user.UpdateDate, State = user.UserState, UserGroupIds = new SortedSet(user.Groups.Select(x => x.Key)), - ContentStartNodeKeys = GetKeysFromIds(user.StartContentIds, UmbracoObjectTypes.Document), - MediaStartNodeKeys = GetKeysFromIds(user.StartMediaIds, UmbracoObjectTypes.Media), + ContentStartNodeIds = GetKeysFromIds(user.StartContentIds, UmbracoObjectTypes.Document), + MediaStartNodeIds = GetKeysFromIds(user.StartMediaIds, UmbracoObjectTypes.Media), FailedLoginAttempts = user.FailedPasswordAttempts, LastLoginDate = user.LastLoginDate, LastlockoutDate = user.LastLockoutDate, @@ -108,7 +108,7 @@ public class UserPresentationFactory : IUserPresentationFactory public CreateUserResponseModel CreateCreationResponseModel(UserCreationResult creationResult) => new() { - UserKey = creationResult.CreatedUser?.Key ?? Guid.Empty, + UserId = creationResult.CreatedUser?.Key ?? Guid.Empty, InitialPassword = creationResult.InitialPassword, }; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/ContentType/ContentTypeMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/ContentType/ContentTypeMapDefinition.cs index 9298144173..dfa0351239 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/ContentType/ContentTypeMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/ContentType/ContentTypeMapDefinition.cs @@ -23,14 +23,14 @@ public abstract class ContentTypeMapDefinition new TPropertyTypeResponseModel { - Key = propertyType.Key, - ContainerKey = groupKeysByPropertyKeys.ContainsKey(propertyType.Key) + Id = propertyType.Key, + ContainerId = groupKeysByPropertyKeys.ContainsKey(propertyType.Key) ? groupKeysByPropertyKeys[propertyType.Key] : null, Name = propertyType.Name, Alias = propertyType.Alias, Description = propertyType.Description, - DataTypeKey = propertyType.DataTypeKey, + DataTypeId = propertyType.DataTypeKey, VariesByCulture = propertyType.VariesByCulture(), VariesBySegment = propertyType.VariesBySegment(), Validation = new PropertyTypeValidation @@ -68,8 +68,8 @@ public abstract class ContentTypeMapDefinition new TPropertyTypeContainerResponseModel { - Key = propertyGroup.Key, - ParentKey = ParentGroupKey(propertyGroup), + Id = propertyGroup.Key, + ParentId = ParentGroupKey(propertyGroup), Type = propertyGroup.Type.ToString(), SortOrder = propertyGroup.SortOrder, Name = propertyGroup.Name, @@ -78,13 +78,13 @@ public abstract class ContentTypeMapDefinition MapAllowedContentTypes(TContentType source) - => source.AllowedContentTypes?.Select(contentTypeSort => new ContentTypeSort { Key = contentTypeSort.Key, SortOrder = contentTypeSort.SortOrder }).ToArray() + => source.AllowedContentTypes?.Select(contentTypeSort => new ContentTypeSort { Id = contentTypeSort.Key, SortOrder = contentTypeSort.SortOrder }).ToArray() ?? Array.Empty(); protected IEnumerable MapCompositions(TContentType source, IEnumerable contentTypeComposition) => contentTypeComposition.Select(contentType => new ContentTypeComposition { - Key = contentType.Key, + Id = contentType.Key, CompositionType = contentType.Id == source.ParentId ? ContentTypeCompositionType.Inheritance : ContentTypeCompositionType.Composition diff --git a/src/Umbraco.Cms.Api.Management/Mapping/DataType/DataTypeViewModelMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/DataType/DataTypeViewModelMapDefinition.cs index ce0d57e71c..aade4ef7e6 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/DataType/DataTypeViewModelMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/DataType/DataTypeViewModelMapDefinition.cs @@ -28,7 +28,7 @@ public class DataTypeViewModelMapDefinition : IMapDefinition private void Map(IDataType source, DataTypeResponseModel target, MapperContext context) { target.Id = source.Key; - target.ParentKey = _dataTypeService.GetContainer(source.ParentId)?.Key; + target.ParentId = _dataTypeService.GetContainer(source.ParentId)?.Key; target.Name = source.Name ?? string.Empty; target.PropertyEditorAlias = source.EditorAlias; target.PropertyEditorUiAlias = source.EditorUiAlias; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Dictionary/DictionaryMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Dictionary/DictionaryMapDefinition.cs index ce8019fb83..df478d890d 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Dictionary/DictionaryMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Dictionary/DictionaryMapDefinition.cs @@ -41,16 +41,16 @@ public class DictionaryMapDefinition : IMapDefinition private void Map(CreateDictionaryItemRequestModel source, IDictionaryItem target, MapperContext context) { target.ItemKey = source.Name; - target.ParentId = source.ParentKey; + target.ParentId = source.ParentId; target.DeleteDate = null; } // Umbraco.Code.MapAll private void Map(IDictionaryItem source, DictionaryOverviewResponseModel target, MapperContext context) { - target.Key = source.Key; + target.Id = source.Key; target.Name = source.ItemKey; - target.ParentKey = source.ParentId; + target.ParentId = source.ParentId; target.TranslatedIsoCodes = source .Translations .Where(translation => translation.Value.IsNullOrWhiteSpace() == false) diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs index a30ba6e76c..0bfd701765 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs @@ -17,11 +17,11 @@ public class DocumentMapDefinition : ContentMapDefinition mapper.Define((_, _) => new DocumentResponseModel(), Map); - // Umbraco.Code.MapAll -Urls -TemplateKey + // Umbraco.Code.MapAll -Urls -TemplateId private void Map(IContent source, DocumentResponseModel target, MapperContext context) { - target.Key = source.Key; - target.ContentTypeKey = source.ContentType.Key; + target.Id = source.Key; + target.ContentTypeId = source.ContentType.Key; target.Values = MapValueViewModels(source); target.Variants = MapVariantViewModels( source, diff --git a/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeMapDefinition.cs index e6092bfa6b..1eb0b5b911 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeMapDefinition.cs @@ -15,7 +15,7 @@ public class DocumentTypeMapDefinition : ContentTypeMapDefinition template.Key); + target.AllowedTemplateIds = source.AllowedTemplates.Select(template => template.Key); } - target.DefaultTemplateKey = source.DefaultTemplate?.Key; + target.DefaultTemplateId = source.DefaultTemplate?.Key; if (source.HistoryCleanup != null) { diff --git a/src/Umbraco.Cms.Api.Management/Mapping/HealthCheck/HealthCheckViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/HealthCheck/HealthCheckViewModelsMapDefinition.cs index 1aefa7be91..c2d13e7a18 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/HealthCheck/HealthCheckViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/HealthCheck/HealthCheckViewModelsMapDefinition.cs @@ -26,7 +26,7 @@ public class HealthCheckViewModelsMapDefinition : IMapDefinition private static void Map(HealthCheckActionRequestModel source, HealthCheckAction target, MapperContext context) { target.Alias = source.Alias; - target.HealthCheckId = source.HealthCheckKey; + target.HealthCheckId = source.HealthCheckId; target.Name = source.Name; target.Description = source.Description; target.ValueRequired = source.ValueRequired; @@ -40,7 +40,7 @@ public class HealthCheckViewModelsMapDefinition : IMapDefinition { if (source.HealthCheckId is not null) { - target.HealthCheckKey = (Guid)source.HealthCheckId; + target.HealthCheckId = (Guid)source.HealthCheckId; } target.Alias = source.Alias; @@ -64,7 +64,7 @@ public class HealthCheckViewModelsMapDefinition : IMapDefinition // Umbraco.Code.MapAll private static void Map(Core.HealthChecks.HealthCheck source, HealthCheckViewModel target, MapperContext context) { - target.Key = source.Id; + target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; } diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs index ba53f950b0..6696c2dbd2 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Media/MediaMapDefinition.cs @@ -19,8 +19,8 @@ public class MediaMapDefinition : ContentMapDefinition new GuidUdi(Constants.UdiEntityType.Media, x)).ToList(); + target.MediaUdis = source.MediaIds.Select(x => new GuidUdi(Constants.UdiEntityType.Media, x)).ToList(); target.MediaLoadChildNodes = source.MediaLoadChildNodes; } // Umbraco.Code.MapAll private static void Map(PackageDefinition source, PackageDefinitionResponseModel target, MapperContext context) { - target.Key = source.PackageId; + target.Id = source.PackageId; target.Name = source.Name; target.PackagePath = source.PackagePath; target.ContentNodeId = source.ContentNodeId; target.ContentLoadChildNodes = source.ContentLoadChildNodes; - target.MediaKeys = source.MediaUdis.Select(x => x.Guid).ToList(); + target.MediaIds = source.MediaUdis.Select(x => x.Guid).ToList(); target.MediaLoadChildNodes = source.MediaLoadChildNodes; target.DocumentTypes = source.DocumentTypes; target.MediaTypes = source.MediaTypes; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/RelationType/RelationTypeViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/RelationType/RelationTypeViewModelsMapDefinition.cs index 6b515bf51a..453353d6fc 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/RelationType/RelationTypeViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/RelationType/RelationTypeViewModelsMapDefinition.cs @@ -23,7 +23,7 @@ public class RelationTypeViewModelsMapDefinition : IMapDefinition target.IsDependency = sourceWithIsDependency.IsDependency; } - target.Key = source.Key; + target.Id = source.Key; target.Name = source.Name ?? string.Empty; target.Alias = source.Alias; target.ParentObjectType = source.ParentObjectType; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/TemporaryFile/TemporaryFileUploadViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/TemporaryFile/TemporaryFileUploadViewModelsMapDefinition.cs index b8e9ff1a29..257262dfcc 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/TemporaryFile/TemporaryFileUploadViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/TemporaryFile/TemporaryFileUploadViewModelsMapDefinition.cs @@ -17,13 +17,13 @@ public class TemporaryFileViewModelsMapDefinition : IMapDefinition { target.OpenReadStream = () => source.File.OpenReadStream(); target.FileName = source.File.FileName; - target.Key = source.Key; + target.Key = source.Id; } // Umbraco.Code.MapAll private void Map(TemporaryFileModel source, TemporaryFileResponseModel target, MapperContext context) { - target.Key = source.Key; + target.Id = source.Key; target.AvailableUntil = source.AvailableUntil; target.FileName = source.FileName; } diff --git a/src/Umbraco.Cms.Api.Management/Mapping/TrackedReferences/TrackedReferenceViewModelsMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/TrackedReferences/TrackedReferenceViewModelsMapDefinition.cs index 44790fd813..209e704dff 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/TrackedReferences/TrackedReferenceViewModelsMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/TrackedReferences/TrackedReferenceViewModelsMapDefinition.cs @@ -17,7 +17,7 @@ public class TrackedReferenceViewModelsMapDefinition : IMapDefinition target.ContentTypeAlias = source.ContentTypeAlias; target.ContentTypeIcon = source.ContentTypeIcon; target.ContentTypeName = source.ContentTypeName; - target.NodeKey = source.NodeKey; + target.NodeId = source.NodeKey; target.NodeName = source.NodeName; target.NodeType = source.NodeType; target.RelationTypeIsBidirectional = source.RelationTypeIsBidirectional; diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json index aa0ca9cbfe..50fa960051 100644 --- a/src/Umbraco.Cms.Api.Management/OpenApi.json +++ b/src/Umbraco.Cms.Api.Management/OpenApi.json @@ -61,15 +61,15 @@ } } }, - "/umbraco/management/api/v1/audit-log/{key}": { + "/umbraco/management/api/v1/audit-log/{id}": { "get": { "tags": [ "Audit Log" ], - "operationId": "GetAuditLogByKey", + "operationId": "GetAuditLogById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -667,7 +667,7 @@ "operationId": "GetTreeDataTypeChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -723,7 +723,7 @@ "operationId": "GetTreeDataTypeItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -903,15 +903,15 @@ } } }, - "/umbraco/management/api/v1/dictionary/{key}": { + "/umbraco/management/api/v1/dictionary/{id}": { "get": { "tags": [ "Dictionary" ], - "operationId": "GetDictionaryByKey", + "operationId": "GetDictionaryById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -944,10 +944,10 @@ "tags": [ "Dictionary" ], - "operationId": "DeleteDictionaryByKey", + "operationId": "DeleteDictionaryById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -979,10 +979,10 @@ "tags": [ "Dictionary" ], - "operationId": "PutDictionaryByKey", + "operationId": "PutDictionaryById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1024,15 +1024,15 @@ } } }, - "/umbraco/management/api/v1/dictionary/{key}/export": { + "/umbraco/management/api/v1/dictionary/{id}/export": { "get": { "tags": [ "Dictionary" ], - "operationId": "GetDictionaryByKeyExport", + "operationId": "GetDictionaryByIdExport", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1067,15 +1067,15 @@ } } }, - "/umbraco/management/api/v1/dictionary/{key}/move": { + "/umbraco/management/api/v1/dictionary/{id}/move": { "post": { "tags": [ "Dictionary" ], - "operationId": "PostDictionaryByKeyMove", + "operationId": "PostDictionaryByIdMove", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1174,7 +1174,7 @@ "operationId": "GetTreeDictionaryChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -1222,7 +1222,7 @@ "operationId": "GetTreeDictionaryItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -1305,7 +1305,7 @@ "operationId": "GetTreeDocumentBlueprintItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -1377,15 +1377,15 @@ } } }, - "/umbraco/management/api/v1/document-type/{key}": { + "/umbraco/management/api/v1/document-type/{id}": { "get": { "tags": [ "Document Type" ], - "operationId": "GetDocumentTypeByKey", + "operationId": "GetDocumentTypeById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1423,7 +1423,7 @@ "operationId": "GetTreeDocumentTypeChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -1479,7 +1479,7 @@ "operationId": "GetTreeDocumentTypeItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -1601,15 +1601,15 @@ } } }, - "/umbraco/management/api/v1/document/{key}": { + "/umbraco/management/api/v1/document/{id}": { "get": { "tags": [ "Document" ], - "operationId": "GetDocumentByKey", + "operationId": "GetDocumentById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1642,10 +1642,10 @@ "tags": [ "Document" ], - "operationId": "DeleteDocumentByKey", + "operationId": "DeleteDocumentById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1670,10 +1670,10 @@ "tags": [ "Document" ], - "operationId": "PutDocumentByKey", + "operationId": "PutDocumentById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1708,15 +1708,15 @@ } } }, - "/umbraco/management/api/v1/document/{key}/domains": { + "/umbraco/management/api/v1/document/{id}/domains": { "get": { "tags": [ "Document" ], - "operationId": "GetDocumentByKeyDomains", + "operationId": "GetDocumentByIdDomains", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1735,10 +1735,10 @@ "tags": [ "Document" ], - "operationId": "PutDocumentByKeyDomains", + "operationId": "PutDocumentByIdDomains", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1767,15 +1767,15 @@ } } }, - "/umbraco/management/api/v1/document/{key}/notifications": { + "/umbraco/management/api/v1/document/{id}/notifications": { "get": { "tags": [ "Document" ], - "operationId": "GetDocumentByKeyNotifications", + "operationId": "GetDocumentByIdNotifications", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1811,10 +1811,10 @@ "tags": [ "Document" ], - "operationId": "PutDocumentByKeyNotifications", + "operationId": "PutDocumentByIdNotifications", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -1854,7 +1854,7 @@ "operationId": "GetRecycleBinDocumentChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -1948,7 +1948,7 @@ "operationId": "GetTreeDocumentChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -1974,7 +1974,7 @@ } }, { - "name": "dataTypeKey", + "name": "dataTypeId", "in": "query", "schema": { "type": "string", @@ -2011,7 +2011,7 @@ "operationId": "GetTreeDocumentItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -2022,7 +2022,7 @@ } }, { - "name": "dataTypeKey", + "name": "dataTypeId", "in": "query", "schema": { "type": "string", @@ -2084,7 +2084,7 @@ } }, { - "name": "dataTypeKey", + "name": "dataTypeId", "in": "query", "schema": { "type": "string", @@ -3228,15 +3228,15 @@ } } }, - "/umbraco/management/api/v1/media-type/{key}": { + "/umbraco/management/api/v1/media-type/{id}": { "get": { "tags": [ "Media Type" ], - "operationId": "GetMediaTypeByKey", + "operationId": "GetMediaTypeById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -3274,7 +3274,7 @@ "operationId": "GetTreeMediaTypeChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -3330,7 +3330,7 @@ "operationId": "GetTreeMediaTypeItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -3455,15 +3455,15 @@ } } }, - "/umbraco/management/api/v1/media/{key}": { + "/umbraco/management/api/v1/media/{id}": { "get": { "tags": [ "Media" ], - "operationId": "GetMediaByKey", + "operationId": "GetMediaById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -3496,10 +3496,10 @@ "tags": [ "Media" ], - "operationId": "DeleteMediaByKey", + "operationId": "DeleteMediaById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -3524,10 +3524,10 @@ "tags": [ "Media" ], - "operationId": "PutMediaByKey", + "operationId": "PutMediaById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -3570,7 +3570,7 @@ "operationId": "GetRecycleBinMediaChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -3664,7 +3664,7 @@ "operationId": "GetTreeMediaChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -3690,7 +3690,7 @@ } }, { - "name": "dataTypeKey", + "name": "dataTypeId", "in": "query", "schema": { "type": "string", @@ -3720,7 +3720,7 @@ "operationId": "GetTreeMediaItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -3731,7 +3731,7 @@ } }, { - "name": "dataTypeKey", + "name": "dataTypeId", "in": "query", "schema": { "type": "string", @@ -3789,7 +3789,7 @@ } }, { - "name": "dataTypeKey", + "name": "dataTypeId", "in": "query", "schema": { "type": "string", @@ -3819,7 +3819,7 @@ "operationId": "GetTreeMemberGroupItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -3914,7 +3914,7 @@ "operationId": "GetTreeMemberTypeItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -4235,15 +4235,15 @@ } } }, - "/umbraco/management/api/v1/package/created/{key}": { + "/umbraco/management/api/v1/package/created/{id}": { "get": { "tags": [ "Package" ], - "operationId": "GetPackageCreatedByKey", + "operationId": "GetPackageCreatedById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4276,10 +4276,10 @@ "tags": [ "Package" ], - "operationId": "DeletePackageCreatedByKey", + "operationId": "DeletePackageCreatedById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4301,10 +4301,10 @@ "tags": [ "Package" ], - "operationId": "PutPackageCreatedByKey", + "operationId": "PutPackageCreatedById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4336,15 +4336,15 @@ } } }, - "/umbraco/management/api/v1/package/created/{key}/download": { + "/umbraco/management/api/v1/package/created/{id}/download": { "get": { "tags": [ "Package" ], - "operationId": "GetPackageCreatedByKeyDownload", + "operationId": "GetPackageCreatedByIdDownload", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4726,15 +4726,15 @@ } } }, - "/umbraco/management/api/v1/redirect-management/{key}": { + "/umbraco/management/api/v1/redirect-management/{id}": { "get": { "tags": [ "Redirect Management" ], - "operationId": "GetRedirectManagementByKey", + "operationId": "GetRedirectManagementById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4776,10 +4776,10 @@ "tags": [ "Redirect Management" ], - "operationId": "DeleteRedirectManagementByKey", + "operationId": "DeleteRedirectManagementById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4885,15 +4885,15 @@ } } }, - "/umbraco/management/api/v1/relation-type/{key}": { + "/umbraco/management/api/v1/relation-type/{id}": { "get": { "tags": [ "Relation Type" ], - "operationId": "GetRelationTypeByKey", + "operationId": "GetRelationTypeById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4926,10 +4926,10 @@ "tags": [ "Relation Type" ], - "operationId": "DeleteRelationTypeByKey", + "operationId": "DeleteRelationTypeById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -4958,10 +4958,10 @@ "tags": [ "Relation Type" ], - "operationId": "PutRelationTypeByKey", + "operationId": "PutRelationTypeById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -5029,7 +5029,7 @@ "operationId": "GetTreeRelationTypeItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -5197,15 +5197,15 @@ } } }, - "/umbraco/management/api/v1/relation/type/{key}": { + "/umbraco/management/api/v1/relation/type/{id}": { "get": { "tags": [ "Relation" ], - "operationId": "GetRelationTypeByKey", + "operationId": "GetRelationTypeById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -5962,15 +5962,15 @@ } } }, - "/umbraco/management/api/v1/template/{key}": { + "/umbraco/management/api/v1/template/{id}": { "get": { "tags": [ "Template" ], - "operationId": "GetTemplateByKey", + "operationId": "GetTemplateById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6003,10 +6003,10 @@ "tags": [ "Template" ], - "operationId": "DeleteTemplateByKey", + "operationId": "DeleteTemplateById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6038,10 +6038,10 @@ "tags": [ "Template" ], - "operationId": "PutTemplateByKey", + "operationId": "PutTemplateById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6179,7 +6179,7 @@ "operationId": "GetTreeTemplateChildren", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "query", "schema": { "type": "string", @@ -6227,7 +6227,7 @@ "operationId": "GetTreeTemplateItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "type": "array", @@ -6326,7 +6326,7 @@ "schema": { "type": "object", "properties": { - "Key": { + "Id": { "type": "string", "format": "uuid" }, @@ -6337,7 +6337,7 @@ } }, "encoding": { - "Key": { + "Id": { "style": "form" }, "File": { @@ -6374,15 +6374,15 @@ } } }, - "/umbraco/management/api/v1/temporaryfile/{key}": { + "/umbraco/management/api/v1/temporaryfile/{id}": { "get": { "tags": [ "Temporary File" ], - "operationId": "GetTemporaryfileByKey", + "operationId": "GetTemporaryfileById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6432,10 +6432,10 @@ "tags": [ "Temporary File" ], - "operationId": "DeleteTemporaryfileByKey", + "operationId": "DeleteTemporaryfileById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6471,15 +6471,15 @@ } } }, - "/umbraco/management/api/v1/tracked-reference/{key}": { + "/umbraco/management/api/v1/tracked-reference/{id}": { "get": { "tags": [ "Tracked Reference" ], - "operationId": "GetTrackedReferenceByKey", + "operationId": "GetTrackedReferenceById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6528,15 +6528,15 @@ } } }, - "/umbraco/management/api/v1/tracked-reference/descendants/{parentKey}": { + "/umbraco/management/api/v1/tracked-reference/descendants/{parentId}": { "get": { "tags": [ "Tracked Reference" ], - "operationId": "GetTrackedReferenceDescendantsByParentKey", + "operationId": "GetTrackedReferenceDescendantsByParentId", "parameters": [ { - "name": "parentKey", + "name": "parentId", "in": "path", "required": true, "schema": { @@ -6591,7 +6591,7 @@ "operationId": "GetTrackedReferenceItem", "parameters": [ { - "name": "key", + "name": "id", "in": "query", "schema": { "uniqueItems": true, @@ -6794,15 +6794,15 @@ } } }, - "/umbraco/management/api/v1/user-groups/{key}": { + "/umbraco/management/api/v1/user-groups/{id}": { "get": { "tags": [ "User Groups" ], - "operationId": "GetUserGroupsByKey", + "operationId": "GetUserGroupsById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6835,10 +6835,10 @@ "tags": [ "User Groups" ], - "operationId": "DeleteUserGroupsByKey", + "operationId": "DeleteUserGroupsById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -6860,10 +6860,10 @@ "tags": [ "User Groups" ], - "operationId": "PutUserGroupsByKey", + "operationId": "PutUserGroupsById", "parameters": [ { - "name": "key", + "name": "id", "in": "path", "required": true, "schema": { @@ -7428,11 +7428,11 @@ "AuditLogBaseModel": { "type": "object", "properties": { - "userKey": { + "userId": { "type": "string", "format": "uuid" }, - "entityKey": { + "entityId": { "type": "string", "format": "uuid", "nullable": true @@ -7568,11 +7568,11 @@ ] } }, - "key": { + "id": { "type": "string", "format": "uuid" }, - "contentTypeKey": { + "contentTypeId": { "type": "string", "format": "uuid" } @@ -7641,7 +7641,7 @@ "ContentTypeCompositionModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -7662,7 +7662,7 @@ "ContentTypeResponseModelBaseDocumentTypePropertyTypeResponseModelDocumentTypePropertyTypeContainerResponseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -7737,7 +7737,7 @@ "ContentTypeResponseModelBaseMediaTypePropertyTypeResponseModelMediaTypePropertyTypeContainerResponseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -7812,7 +7812,7 @@ "ContentTypeSortModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -7839,7 +7839,7 @@ "CopyDataTypeRequestModel": { "type": "object", "properties": { - "targetKey": { + "targetId": { "type": "string", "format": "uuid", "nullable": true @@ -7870,7 +7870,7 @@ ] } }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -7901,7 +7901,7 @@ ] } }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -7938,7 +7938,7 @@ } ], "properties": { - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -7954,11 +7954,11 @@ } ], "properties": { - "contentTypeKey": { + "contentTypeId": { "type": "string", "format": "uuid" }, - "templateKey": { + "templateId": { "type": "string", "format": "uuid", "nullable": true @@ -8009,7 +8009,7 @@ } ], "properties": { - "contentTypeKey": { + "contentTypeId": { "type": "string", "format": "uuid" } @@ -8033,7 +8033,7 @@ } ], "properties": { - "key": { + "id": { "type": "string", "format": "uuid", "nullable": true @@ -8062,7 +8062,7 @@ "CreateUserResponseModel": { "type": "object", "properties": { - "userKey": { + "userId": { "type": "string", "format": "uuid" }, @@ -8138,7 +8138,7 @@ "DataTypeReferenceResponseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -8176,7 +8176,7 @@ "type": "string", "format": "uuid" }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -8337,11 +8337,11 @@ "type": "string", "nullable": true }, - "key": { + "id": { "type": "string", "format": "uuid" }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -8391,7 +8391,7 @@ "$type": { "type": "string" }, - "documentTypeKey": { + "documentTypeId": { "type": "string", "format": "uuid" }, @@ -8441,7 +8441,7 @@ ] } }, - "templateKey": { + "templateId": { "type": "string", "format": "uuid", "nullable": true @@ -8507,14 +8507,14 @@ } ], "properties": { - "allowedTemplateKeys": { + "allowedTemplateIds": { "type": "array", "items": { "type": "string", "format": "uuid" } }, - "defaultTemplateKey": { + "defaultTemplateId": { "type": "string", "format": "uuid", "nullable": true @@ -8708,7 +8708,7 @@ "isContainer": { "type": "boolean" }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -8830,7 +8830,7 @@ "HealthCheckActionRequestModel": { "type": "object", "properties": { - "healthCheckKey": { + "healthCheckId": { "type": "string", "format": "uuid" }, @@ -8940,7 +8940,7 @@ "HealthCheckModelBaseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" } @@ -9030,11 +9030,11 @@ "ImportDictionaryRequestModel": { "type": "object", "properties": { - "temporaryFileKey": { + "temporaryFileId": { "type": "string", "format": "uuid" }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -9429,7 +9429,7 @@ "MoveDataTypeRequestModel": { "type": "object", "properties": { - "targetKey": { + "targetId": { "type": "string", "format": "uuid", "nullable": true @@ -9440,7 +9440,7 @@ "MoveDictionaryRequestModel": { "type": "object", "properties": { - "targetKey": { + "targetId": { "type": "string", "format": "uuid", "nullable": true @@ -9512,7 +9512,7 @@ } ], "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -9564,7 +9564,7 @@ "contentLoadChildNodes": { "type": "boolean" }, - "mediaKeys": { + "mediaIds": { "type": "array", "items": { "type": "string", @@ -10453,11 +10453,11 @@ "PropertyTypeContainerResponseModelBaseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -10479,11 +10479,11 @@ "PropertyTypeResponseModelBaseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, - "containerKey": { + "containerId": { "type": "string", "format": "uuid", "nullable": true @@ -10498,7 +10498,7 @@ "type": "string", "nullable": true }, - "dataTypeKey": { + "dataTypeId": { "type": "string", "format": "uuid" }, @@ -10574,7 +10574,7 @@ "isContainer": { "type": "boolean" }, - "parentKey": { + "parentId": { "type": "string", "format": "uuid", "nullable": true @@ -10599,7 +10599,7 @@ "RedirectUrlResponseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -10613,7 +10613,7 @@ "type": "string", "format": "date-time" }, - "contentKey": { + "contentId": { "type": "string", "format": "uuid" }, @@ -10639,7 +10639,7 @@ "RelationItemResponseModel": { "type": "object", "properties": { - "nodeKey": { + "nodeId": { "type": "string", "format": "uuid" }, @@ -10743,7 +10743,7 @@ } ], "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -10868,7 +10868,7 @@ "SetAvatarRequestModel": { "type": "object", "properties": { - "fileKey": { + "fileId": { "type": "string", "format": "uuid" } @@ -10955,7 +10955,7 @@ "TemplateQueryExecuteModel": { "type": "object", "properties": { - "rootContentKey": { + "rootContentId": { "type": "string", "format": "uuid", "nullable": true @@ -11149,7 +11149,7 @@ "TemporaryFileResponseModel": { "type": "object", "properties": { - "key": { + "id": { "type": "string", "format": "uuid" }, @@ -11286,7 +11286,7 @@ } ], "properties": { - "templateKey": { + "templateId": { "type": "string", "format": "uuid", "nullable": true @@ -11470,12 +11470,12 @@ "hasAccessToAllLanguages": { "type": "boolean" }, - "documentStartNodeKey": { + "documentStartNodeId": { "type": "string", "format": "uuid", "nullable": true }, - "mediaStartNodeKey": { + "mediaStartNodeId": { "type": "string", "format": "uuid", "nullable": true @@ -11607,7 +11607,7 @@ "type": "string", "nullable": true }, - "contentStartNodeKeys": { + "contentStartNodeIds": { "uniqueItems": true, "type": "array", "items": { @@ -11615,7 +11615,7 @@ "format": "uuid" } }, - "mediaStartNodeKeys": { + "mediaStartNodeIds": { "uniqueItems": true, "type": "array", "items": { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/AuditLogs/AuditLogBaseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/AuditLogs/AuditLogBaseModel.cs index 7168fd9dfd..b946247dd0 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/AuditLogs/AuditLogBaseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/AuditLogs/AuditLogBaseModel.cs @@ -4,9 +4,9 @@ namespace Umbraco.Cms.Api.Management.ViewModels.AuditLogs; public class AuditLogBaseModel { - public Guid UserKey { get; set; } + public Guid UserId { get; set; } - public Guid? EntityKey { get; set; } + public Guid? EntityId { get; set; } public DateTime Timestamp { get; set; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs index 667e93e6c8..69efd38971 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Content/ContentResponseModelBase.cs @@ -5,7 +5,7 @@ public abstract class ContentResponseModelBase where TValueModel : ValueModelBase where TVariantModel : VariantModelBase { - public Guid? ParentKey { get; set; } + public Guid? ParentId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeComposition.cs b/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeComposition.cs index 45fe7b463d..a4563aa5f9 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeComposition.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeComposition.cs @@ -2,7 +2,7 @@ public class ContentTypeComposition { - public required Guid Key { get; init; } + public required Guid Id { get; init; } public required ContentTypeCompositionType CompositionType { get; init; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeResponseModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeResponseModelBase.cs index dcf8421dfe..e1ac059316 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeResponseModelBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/ContentType/ContentTypeResponseModelBase.cs @@ -4,7 +4,7 @@ public abstract class ContentTypeResponseModelBase /// Gets or sets the key. /// - public Guid Key { get; set; } + public Guid Id { get; set; } /// /// Gets or sets the parent key. /// - public Guid? ParentKey { get; set; } + public Guid? ParentId { get; set; } /// /// Sets the translations. diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryItemsPresentationModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryItemsPresentationModel.cs index 0f899761ba..3dd3fa81cf 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryItemsPresentationModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryItemsPresentationModel.cs @@ -2,9 +2,9 @@ public class ImportDictionaryItemsPresentationModel { - public Guid Key { get; set; } + public Guid Id { get; set; } public string? Name { get; set; } - public Guid? ParentKey { get; set; } + public Guid? ParentId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryRequestModel.cs index 3251fdb554..f2357ff73c 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/ImportDictionaryRequestModel.cs @@ -2,7 +2,7 @@ public class ImportDictionaryRequestModel { - public required Guid TemporaryFileKey { get; set; } + public required Guid TemporaryFileId { get; set; } - public Guid? ParentKey { get; set; } + public Guid? ParentId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/MoveDictionaryRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/MoveDictionaryRequestModel.cs index 3280173afa..099516eee7 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/MoveDictionaryRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Dictionary/MoveDictionaryRequestModel.cs @@ -2,5 +2,5 @@ public class MoveDictionaryRequestModel { - public Guid? TargetKey { get; set; } + public Guid? TargetId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/CreateDocumentRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/CreateDocumentRequestModel.cs index e9b4a52800..20117bfb9d 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/CreateDocumentRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/CreateDocumentRequestModel.cs @@ -4,7 +4,7 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Document; public class CreateDocumentRequestModel : CreateContentRequestModelBase { - public Guid ContentTypeKey { get; set; } + public Guid ContentTypeId { get; set; } - public Guid? TemplateKey { get; set; } + public Guid? TemplateId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs index 5431a57f92..83389fb288 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentResponseModel.cs @@ -6,5 +6,5 @@ public class DocumentResponseModel : ContentResponseModelBase Urls { get; set; } = Array.Empty(); - public Guid? TemplateKey { get; set; } + public Guid? TemplateId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/UpdateDocumentRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/UpdateDocumentRequestModel.cs index 9ee6fdca0d..a0a8b5f6cf 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Document/UpdateDocumentRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Document/UpdateDocumentRequestModel.cs @@ -4,5 +4,5 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Document; public class UpdateDocumentRequestModel : UpdateContentRequestModelBase { - public Guid? TemplateKey { get; set; } + public Guid? TemplateId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeResponseModel.cs index 28e5c1d795..d9b41e5a2d 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeResponseModel.cs @@ -4,9 +4,9 @@ namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType; public class DocumentTypeResponseModel : ContentTypeResponseModelBase { - public IEnumerable AllowedTemplateKeys { get; set; } = Array.Empty(); + public IEnumerable AllowedTemplateIds { get; set; } = Array.Empty(); - public Guid? DefaultTemplateKey { get; set; } + public Guid? DefaultTemplateId { get; set; } public ContentTypeCleanup Cleanup { get; set; } = new(); } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckActionRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckActionRequestModel.cs index 4b241c36a3..c289a339b3 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckActionRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckActionRequestModel.cs @@ -5,7 +5,7 @@ public class HealthCheckActionRequestModel /// /// Gets or sets the health check key. /// - public Guid HealthCheckKey { get; set; } + public Guid HealthCheckId { get; set; } /// /// Gets or sets the alias. diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckModelBase.cs index 17be73f5d7..b948c0c452 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckModelBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/HealthCheck/HealthCheckModelBase.cs @@ -5,5 +5,5 @@ public class HealthCheckModelBase /// /// Gets or sets the key. /// - public Guid Key { get; set; } + public Guid Id { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Media/CreateMediaRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Media/CreateMediaRequestModel.cs index a4a4ec3ead..fda09b05ca 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Media/CreateMediaRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Media/CreateMediaRequestModel.cs @@ -4,5 +4,5 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Media; public class CreateMediaRequestModel : CreateContentRequestModelBase { - public Guid ContentTypeKey { get; set; } + public Guid ContentTypeId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageDefinitionResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageDefinitionResponseModel.cs index d57aba8146..a35f62da6f 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageDefinitionResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageDefinitionResponseModel.cs @@ -7,7 +7,7 @@ public class PackageDefinitionResponseModel : PackageModelBase /// /// Gets or sets the key. /// - public Guid Key { get; set; } + public Guid Id { get; set; } /// /// Gets or sets the full path to the package's XML file. diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageModelBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageModelBase.cs index c3c1fa9460..4dc1be8fa2 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageModelBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Package/PackageModelBase.cs @@ -20,7 +20,7 @@ public class PackageModelBase /// /// Gets or sets the list of media keys for the selected media items. /// - public IList MediaKeys { get; set; } = new List(); + public IList MediaIds { get; set; } = new List(); /// /// Gets or sets a value indicating whether to load all child nodes of the selected media items. diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/RecycleBin/RecycleBinItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/RecycleBin/RecycleBinItemResponseModel.cs index 1ac4795565..e0d5edc14d 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/RecycleBin/RecycleBinItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/RecycleBin/RecycleBinItemResponseModel.cs @@ -14,6 +14,6 @@ public class RecycleBinItemResponseModel : INamedEntityPresentationModel public bool IsContainer { get; set; } - public Guid? ParentKey { get; set; } + public Guid? ParentId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/RedirectUrlManagement/RedirectUrlResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/RedirectUrlManagement/RedirectUrlResponseModel.cs index 74d3eef005..0f419ec1d9 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/RedirectUrlManagement/RedirectUrlResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/RedirectUrlManagement/RedirectUrlResponseModel.cs @@ -2,7 +2,7 @@ public class RedirectUrlResponseModel { - public Guid Key { get; set; } + public Guid Id { get; set; } public required string OriginalUrl { get; set; } @@ -10,7 +10,7 @@ public class RedirectUrlResponseModel public DateTime Created { get; set; } - public Guid ContentKey { get; set; } + public Guid ContentId { get; set; } public string? Culture { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/CreateRelationTypeRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/CreateRelationTypeRequestModel.cs index 0290da3d03..12e0c94372 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/CreateRelationTypeRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/CreateRelationTypeRequestModel.cs @@ -2,5 +2,5 @@ public class CreateRelationTypeRequestModel : RelationTypeBaseModel { - public Guid? Key { get; set; } + public Guid? Id { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/RelationTypeResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/RelationTypeResponseModel.cs index eaac28e981..848bcfc850 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/RelationTypeResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/RelationType/RelationTypeResponseModel.cs @@ -2,7 +2,7 @@ public class RelationTypeResponseModel : RelationTypeBaseModel { - public Guid Key { get; set; } + public Guid Id { get; set; } public string? Alias { get; set; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Template/Query/TemplateQueryExecuteModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Template/Query/TemplateQueryExecuteModel.cs index f90f500527..2d2fa40442 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Template/Query/TemplateQueryExecuteModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Template/Query/TemplateQueryExecuteModel.cs @@ -2,7 +2,7 @@ public class TemplateQueryExecuteModel { - public Guid? RootContentKey { get; set; } + public Guid? RootContentId { get; set; } public string? ContentTypeAlias { get; set; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/CreateTemporaryFileRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/CreateTemporaryFileRequestModel.cs index 142f55bde3..1f0237bfdf 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/CreateTemporaryFileRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/CreateTemporaryFileRequestModel.cs @@ -4,7 +4,7 @@ namespace Umbraco.Cms.Api.Management.ViewModels.TemporaryFile; public class CreateTemporaryFileRequestModel { - public required Guid Key { get; set; } + public required Guid Id { get; set; } public required IFormFile File { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/TemporaryFileResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/TemporaryFileResponseModel.cs index b20e74b3db..816b3452df 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/TemporaryFileResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/TemporaryFile/TemporaryFileResponseModel.cs @@ -2,7 +2,7 @@ namespace Umbraco.Cms.Api.Management.ViewModels.TemporaryFile; public class TemporaryFileResponseModel { - public Guid Key { get; set; } + public Guid Id { get; set; } public DateTime? AvailableUntil { get; set; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/TrackedReferences/RelationItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/TrackedReferences/RelationItemResponseModel.cs index d4eeb420e8..e87e0e8653 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/TrackedReferences/RelationItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/TrackedReferences/RelationItemResponseModel.cs @@ -2,7 +2,7 @@ public class RelationItemResponseModel { - public Guid NodeKey { get; set; } + public Guid NodeId { get; set; } public string? NodeName { get; set; } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Tree/DocumentBlueprintTreeItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Tree/DocumentBlueprintTreeItemResponseModel.cs index 69759c8bc9..b5ab2ff611 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Tree/DocumentBlueprintTreeItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Tree/DocumentBlueprintTreeItemResponseModel.cs @@ -2,7 +2,7 @@ public class DocumentBlueprintTreeItemResponseModel : EntityTreeItemResponseModel { - public Guid DocumentTypeKey { get; set; } + public Guid DocumentTypeId { get; set; } public string DocumentTypeAlias { get; set; } = string.Empty; diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Tree/EntityTreeItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Tree/EntityTreeItemResponseModel.cs index 0a1fef8f56..438ba2b332 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Tree/EntityTreeItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Tree/EntityTreeItemResponseModel.cs @@ -6,5 +6,5 @@ public class EntityTreeItemResponseModel : TreeItemPresentationModel, INamedEnti public bool IsContainer { get; set; } - public Guid? ParentKey { get; set; } + public Guid? ParentId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs index 994ef00abf..5796b86e13 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/UserGroups/UserGroupBase.cs @@ -41,15 +41,15 @@ public class UserGroupBase /// This can be overwritten by a different user group if a user is a member of multiple groups /// /// - public Guid? DocumentStartNodeKey { get; init; } + public Guid? DocumentStartNodeId { get; init; } /// - /// The Key of the media that should act as root node for the user group + /// The Id of the media that should act as root node for the user group /// /// This can be overwritten by a different user group if a user is a member of multiple groups /// /// - public Guid? MediaStartNodeKey { get; init; } + public Guid? MediaStartNodeId { get; init; } /// /// Ad-hoc list of permissions provided, and maintained by the front-end. The server has no concept of what these mean. diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs index 77450e028f..0ae336613d 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Users/CreateUserResponseModel.cs @@ -2,7 +2,7 @@ public class CreateUserResponseModel { - public Guid UserKey { get; set; } + public Guid UserId { get; set; } public string? InitialPassword { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs index b171fa74a2..5efe6884d1 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Users/SetAvatarRequestModel.cs @@ -2,5 +2,5 @@ public class SetAvatarRequestModel { - public Guid FileKey { get; set; } + public Guid FileId { get; set; } } diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs index 0b1e6c9250..903d4b1d0e 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/Users/UserResponseModel.cs @@ -8,9 +8,9 @@ public class UserResponseModel : UserPresentationBase, INamedEntityPresentationM public string? LanguageIsoCode { get; set; } - public SortedSet ContentStartNodeKeys { get; set; } = new(); + public SortedSet ContentStartNodeIds { get; set; } = new(); - public SortedSet MediaStartNodeKeys { get; set; } = new(); + public SortedSet MediaStartNodeIds { get; set; } = new(); public IEnumerable AvatarUrls { get; set; } = Enumerable.Empty();