From a5621985209dcb9e424b621bbeccdd64916ab0ca Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:23:10 +0100 Subject: [PATCH] Rename items to item to be consistent (#15660) --- .../ByEditorUiAliasController.cs | 2 +- .../DatatypeItemControllerBase.cs | 2 +- .../ItemDatatypeItemController.cs | 2 +- .../ItemMemberTypeItemController.cs | 4 +- .../MemberTypeItemControllerBase.cs | 2 +- .../EntityBuilderExtensions.cs | 2 +- .../{Items => Item}/ItemTypeMapDefinition.cs | 5 +- src/Umbraco.Cms.Api.Management/OpenApi.json | 482 ++++++++++++++++++ .../{item => Item}/MediaItemResponseModel.cs | 0 .../MediaTreeItemResponseModel.cs | 0 .../MemberTypeItemResponseModel.cs | 2 +- 11 files changed, 492 insertions(+), 11 deletions(-) rename src/Umbraco.Cms.Api.Management/Controllers/DataType/{Items => Item}/ByEditorUiAliasController.cs (94%) rename src/Umbraco.Cms.Api.Management/Controllers/DataType/{Items => Item}/DatatypeItemControllerBase.cs (88%) rename src/Umbraco.Cms.Api.Management/Controllers/DataType/{Items => Item}/ItemDatatypeItemController.cs (95%) rename src/Umbraco.Cms.Api.Management/Controllers/MemberType/{Items => Item}/ItemMemberTypeItemController.cs (94%) rename src/Umbraco.Cms.Api.Management/Controllers/MemberType/{Items => Item}/MemberTypeItemControllerBase.cs (99%) rename src/Umbraco.Cms.Api.Management/Mapping/{Items => Item}/ItemTypeMapDefinition.cs (96%) rename src/Umbraco.Cms.Api.Management/ViewModels/Media/{item => Item}/MediaItemResponseModel.cs (100%) rename src/Umbraco.Cms.Api.Management/ViewModels/Media/{item => Item}/MediaTreeItemResponseModel.cs (100%) rename src/Umbraco.Cms.Api.Management/ViewModels/MemberType/{Items => Item}/MemberTypeItemResponseModel.cs (71%) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ByEditorUiAliasController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/ByEditorUiAliasController.cs similarity index 94% rename from src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ByEditorUiAliasController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/ByEditorUiAliasController.cs index b0086e47df..f48b439ef6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ByEditorUiAliasController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/ByEditorUiAliasController.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.DataType.Items; +namespace Umbraco.Cms.Api.Management.Controllers.DataType.Item; [ApiVersion("1.0")] public class ByEditorUiAliasController : DatatypeItemControllerBase diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/DatatypeItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/DatatypeItemControllerBase.cs similarity index 88% rename from src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/DatatypeItemControllerBase.cs rename to src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/DatatypeItemControllerBase.cs index 3d3fcc2759..37631c7931 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/DatatypeItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/DatatypeItemControllerBase.cs @@ -4,7 +4,7 @@ using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; using Umbraco.Cms.Web.Common.Authorization; -namespace Umbraco.Cms.Api.Management.Controllers.DataType.Items; +namespace Umbraco.Cms.Api.Management.Controllers.DataType.Item; [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DataType}")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/ItemDatatypeItemController.cs similarity index 95% rename from src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/ItemDatatypeItemController.cs index 3b701c83ba..99b0e1acc7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Item/ItemDatatypeItemController.cs @@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.DataType.Items; +namespace Umbraco.Cms.Api.Management.Controllers.DataType.Item; [ApiVersion("1.0")] public class ItemDatatypeItemController : DatatypeItemControllerBase diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/ItemMemberTypeItemController.cs similarity index 94% rename from src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/ItemMemberTypeItemController.cs index a6c8448e36..53b72c8dd3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/ItemMemberTypeItemController.cs @@ -1,12 +1,12 @@ using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.MemberType.Items; +using Umbraco.Cms.Api.Management.ViewModels.MemberType.Item; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; -namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Items; +namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Item; [ApiVersion("1.0")] public class ItemMemberTypeItemController : MemberTypeItemControllerBase diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/MemberTypeItemControllerBase.cs similarity index 99% rename from src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs rename to src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/MemberTypeItemControllerBase.cs index 9daf296b09..f3df9b8247 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Item/MemberTypeItemControllerBase.cs @@ -4,7 +4,7 @@ using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; using Umbraco.Cms.Web.Common.Authorization; -namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Items; +namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Item; [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MemberType}")] diff --git a/src/Umbraco.Cms.Api.Management/DependencyInjection/EntityBuilderExtensions.cs b/src/Umbraco.Cms.Api.Management/DependencyInjection/EntityBuilderExtensions.cs index eac57897d7..edb0874277 100644 --- a/src/Umbraco.Cms.Api.Management/DependencyInjection/EntityBuilderExtensions.cs +++ b/src/Umbraco.Cms.Api.Management/DependencyInjection/EntityBuilderExtensions.cs @@ -1,5 +1,5 @@ using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.Mapping.Items; +using Umbraco.Cms.Api.Management.Mapping.Item; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Mapping; using Umbraco.Extensions; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Item/ItemTypeMapDefinition.cs similarity index 96% rename from src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs rename to src/Umbraco.Cms.Api.Management/Mapping/Item/ItemTypeMapDefinition.cs index 475ac2814b..9328f1a3f8 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/Items/ItemTypeMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/Item/ItemTypeMapDefinition.cs @@ -2,11 +2,10 @@ using Umbraco.Cms.Api.Management.ViewModels.Dictionary.Item; using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Item; using Umbraco.Cms.Api.Management.ViewModels.Language.Item; -using Umbraco.Cms.Api.Management.ViewModels.Media.Item; using Umbraco.Cms.Api.Management.ViewModels.MediaType.Item; using Umbraco.Cms.Api.Management.ViewModels.Member.Item; using Umbraco.Cms.Api.Management.ViewModels.MemberGroup.Item; -using Umbraco.Cms.Api.Management.ViewModels.MemberType.Items; +using Umbraco.Cms.Api.Management.ViewModels.MemberType.Item; using Umbraco.Cms.Api.Management.ViewModels.RelationType.Item; using Umbraco.Cms.Api.Management.ViewModels.Template.Item; using Umbraco.Cms.Api.Management.ViewModels.User.Item; @@ -16,7 +15,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; -namespace Umbraco.Cms.Api.Management.Mapping.Items; +namespace Umbraco.Cms.Api.Management.Mapping.Item; public class ItemTypeMapDefinition : IMapDefinition { diff --git a/src/Umbraco.Cms.Api.Management/OpenApi.json b/src/Umbraco.Cms.Api.Management/OpenApi.json index 4358509a9a..36ee269ddb 100644 --- a/src/Umbraco.Cms.Api.Management/OpenApi.json +++ b/src/Umbraco.Cms.Api.Management/OpenApi.json @@ -4334,6 +4334,26 @@ } } }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, "404": { "description": "Not Found", "content": { @@ -4575,6 +4595,26 @@ "200": { "description": "Success" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, "404": { "description": "Not Found", "content": { @@ -5806,6 +5846,112 @@ ] } }, + "/umbraco/management/api/v1/document/{id}/validate": { + "put": { + "tags": [ + "Document" + ], + "operationId": "PutDocumentByIdValidate", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string", + "format": "uuid" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateDocumentRequestModel" + } + ] + } + }, + "text/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateDocumentRequestModel" + } + ] + } + }, + "application/*+json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateDocumentRequestModel" + } + ] + } + } + } + }, + "responses": { + "200": { + "description": "Success" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "401": { + "description": "The resource is protected and requires an authentication token" + }, + "403": { + "description": "The authenticated user do not have access to this resource" + } + }, + "security": [ + { + "Backoffice User": [ ] + } + ] + } + }, "/umbraco/management/api/v1/document/configuration": { "get": { "tags": [ @@ -6024,6 +6170,101 @@ ] } }, + "/umbraco/management/api/v1/document/validate": { + "post": { + "tags": [ + "Document" + ], + "operationId": "PostDocumentValidate", + "requestBody": { + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/CreateDocumentRequestModel" + } + ] + } + }, + "text/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/CreateDocumentRequestModel" + } + ] + } + }, + "application/*+json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/CreateDocumentRequestModel" + } + ] + } + } + } + }, + "responses": { + "200": { + "description": "Success" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "401": { + "description": "The resource is protected and requires an authentication token" + }, + "403": { + "description": "The authenticated user do not have access to this resource" + } + }, + "security": [ + { + "Backoffice User": [ ] + } + ] + } + }, "/umbraco/management/api/v1/recycle-bin/document": { "delete": { "tags": [ @@ -10088,6 +10329,26 @@ } } }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, "404": { "description": "Not Found", "content": { @@ -10256,6 +10517,26 @@ "200": { "description": "Success" }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, "404": { "description": "Not Found", "content": { @@ -10451,6 +10732,112 @@ ] } }, + "/umbraco/management/api/v1/media/{id}/validate": { + "put": { + "tags": [ + "Media" + ], + "operationId": "PutMediaByIdValidate", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string", + "format": "uuid" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateMediaRequestModel" + } + ] + } + }, + "text/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateMediaRequestModel" + } + ] + } + }, + "application/*+json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/UpdateMediaRequestModel" + } + ] + } + } + } + }, + "responses": { + "200": { + "description": "Success" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "401": { + "description": "The resource is protected and requires an authentication token" + }, + "403": { + "description": "The authenticated user do not have access to this resource" + } + }, + "security": [ + { + "Backoffice User": [ ] + } + ] + } + }, "/umbraco/management/api/v1/media/configuration": { "get": { "tags": [ @@ -10669,6 +11056,101 @@ ] } }, + "/umbraco/management/api/v1/media/validate": { + "post": { + "tags": [ + "Media" + ], + "operationId": "PostMediaValidate", + "requestBody": { + "content": { + "application/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/CreateMediaRequestModel" + } + ] + } + }, + "text/json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/CreateMediaRequestModel" + } + ] + } + }, + "application/*+json": { + "schema": { + "oneOf": [ + { + "$ref": "#/components/schemas/CreateMediaRequestModel" + } + ] + } + } + } + }, + "responses": { + "200": { + "description": "Success" + }, + "400": { + "description": "Bad Request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + }, + "401": { + "description": "The resource is protected and requires an authentication token" + }, + "403": { + "description": "The authenticated user do not have access to this resource" + } + }, + "security": [ + { + "Backoffice User": [ ] + } + ] + } + }, "/umbraco/management/api/v1/recycle-bin/media": { "delete": { "tags": [ diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Media/Item/MediaItemResponseModel.cs similarity index 100% rename from src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaItemResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/Media/Item/MediaItemResponseModel.cs diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaTreeItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Media/Item/MediaTreeItemResponseModel.cs similarity index 100% rename from src/Umbraco.Cms.Api.Management/ViewModels/Media/item/MediaTreeItemResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/Media/Item/MediaTreeItemResponseModel.cs diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/MemberType/Items/MemberTypeItemResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/MemberType/Item/MemberTypeItemResponseModel.cs similarity index 71% rename from src/Umbraco.Cms.Api.Management/ViewModels/MemberType/Items/MemberTypeItemResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/MemberType/Item/MemberTypeItemResponseModel.cs index b9dbcea538..bced744452 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/MemberType/Items/MemberTypeItemResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/MemberType/Item/MemberTypeItemResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.Item; -namespace Umbraco.Cms.Api.Management.ViewModels.MemberType.Items; +namespace Umbraco.Cms.Api.Management.ViewModels.MemberType.Item; public class MemberTypeItemResponseModel : NamedItemResponseModelBase {