implement client and server service implementations in Html/Text module

This commit is contained in:
sbwalker
2024-03-05 08:44:09 -05:00
parent 7d7ea4c34b
commit 74952cf62d
11 changed files with 214 additions and 30 deletions

View File

@ -10,6 +10,8 @@ using System.Net;
using Oqtane.Documentation;
using System.Collections.Generic;
using System.Linq;
using Oqtane.Modules.HtmlText.Services;
using System.Threading.Tasks;
namespace Oqtane.Modules.HtmlText.Controllers
{
@ -17,21 +19,21 @@ namespace Oqtane.Modules.HtmlText.Controllers
[PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
public class HtmlTextController : ModuleControllerBase
{
private readonly IHtmlTextRepository _htmlText;
private readonly IHtmlTextService _htmlTextService;
public HtmlTextController(IHtmlTextRepository htmlText, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
public HtmlTextController(IHtmlTextService htmlTextService, ILogManager logger, IHttpContextAccessor accessor) : base(logger, accessor)
{
_htmlText = htmlText;
_htmlTextService = htmlTextService;
}
// GET: api/<controller>?moduleid=x
[HttpGet]
[Authorize(Roles = RoleNames.Registered)]
public IEnumerable<Models.HtmlText> Get(string moduleId)
public async Task<IEnumerable<Models.HtmlText>> Get(string moduleId)
{
if (int.TryParse(moduleId, out int ModuleId) && IsAuthorizedEntityId(EntityNames.Module, ModuleId))
{
return _htmlText.GetHtmlTexts(ModuleId);
return await _htmlTextService.GetHtmlTextsAsync(ModuleId);
}
else
{
@ -44,19 +46,11 @@ namespace Oqtane.Modules.HtmlText.Controllers
// GET api/<controller>/5
[HttpGet("{moduleId}")]
[Authorize(Policy = PolicyNames.ViewModule)]
public Models.HtmlText Get(int moduleId)
public async Task<Models.HtmlText> Get(int moduleId)
{
if (IsAuthorizedEntityId(EntityNames.Module, moduleId))
{
var htmltexts = _htmlText.GetHtmlTexts(moduleId);
if (htmltexts != null && htmltexts.Any())
{
return htmltexts.OrderByDescending(item => item.CreatedOn).First();
}
else
{
return null;
}
return await _htmlTextService.GetHtmlTextAsync(moduleId);
}
else
{
@ -69,11 +63,11 @@ namespace Oqtane.Modules.HtmlText.Controllers
// GET api/<controller>/5/6
[HttpGet("{id}/{moduleId}")]
[Authorize(Policy = PolicyNames.ViewModule)]
public Models.HtmlText Get(int id, int moduleId)
public async Task<Models.HtmlText> Get(int id, int moduleId)
{
if (IsAuthorizedEntityId(EntityNames.Module, moduleId))
{
return _htmlText.GetHtmlText(id);
return await _htmlTextService.GetHtmlTextAsync(id, moduleId);
}
else
{
@ -86,11 +80,11 @@ namespace Oqtane.Modules.HtmlText.Controllers
// POST api/<controller>
[HttpPost]
[Authorize(Policy = PolicyNames.EditModule)]
public Models.HtmlText Post([FromBody] Models.HtmlText htmlText)
public async Task<Models.HtmlText> Post([FromBody] Models.HtmlText htmlText)
{
if (ModelState.IsValid && IsAuthorizedEntityId(EntityNames.Module, htmlText.ModuleId))
{
htmlText = _htmlText.AddHtmlText(htmlText);
htmlText = await _htmlTextService.AddHtmlTextAsync(htmlText);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Html/Text Added {HtmlText}", htmlText);
return htmlText;
}
@ -105,11 +99,11 @@ namespace Oqtane.Modules.HtmlText.Controllers
// DELETE api/<controller>/5
[HttpDelete("{id}/{moduleId}")]
[Authorize(Policy = PolicyNames.EditModule)]
public void Delete(int id, int moduleId)
public async Task Delete(int id, int moduleId)
{
if (IsAuthorizedEntityId(EntityNames.Module, moduleId))
{
_htmlText.DeleteHtmlText(id);
await _htmlTextService.DeleteHtmlTextAsync(id, moduleId);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id);
}
else