Browse Source

Correct handling of error dto.

pull/405/head
Sebastian 7 years ago
parent
commit
4c7e82a59e
  1. 5
      src/Squidex/Areas/Api/Config/OpenApi/ErrorDtoProcessor.cs
  2. 2
      src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs
  3. 2
      src/Squidex/Areas/Api/Controllers/Schemas/Models/SynchronizeSchemaDto.cs
  4. 4
      src/Squidex/Areas/Api/Controllers/Schemas/Models/UpsertSchemaDto.cs

5
src/Squidex/Areas/Api/Config/OpenApi/ErrorDtoProcessor.cs

@ -7,6 +7,7 @@
using System; using System;
using System.Linq; using System.Linq;
using Namotion.Reflection;
using NJsonSchema; using NJsonSchema;
using NSwag; using NSwag;
using NSwag.Generation.Processors; using NSwag.Generation.Processors;
@ -61,9 +62,9 @@ namespace Squidex.Areas.Api.Config.OpenApi
private JsonSchema GetErrorSchema(DocumentProcessorContext context) private JsonSchema GetErrorSchema(DocumentProcessorContext context)
{ {
var errorType = typeof(ErrorDto); var errorType = typeof(ErrorDto).ToContextualType();
return context.SchemaGenerator.Generate(errorType); return context.SchemaGenerator.GenerateWithReference<JsonSchema>(errorType, context.SchemaResolver);
} }
} }
} }

2
src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs

@ -10,7 +10,7 @@ using Squidex.Domain.Apps.Entities.Schemas.Commands;
namespace Squidex.Areas.Api.Controllers.Schemas.Models namespace Squidex.Areas.Api.Controllers.Schemas.Models
{ {
public sealed class CreateSchemaDto : UpsertDto public sealed class CreateSchemaDto : UpsertSchemaDto
{ {
/// <summary> /// <summary>
/// The name of the schema. /// The name of the schema.

2
src/Squidex/Areas/Api/Controllers/Schemas/Models/SynchronizeSchemaDto.cs

@ -9,7 +9,7 @@ using Squidex.Domain.Apps.Entities.Schemas.Commands;
namespace Squidex.Areas.Api.Controllers.Schemas.Models namespace Squidex.Areas.Api.Controllers.Schemas.Models
{ {
public sealed class SynchronizeSchemaDto : UpsertDto public sealed class SynchronizeSchemaDto : UpsertSchemaDto
{ {
/// <summary> /// <summary>
/// True, when fields should not be deleted. /// True, when fields should not be deleted.

4
src/Squidex/Areas/Api/Controllers/Schemas/Models/UpsertDto.cs → src/Squidex/Areas/Api/Controllers/Schemas/Models/UpsertSchemaDto.cs

@ -12,7 +12,7 @@ using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.Schemas.Models namespace Squidex.Areas.Api.Controllers.Schemas.Models
{ {
public abstract class UpsertDto public abstract class UpsertSchemaDto
{ {
/// <summary> /// <summary>
/// The optional properties. /// The optional properties.
@ -44,7 +44,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models
/// </summary> /// </summary>
public bool IsPublished { get; set; } public bool IsPublished { get; set; }
public static TCommand ToCommand<TCommand, TDto>(TDto dto, TCommand command) where TCommand : UpsertCommand where TDto : UpsertDto public static TCommand ToCommand<TCommand, TDto>(TDto dto, TCommand command) where TCommand : UpsertCommand where TDto : UpsertSchemaDto
{ {
SimpleMapper.Map(dto, command); SimpleMapper.Map(dto, command);
Loading…
Cancel
Save