Browse Source

More converter methods.

pull/282/head
Sebastian Stehle 9 years ago
parent
commit
ed6a5d9af8
  1. 2
      src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
  2. 2
      src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs
  3. 5
      src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
  4. 8
      src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
  5. 3
      src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
  6. 7
      src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs
  7. 7
      src/Squidex/Areas/Api/Controllers/LanguageDto.cs
  8. 3
      src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs

2
src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs

@ -239,7 +239,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
var context = await CommandBus.PublishAsync(command); var context = await CommandBus.PublishAsync(command);
var result = context.Result<EntityCreatedResult<NamedContentData>>(); var result = context.Result<EntityCreatedResult<NamedContentData>>();
var response = ContentDto.Create(command, result); var response = ContentDto.FromCommand(command, result);
return CreatedAtAction(nameof(GetContent), new { id = command.ContentId }, response); return CreatedAtAction(nameof(GetContent), new { id = command.ContentId }, response);
} }

2
src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs

@ -75,7 +75,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models
/// </summary> /// </summary>
public long Version { get; set; } public long Version { get; set; }
public static ContentDto Create(CreateContent command, EntityCreatedResult<NamedContentData> result) public static ContentDto FromCommand(CreateContent command, EntityCreatedResult<NamedContentData> result)
{ {
var now = SystemClock.Instance.GetCurrentInstant(); var now = SystemClock.Instance.GetCurrentInstant();

5
src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs

@ -13,7 +13,6 @@ using Orleans;
using Squidex.Areas.Api.Controllers.EventConsumers.Models; using Squidex.Areas.Api.Controllers.EventConsumers.Models;
using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.EventSourcing.Grains; using Squidex.Infrastructure.EventSourcing.Grains;
using Squidex.Infrastructure.Reflection;
using Squidex.Pipeline; using Squidex.Pipeline;
namespace Squidex.Areas.Api.Controllers.EventConsumers namespace Squidex.Areas.Api.Controllers.EventConsumers
@ -39,9 +38,9 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
{ {
var entities = await eventConsumerManagerGrain.GetConsumersAsync(); var entities = await eventConsumerManagerGrain.GetConsumersAsync();
var models = entities.Value.Select(x => SimpleMapper.Map(x, new EventConsumerDto())).ToList(); var response = entities.Value.Select(EventConsumerDto.FromEventConsumerInfo).ToList();
return Ok(models); return Ok(response);
} }
[HttpPut] [HttpPut]

8
src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs

@ -5,6 +5,9 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using Squidex.Infrastructure.EventSourcing;
using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.EventConsumers.Models namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
{ {
public sealed class EventConsumerDto public sealed class EventConsumerDto
@ -18,5 +21,10 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
public string Error { get; set; } public string Error { get; set; }
public string Position { get; set; } public string Position { get; set; }
public static EventConsumerDto FromEventConsumerInfo(EventConsumerInfo eventConsumerInfo)
{
return SimpleMapper.Map(eventConsumerInfo, new EventConsumerDto());
}
} }
} }

3
src/Squidex/Areas/Api/Controllers/History/HistoryController.cs

@ -12,7 +12,6 @@ using NSwag.Annotations;
using Squidex.Areas.Api.Controllers.History.Models; using Squidex.Areas.Api.Controllers.History.Models;
using Squidex.Domain.Apps.Entities.History.Repositories; using Squidex.Domain.Apps.Entities.History.Repositories;
using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Reflection;
using Squidex.Pipeline; using Squidex.Pipeline;
namespace Squidex.Areas.Api.Controllers.History namespace Squidex.Areas.Api.Controllers.History
@ -52,7 +51,7 @@ namespace Squidex.Areas.Api.Controllers.History
{ {
var entities = await historyEventRepository.QueryByChannelAsync(App.Id, channel, 100); var entities = await historyEventRepository.QueryByChannelAsync(App.Id, channel, 100);
var response = entities.Select(x => SimpleMapper.Map(x, new HistoryEventDto())).ToList(); var response = entities.Select(HistoryEventDto.FromHistoryEvent).ToList();
return Ok(response); return Ok(response);
} }

7
src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs

@ -8,6 +8,8 @@
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using NodaTime; using NodaTime;
using Squidex.Domain.Apps.Entities.History;
using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers.History.Models namespace Squidex.Areas.Api.Controllers.History.Models
{ {
@ -39,5 +41,10 @@ namespace Squidex.Areas.Api.Controllers.History.Models
/// The version identifier. /// The version identifier.
/// </summary> /// </summary>
public long Version { get; set; } public long Version { get; set; }
public static HistoryEventDto FromHistoryEvent(IHistoryEventEntity x)
{
return SimpleMapper.Map(x, new HistoryEventDto());
}
} }
} }

7
src/Squidex/Areas/Api/Controllers/LanguageDto.cs

@ -6,6 +6,8 @@
// ========================================================================== // ==========================================================================
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Squidex.Infrastructure;
using Squidex.Infrastructure.Reflection;
namespace Squidex.Areas.Api.Controllers namespace Squidex.Areas.Api.Controllers
{ {
@ -22,5 +24,10 @@ namespace Squidex.Areas.Api.Controllers
/// </summary> /// </summary>
[Required] [Required]
public string EnglishName { get; set; } public string EnglishName { get; set; }
public static LanguageDto FromLanguage(Language language)
{
return SimpleMapper.Map(language, new LanguageDto());
}
} }
} }

3
src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs

@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Mvc;
using NSwag.Annotations; using NSwag.Annotations;
using Squidex.Infrastructure; using Squidex.Infrastructure;
using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Reflection;
using Squidex.Pipeline; using Squidex.Pipeline;
namespace Squidex.Areas.Api.Controllers.Languages namespace Squidex.Areas.Api.Controllers.Languages
@ -43,7 +42,7 @@ namespace Squidex.Areas.Api.Controllers.Languages
[ApiCosts(0)] [ApiCosts(0)]
public IActionResult GetLanguages() public IActionResult GetLanguages()
{ {
var response = Language.AllLanguages.Select(x => SimpleMapper.Map(x, new LanguageDto())).ToList(); var response = Language.AllLanguages.Select(LanguageDto.FromLanguage).ToList();
return Ok(response); return Ok(response);
} }

Loading…
Cancel
Save