Skip to content
Snippets Groups Projects

Changes to API

Merged Matej Vavrek requested to merge api-fixes into Milestone-2
36 files
+ 215
344
Compare changes
  • Side-by-side
  • Inline
Files
36
@@ -3,10 +3,11 @@ using BusinessLayer.DTOs.EventComment;
@@ -3,10 +3,11 @@ using BusinessLayer.DTOs.EventComment;
using BusinessLayer.Services.EventCommentService;
using BusinessLayer.Services.EventCommentService;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using BusinessLayer.Utils.Filters;
using BusinessLayer.Utils.Filters;
 
using Mapster;
namespace Api.Controllers
namespace Api.Controllers
{
{
[Route("/[controller]")]
[Route("/api/[controller]")]
[ApiController]
[ApiController]
public class EventCommentController : Controller
public class EventCommentController : Controller
{
{
@@ -26,13 +27,16 @@ namespace Api.Controllers
@@ -26,13 +27,16 @@ namespace Api.Controllers
return NotFound();
return NotFound();
}
}
return Ok(comment);
return Ok(comment.Adapt<EventCommentModel>());
}
}
[HttpGet]
[HttpGet]
public async Task<IActionResult> GetEventComments([FromQuery] EventCommentFilter filter, [FromQuery] int limit = 0, [FromQuery] int offset = 0)
public async Task<IActionResult> GetEventComments([FromQuery] EventCommentFilter filter, [FromQuery] int limit = 0, [FromQuery] int offset = 0)
{
{
var comments = await _eventCommentService.GetCommentsAsync(filter, limit, offset, includeUser: true, includeEvent: true, includeChildren: true);
var comments = (await _eventCommentService
 
.GetCommentsAsync(filter, limit, offset, includeUser: true, includeEvent: true, includeChildren: true))
 
.Select(c => c.Adapt<EventCommentModel>())
 
.ToList();
return Ok(comments);
return Ok(comments);
}
}
@@ -53,7 +57,10 @@ namespace Api.Controllers
@@ -53,7 +57,10 @@ namespace Api.Controllers
return NotFound("Poster or Event not found, or parent comment does not exist.");
return NotFound("Poster or Event not found, or parent comment does not exist.");
}
}
return CreatedAtAction(nameof(GetEventCommentById), new { commentId = result.Id }, result);
return CreatedAtAction(
 
nameof(GetEventCommentById),
 
new { commentId = result.Id },
 
result.Adapt<EventCommentModel>());
}
}
[HttpPatch("{commentId:guid}")]
[HttpPatch("{commentId:guid}")]
@@ -70,7 +77,7 @@ namespace Api.Controllers
@@ -70,7 +77,7 @@ namespace Api.Controllers
return NotFound();
return NotFound();
}
}
return Ok(result);
return Ok(result.Adapt<EventCommentModel>());
}
}
[HttpDelete("{commentId:guid}")]
[HttpDelete("{commentId:guid}")]
Loading