Newsbot.Collector.Api/Controllers/ArticlesController.cs

@@ -1,60 +0,0 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using Newsbot.Collector.Domain.Dto;
-using Newsbot.Collector.Domain.Interfaces;
-using Newsbot.Collector.Domain.Models;
-
-namespace Newsbot.Collector.Api.Controllers;
-
-[ApiController]
-[Route("api/articles")]
-[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
-public class ArticlesController : ControllerBase
-{
-    private readonly ILogger<ArticlesController> _logger;
-    private readonly IArticlesRepository _articles;
-    private readonly ISourcesRepository _sources;
-
-    public ArticlesController(ILogger<ArticlesController> logger, IArticlesRepository articles, ISourcesRepository sources)
-    {
-        _logger = logger;
-        _articles = articles;
-        _sources = sources;
-    }
-
-    [HttpGet(Name = "GetArticles")]
-    public IEnumerable<ArticleDto> Get()
-    {
-        var res = new List<ArticleDto>();
-        var items = _articles.List(0, 25);
-        foreach (var item in items) res.Add(ArticleDto.Convert(item));
-        return res;
-    }
-
-    [HttpGet("{id:guid}")]
-    [EndpointDescription("Returns the article based on the Id value given.")]
-    public ArticleDto GetById(Guid id)
-    {
-        var item = _articles.GetById(id);
-        return ArticleDto.Convert(item);
-    }
-
-    [HttpGet("{id:guid}/details")]
-    public ArticleDetailsDto GetDetailsById(Guid id)
-    {
-        var item = _articles.GetById(id);
-        var sourceItem = _sources.GetById(item.SourceId);
-        return ArticleDetailsDto.Convert(item, sourceItem);
-    }
-
-    [HttpGet("by/{sourceId:guid}")]
-    public IEnumerable<ArticleDto> GetBySourceId(Guid sourceId, int page = 0, int count = 25)
-    {
-        var res = new List<ArticleDto>();
-        var items = _articles.ListBySourceId(sourceId, page, count);
-        foreach (var item in items) res.Add(ArticleDto.Convert(item));
-        return res;
-    }
-}

Newsbot.Collector.Api/Controllers/v1/ArticlesController.cs

@@ -0,0 +1,84 @@
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Newsbot.Collector.Domain.Dto;
+using Newsbot.Collector.Domain.Interfaces;
+using Newsbot.Collector.Domain.Results;
+
+namespace Newsbot.Collector.Api.Controllers.v1;
+
+[ApiController]
+[Route("api/v1/articles")]
+[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
+public class ArticlesController : ControllerBase
+{
+    //private readonly ILogger<ArticlesController> _logger;
+    private readonly IArticlesRepository _articles;
+    private readonly ISourcesRepository _sources;
+
+    public ArticlesController(IArticlesRepository articles, ISourcesRepository sources)
+    {
+        _articles = articles;
+        _sources = sources;
+    }
+
+    [HttpGet(Name = "GetArticles")]
+    public ActionResult<ArticleResult> Get()
+    {
+        var res = new List<ArticleDto>();
+        var items = _articles.List(0);
+        foreach (var item in items)
+        {
+            res.Add(ArticleDto.Convert(item));
+        }
+        
+        return new OkObjectResult(new ArticleResult
+        {
+            IsSuccessful = true,
+            Items = res
+        });
+    }
+
+    [HttpGet("{id:guid}")]
+    [EndpointDescription("Returns the article based on the Id value given.")]
+    public ActionResult<ArticleResult>  GetById(Guid id)
+    {
+        var item = _articles.GetById(id);
+        return new OkObjectResult(new ArticleResult
+        {
+            IsSuccessful = true,
+            Items = new List<ArticleDto>
+            {
+                ArticleDto.Convert(item)
+            } 
+        });
+    }
+
+    [HttpGet("{id:guid}/details")]
+    public ActionResult<ArticleDetailsResult> GetDetailsById(Guid id)
+    {
+        var item = _articles.GetById(id);
+        var sourceItem = _sources.GetById(item.SourceId);
+        
+        return new OkObjectResult(new ArticleDetailsResult
+        {
+            IsSuccessful = true,
+            Item = ArticleDetailsDto.Convert(item, sourceItem)
+        });
+    }
+
+    [HttpGet("by/{sourceId:guid}")]
+    public ActionResult<ArticleResult> GetBySourceId(Guid sourceId, int page = 0)
+    {
+        var res = new List<ArticleDto>();
+        var items = _articles.ListBySourceId(sourceId, page);
+        foreach (var item in items) res.Add(ArticleDto.Convert(item));
+
+        return new OkObjectResult(new ArticleResult
+        {
+            IsSuccessful = true,
+            Items = res
+        });
+        
+    }
+}

Newsbot.Collector.Domain/Interfaces/IArticlesRepository.cs

@@ -5,7 +5,7 @@ namespace Newsbot.Collector.Domain.Interfaces;
 
 public interface IArticlesRepository : ITableRepository
 {
-    List<ArticlesEntity> List(int page, int count);
+    List<ArticlesEntity> List(int page, int count = 25);
     List<ArticlesEntity> ListBySourceId(Guid id, int page = 0, int count = 25);
     ArticlesEntity GetById(Guid id);
     ArticlesEntity GetByUrl(string url);

Newsbot.Collector.Domain/Results/ArticleDetailsResult.cs

@@ -0,0 +1,8 @@
+using Newsbot.Collector.Domain.Dto;
+
+namespace Newsbot.Collector.Domain.Results;
+
+public class ArticleDetailsResult : BaseResult
+{
+    public ArticleDetailsDto? Item { get; set; }
+}

Newsbot.Collector.Domain/Results/ArticleResult.cs

@@ -0,0 +1,8 @@
+using Newsbot.Collector.Domain.Dto;
+
+namespace Newsbot.Collector.Domain.Results;
+
+public class ArticleResult : BaseResult
+{
+    public IEnumerable<ArticleDto>? Items { get; set; }
+}

Newsbot.Collector.Domain/Results/BaseResult.cs

@@ -0,0 +1,7 @@
+namespace Newsbot.Collector.Domain.Results;
+
+public class BaseResult
+{
+    public bool IsSuccessful { get; set; }
+    public IEnumerable<string>? ErrorMessage { get; set; }
+}