Fixed role implementation by bringing back and improving all role models

5 files changed, 22 insertions, 24 deletions

diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index afa3a94..bce7c07 100644
--- a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -1,18 +1,18 @@
 using AutoMapper;
 using DevHive.Web.Models.Identity.Role;
-using DevHive.Common.Models.Identity;
+using DevHive.Services.Models.Identity.Role;
 
 namespace DevHive.Web.Configurations.Mapping
 {
-	public class RoleMappings : Profile
+    public class RoleMappings : Profile
 	{
 		public RoleMappings()
 		{
-			CreateMap<CreateRoleModel, RoleModel>();
-			CreateMap<UpdateRoleModel, RoleModel>();
+			CreateMap<CreateRoleWebModel, RoleServiceModel>();
+			CreateMap<UpdateRoleWebModel, RoleServiceModel>();
 
-			CreateMap<RoleModel, RoleWebModel>();
-			CreateMap<RoleWebModel, RoleModel>();
+			CreateMap<RoleServiceModel, RoleWebModel>();
+			CreateMap<RoleWebModel, RoleServiceModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index 8ea2711..5b3dca5 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -3,12 +3,12 @@ using Microsoft.AspNetCore.Mvc;
 using DevHive.Web.Models.Identity.Role;
 using AutoMapper;
 using System;
-using DevHive.Common.Models.Identity;
 using DevHive.Services.Interfaces;
+using DevHive.Services.Models.Identity.Role;
 
 namespace DevHive.Web.Controllers
 {
-	[ApiController]
+    [ApiController]
 	[Route("/api/[controller]")]
 	//[Authorize(Roles = "Admin")]
 	public class RoleController
@@ -23,33 +23,33 @@ namespace DevHive.Web.Controllers
 		}
 
 		[HttpPost]
-		public async Task<IActionResult> Create([FromBody] CreateRoleModel createRoleModel)
+		public async Task<IActionResult> Create([FromBody] CreateRoleWebModel createRoleWebModel)
 		{
-			RoleModel roleServiceModel =
-				this._roleMapper.Map<RoleModel>(createRoleModel);
+			RoleServiceModel roleServiceModel =
+				this._roleMapper.Map<RoleServiceModel>(createRoleWebModel);
 
-			bool result = await this._roleService.CreateRole(roleServiceModel);
+			Guid id = await this._roleService.CreateRole(roleServiceModel);
 
-			if (!result)
-				return new BadRequestObjectResult("Could not create role!");
+			return id == Guid.Empty ?
+				new BadRequestObjectResult($"Could not create role {createRoleWebModel.Name}") :
+				new OkObjectResult(new { Id = id });
 
-			return new OkResult();
 		}
 
 		[HttpGet]
 		public async Task<IActionResult> GetById(Guid id)
 		{
-			RoleModel roleServiceModel = await this._roleService.GetRoleById(id);
-			RoleModel roleWebModel = this._roleMapper.Map<RoleModel>(roleServiceModel);
+			RoleServiceModel roleServiceModel = await this._roleService.GetRoleById(id);
+			RoleWebModel roleWebModel = this._roleMapper.Map<RoleWebModel>(roleServiceModel);
 
 			return new OkObjectResult(roleWebModel);
 		}
 
 		[HttpPut]
-		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateRoleModel updateRoleModel)
+		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateRoleWebModel updateRoleWebModel)
 		{
-			RoleModel roleServiceModel =
-				this._roleMapper.Map<RoleModel>(updateRoleModel);
+			RoleServiceModel roleServiceModel =
+				this._roleMapper.Map<RoleServiceModel>(updateRoleWebModel);
 			roleServiceModel.Id = id;
 
 			bool result = await this._roleService.UpdateRole(roleServiceModel);
diff --git a/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs
index becb3c9..e872428 100644
--- a/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs
@@ -1,6 +1,6 @@
 namespace DevHive.Web.Models.Identity.Role
 {
-	public class CreateRoleModel
+	public class CreateRoleWebModel
 	{
 		public string Name { get; set; }
 	}
diff --git a/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
index 9e97ffc..41ade23 100644
--- a/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace DevHive.Web.Models.Identity.Role
 {
 	public class RoleWebModel
diff --git a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
index 1eaad57..213ec55 100644
--- a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
@@ -1,6 +1,6 @@
 namespace DevHive.Web.Models.Identity.Role
 {
-	public class UpdateRoleModel : CreateRoleModel
+	public class UpdateRoleWebModel : CreateRoleWebModel
 	{
 	}
 }