Refactored repository pattern for Add and Update methods so that they return their respective entity objects

This commit is contained in:
Shaun Walker
2019-08-05 09:31:04 -04:00
parent b9c007998e
commit 4fda7b17d0
43 changed files with 353 additions and 137 deletions

View File

@ -31,18 +31,24 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public void Post([FromBody] Alias alias)
public Alias Post([FromBody] Alias Alias)
{
if (ModelState.IsValid)
aliases.AddAlias(alias);
{
Alias = aliases.AddAlias(Alias);
}
return Alias;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] Alias alias)
public Alias Put(int id, [FromBody] Alias Alias)
{
if (ModelState.IsValid)
aliases.UpdateAlias(alias);
{
Alias = aliases.UpdateAlias(Alias);
}
return Alias;
}
// DELETE api/<controller>/5

View File

@ -53,18 +53,24 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public void Post([FromBody] Module Module)
public Module Post([FromBody] Module Module)
{
if (ModelState.IsValid)
modules.AddModule(Module);
{
Module = modules.AddModule(Module);
}
return Module;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] Module Module)
public Module Put(int id, [FromBody] Module Module)
{
if (ModelState.IsValid)
modules.UpdateModule(Module);
{
Module = modules.UpdateModule(Module);
}
return Module;
}
// DELETE api/<controller>/5

View File

@ -38,18 +38,24 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public void Post([FromBody] Page Page)
public Page Post([FromBody] Page Page)
{
if (ModelState.IsValid)
pages.AddPage(Page);
{
Page = pages.AddPage(Page);
}
return Page;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] Page Page)
public Page Put(int id, [FromBody] Page Page)
{
if (ModelState.IsValid)
pages.UpdatePage(Page);
{
Page = pages.UpdatePage(Page);
}
return Page;
}
// DELETE api/<controller>/5

View File

@ -31,18 +31,24 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public void Post([FromBody] PageModule PageModule)
public PageModule Post([FromBody] PageModule PageModule)
{
if (ModelState.IsValid)
pagemodules.AddPageModule(PageModule);
{
PageModule = pagemodules.AddPageModule(PageModule);
}
return PageModule;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] PageModule PageModule)
public PageModule Put(int id, [FromBody] PageModule PageModule)
{
if (ModelState.IsValid)
pagemodules.UpdatePageModule(PageModule);
{
PageModule = pagemodules.UpdatePageModule(PageModule);
}
return PageModule;
}
// DELETE api/<controller>/5

View File

@ -31,18 +31,24 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public void Post([FromBody] Site site)
public Site Post([FromBody] Site Site)
{
if (ModelState.IsValid)
sites.AddSite(site);
{
Site = sites.AddSite(Site);
}
return Site;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] Site site)
public Site Put(int id, [FromBody] Site Site)
{
if (ModelState.IsValid)
sites.UpdateSite(site);
{
Site = sites.UpdateSite(Site);
}
return Site;
}
// DELETE api/<controller>/5

View File

@ -31,18 +31,24 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public void Post([FromBody] Tenant site)
public Tenant Post([FromBody] Tenant Tenant)
{
if (ModelState.IsValid)
tenants.AddTenant(site);
{
Tenant = tenants.AddTenant(Tenant);
}
return Tenant;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] Tenant site)
public Tenant Put(int id, [FromBody] Tenant Tenant)
{
if (ModelState.IsValid)
tenants.UpdateTenant(site);
{
Tenant = tenants.UpdateTenant(Tenant);
}
return Tenant;
}
// DELETE api/<controller>/5

View File

@ -4,8 +4,6 @@ using Oqtane.Repository;
using Oqtane.Models;
using Microsoft.AspNetCore.Identity;
using System.Threading.Tasks;
using Microsoft.Extensions.Primitives;
using System.Security.Claims;
namespace Oqtane.Controllers
{
@ -39,33 +37,35 @@ namespace Oqtane.Controllers
// POST api/<controller>
[HttpPost]
public async Task Post([FromBody] User user)
public async Task<User> Post([FromBody] User User)
{
if (ModelState.IsValid)
{
IdentityUser identityuser = await identityUserManager.FindByNameAsync(user.Username);
IdentityUser identityuser = await identityUserManager.FindByNameAsync(User.Username);
if (identityuser == null)
{
identityuser = new IdentityUser();
identityuser.UserName = user.Username;
identityuser.Email = user.Username;
var result = await identityUserManager.CreateAsync(identityuser, user.Password);
identityuser.UserName = User.Username;
identityuser.Email = User.Username;
var result = await identityUserManager.CreateAsync(identityuser, User.Password);
if (result.Succeeded)
{
users.AddUser(user);
User = users.AddUser(User);
}
}
}
return User;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public void Put(int id, [FromBody] User user)
public User Put(int id, [FromBody] User User)
{
if (ModelState.IsValid)
{
users.UpdateUser(user);
User = users.UpdateUser(User);
}
return User;
}
// DELETE api/<controller>/5