Browse Source

Remove unnecessary mapping.

pull/428/head
Sebastian Stehle 6 years ago
parent
commit
8c1cee1c55
  1. 31
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs
  2. 9
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs
  3. 4
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/JsonFieldPropertiesDto.cs
  4. 9
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/NumberFieldPropertiesDto.cs
  5. 8
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs
  6. 9
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/StringFieldPropertiesDto.cs
  7. 9
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/TagsFieldPropertiesDto.cs
  8. 4
      src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/UIFieldPropertiesDto.cs

31
src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs

@ -5,7 +5,6 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System.Linq;
using Squidex.Areas.Api.Controllers.Schemas.Models.Fields; using Squidex.Areas.Api.Controllers.Schemas.Models.Fields;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
@ -32,11 +31,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Converters
public FieldPropertiesDto Visit(AssetsFieldProperties properties) public FieldPropertiesDto Visit(AssetsFieldProperties properties)
{ {
var result = SimpleMapper.Map(properties, new AssetsFieldPropertiesDto()); return SimpleMapper.Map(properties, new AssetsFieldPropertiesDto());
result.AllowedExtensions = properties.AllowedExtensions?.ToArray();
return result;
} }
public FieldPropertiesDto Visit(BooleanFieldProperties properties) public FieldPropertiesDto Visit(BooleanFieldProperties properties)
@ -61,38 +56,22 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Converters
public FieldPropertiesDto Visit(NumberFieldProperties properties) public FieldPropertiesDto Visit(NumberFieldProperties properties)
{ {
var result = SimpleMapper.Map(properties, new NumberFieldPropertiesDto()); return SimpleMapper.Map(properties, new NumberFieldPropertiesDto());
result.AllowedValues = properties.AllowedValues?.ToArray();
return result;
} }
public FieldPropertiesDto Visit(ReferencesFieldProperties properties) public FieldPropertiesDto Visit(ReferencesFieldProperties properties)
{ {
var result = SimpleMapper.Map(properties, new ReferencesFieldPropertiesDto()); return SimpleMapper.Map(properties, new ReferencesFieldPropertiesDto());
result.SchemaIds = properties.SchemaIds?.ToArray();
return result;
} }
public FieldPropertiesDto Visit(StringFieldProperties properties) public FieldPropertiesDto Visit(StringFieldProperties properties)
{ {
var result = SimpleMapper.Map(properties, new StringFieldPropertiesDto()); return SimpleMapper.Map(properties, new StringFieldPropertiesDto());
result.AllowedValues = properties.AllowedValues?.ToArray();
return result;
} }
public FieldPropertiesDto Visit(TagsFieldProperties properties) public FieldPropertiesDto Visit(TagsFieldProperties properties)
{ {
var result = SimpleMapper.Map(properties, new TagsFieldPropertiesDto()); return SimpleMapper.Map(properties, new TagsFieldPropertiesDto());
result.AllowedValues = properties.AllowedValues?.ToArray();
return result;
} }
public FieldPropertiesDto Visit(UIFieldProperties properties) public FieldPropertiesDto Visit(UIFieldProperties properties)

9
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/AssetsFieldPropertiesDto.cs

@ -5,8 +5,8 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System.Collections.ObjectModel;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure.Collections;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
@ -76,7 +76,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
/// <summary> /// <summary>
/// The allowed file extensions. /// The allowed file extensions.
/// </summary> /// </summary>
public string[] AllowedExtensions { get; set; } public ReadOnlyCollection<string> AllowedExtensions { get; set; }
/// <summary> /// <summary>
/// True, if duplicate values are allowed. /// True, if duplicate values are allowed.
@ -87,11 +87,6 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
{ {
var result = SimpleMapper.Map(this, new AssetsFieldProperties()); var result = SimpleMapper.Map(this, new AssetsFieldProperties());
if (AllowedExtensions != null)
{
result.AllowedExtensions = ReadOnlyCollection.Create(AllowedExtensions);
}
return result; return result;
} }
} }

4
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/JsonFieldPropertiesDto.cs

@ -14,7 +14,9 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
{ {
public override FieldProperties ToProperties() public override FieldProperties ToProperties()
{ {
return SimpleMapper.Map(this, new JsonFieldProperties()); var result = SimpleMapper.Map(this, new JsonFieldProperties());
return result;
} }
} }
} }

9
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/NumberFieldPropertiesDto.cs

@ -5,8 +5,8 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System.Collections.ObjectModel;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure.Collections;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
@ -31,7 +31,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
/// <summary> /// <summary>
/// The allowed values for the field value. /// The allowed values for the field value.
/// </summary> /// </summary>
public double[] AllowedValues { get; set; } public ReadOnlyCollection<double> AllowedValues { get; set; }
/// <summary> /// <summary>
/// Indicates if the field value must be unique. Ignored for nested fields and localized fields. /// Indicates if the field value must be unique. Ignored for nested fields and localized fields.
@ -52,11 +52,6 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
{ {
var result = SimpleMapper.Map(this, new NumberFieldProperties()); var result = SimpleMapper.Map(this, new NumberFieldProperties());
if (AllowedValues != null)
{
result.AllowedValues = ReadOnlyCollection.Create(AllowedValues);
}
return result; return result;
} }
} }

8
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ReferencesFieldPropertiesDto.cs

@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using System; using System;
using System.Collections.ObjectModel;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure.Collections; using Squidex.Infrastructure.Collections;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
@ -42,17 +43,12 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
/// <summary> /// <summary>
/// The id of the referenced schemas. /// The id of the referenced schemas.
/// </summary> /// </summary>
public Guid[] SchemaIds { get; set; } public ReadOnlyCollection<Guid> SchemaIds { get; set; }
public override FieldProperties ToProperties() public override FieldProperties ToProperties()
{ {
var result = SimpleMapper.Map(this, new ReferencesFieldProperties()); var result = SimpleMapper.Map(this, new ReferencesFieldProperties());
if (SchemaIds != null)
{
result.SchemaIds = ReadOnlyCollection.Create(SchemaIds);
}
return result; return result;
} }
} }

9
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/StringFieldPropertiesDto.cs

@ -5,8 +5,8 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System.Collections.ObjectModel;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure.Collections;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
@ -41,7 +41,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
/// <summary> /// <summary>
/// The allowed values for the field value. /// The allowed values for the field value.
/// </summary> /// </summary>
public string[] AllowedValues { get; set; } public ReadOnlyCollection<string> AllowedValues { get; set; }
/// <summary> /// <summary>
/// Indicates if the field value must be unique. Ignored for nested fields and localized fields. /// Indicates if the field value must be unique. Ignored for nested fields and localized fields.
@ -62,11 +62,6 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
{ {
var result = SimpleMapper.Map(this, new StringFieldProperties()); var result = SimpleMapper.Map(this, new StringFieldProperties());
if (AllowedValues != null)
{
result.AllowedValues = ReadOnlyCollection.Create(AllowedValues);
}
return result; return result;
} }
} }

9
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/TagsFieldPropertiesDto.cs

@ -5,8 +5,8 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System.Collections.ObjectModel;
using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Schemas;
using Squidex.Infrastructure.Collections;
using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
@ -26,7 +26,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
/// <summary> /// <summary>
/// The allowed values for the field value. /// The allowed values for the field value.
/// </summary> /// </summary>
public string[] AllowedValues { get; set; } public ReadOnlyCollection<string> AllowedValues { get; set; }
/// <summary> /// <summary>
/// The editor that is used to manage this field. /// The editor that is used to manage this field.
@ -37,11 +37,6 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
{ {
var result = SimpleMapper.Map(this, new TagsFieldProperties()); var result = SimpleMapper.Map(this, new TagsFieldProperties());
if (AllowedValues != null)
{
result.AllowedValues = ReadOnlyCollection.Create(AllowedValues);
}
return result; return result;
} }
} }

4
src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/UIFieldPropertiesDto.cs

@ -19,7 +19,9 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields
public override FieldProperties ToProperties() public override FieldProperties ToProperties()
{ {
return SimpleMapper.Map(this, new UIFieldProperties()); var result = SimpleMapper.Map(this, new UIFieldProperties());
return result;
} }
} }
} }

Loading…
Cancel
Save