Fixed namespaces

7 files changed, 25 insertions, 28 deletions

diff --git a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
index 25b314a..db4473e 100644
--- a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
@@ -1,6 +1,6 @@
 using DevHive.Data.Models;
 using AutoMapper;
-using DevHive.Services.Models.Identity.Role;
+using DevHive.Common.Models.Identity;
 
 namespace DevHive.Services.Configurations.Mapping
 {
@@ -8,8 +8,8 @@ namespace DevHive.Services.Configurations.Mapping
 	{
 		public RoleMappings()
 		{
-			CreateMap<RoleServiceModel, Role>();
-			CreateMap<Role, RoleServiceModel>();
+			CreateMap<RoleModel, Role>();
+			CreateMap<Role, RoleModel>();
 		}
 	} 
 }
diff --git a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
index 8ac71b1..de57faf 100644
--- a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using DevHive.Common.Models.Identity;
-using DevHive.Data.Models;
-using DevHive.Services.Models.Identity.Role;
 
 namespace DevHive.Services.Models.Identity.User
 {
diff --git a/src/DevHive.Services/Services/RoleService.cs b/src/DevHive.Services/Services/RoleService.cs
index d5c1848..c0b9062 100644
--- a/src/DevHive.Services/Services/RoleService.cs
+++ b/src/DevHive.Services/Services/RoleService.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using AutoMapper;
+using DevHive.Common.Models.Identity;
 using DevHive.Data.Models;
 using DevHive.Data.Repositories;
-using DevHive.Services.Models.Identity.Role;
 
 namespace DevHive.Services.Services
 {
@@ -18,7 +18,7 @@ namespace DevHive.Services.Services
 			this._roleMapper = mapper;
 		}
 
-		public async Task<bool> CreateRole(RoleServiceModel roleServiceModel)
+		public async Task<bool> CreateRole(RoleModel roleServiceModel)
 		{
 			if (await this._roleRepository.DoesNameExist(roleServiceModel.Name))
 				throw new ArgumentException("Role already exists!");
@@ -28,15 +28,15 @@ namespace DevHive.Services.Services
 			return await this._roleRepository.AddAsync(role);
 		}
 
-		public async Task<RoleServiceModel> GetRoleById(Guid id)
+		public async Task<RoleModel> GetRoleById(Guid id)
 		{
 			Role role = await this._roleRepository.GetByIdAsync(id) 
 				?? throw new ArgumentException("Role does not exist!");
 
-			return this._roleMapper.Map<RoleServiceModel>(role);
+			return this._roleMapper.Map<RoleModel>(role);
 		}
 
-		public async Task<bool> UpdateRole(RoleServiceModel roleServiceModel)
+		public async Task<bool> UpdateRole(RoleModel roleServiceModel)
 		{
 			if (!await this._roleRepository.DoesRoleExist(roleServiceModel.Id))
 				throw new ArgumentException("Role does not exist!");
diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index 4bc25c4..8c5cd85 100644
--- a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using DevHive.Web.Models.Identity.Role;
-using DevHive.Services.Models.Identity.Role;
+using DevHive.Common.Models.Identity;
 
 namespace DevHive.Web.Configurations.Mapping
 {
@@ -8,11 +8,11 @@ namespace DevHive.Web.Configurations.Mapping
 	{
 		public RoleMappings()
 		{
-			CreateMap<CreateRoleWebModel, RoleServiceModel>();
-			CreateMap<UpdateRoleWebModel, RoleServiceModel>();
+			CreateMap<CreateRoleModel, RoleModel>();
+			CreateMap<UpdateRoleModel, RoleModel>();
 			
-			CreateMap<RoleServiceModel, RoleWebModel>();
-			CreateMap<RoleWebModel, RoleServiceModel>();
+			CreateMap<RoleModel, RoleModel>();
+			CreateMap<RoleModel, RoleModel>();
 		}
 	} 
 }
diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index 1664f4f..fc05481 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -4,13 +4,12 @@ using DevHive.Services.Services;
 using Microsoft.AspNetCore.Mvc;
 using DevHive.Web.Models.Identity.Role;
 using AutoMapper;
-using DevHive.Services.Models.Identity.Role;
 using System;
-using Microsoft.AspNetCore.Authorization;
+using DevHive.Common.Models.Identity;
 
 namespace DevHive.Web.Controllers
 {
-    [ApiController]
+	[ApiController]
 	[Route("/api/[controller]")]
 	//[Authorize(Roles = "Admin")]
 	public class RoleController
@@ -25,10 +24,10 @@ namespace DevHive.Web.Controllers
 		}
 
 		[HttpPost]
-		public async Task<IActionResult> Create([FromBody] CreateRoleWebModel createRoleWebModel)
+		public async Task<IActionResult> Create([FromBody] CreateRoleModel createRoleModel)
 		{
-			RoleServiceModel roleServiceModel = 
-				this._roleMapper.Map<RoleServiceModel>(createRoleWebModel); 
+			RoleModel roleServiceModel = 
+				this._roleMapper.Map<RoleModel>(createRoleModel); 
 			
 			bool result = await this._roleService.CreateRole(roleServiceModel);
 
@@ -41,17 +40,17 @@ namespace DevHive.Web.Controllers
 		[HttpGet]
 		public async Task<IActionResult> GetById(Guid id)
 		{
-			RoleServiceModel roleServiceModel = await this._roleService.GetRoleById(id);
-			RoleWebModel roleWebModel = this._roleMapper.Map<RoleWebModel>(roleServiceModel);
+			RoleModel roleServiceModel = await this._roleService.GetRoleById(id);
+			RoleModel roleWebModel = this._roleMapper.Map<RoleModel>(roleServiceModel);
 
 			return new OkObjectResult(roleWebModel);
 		}
 
 		[HttpPut]
-		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateRoleWebModel updateRoleWebModel)
+		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateRoleModel updateRoleModel)
 		{
-			RoleServiceModel roleServiceModel = 
-				this._roleMapper.Map<RoleServiceModel>(updateRoleWebModel);
+			RoleModel roleServiceModel = 
+				this._roleMapper.Map<RoleModel>(updateRoleModel);
 			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 e872428..becb3c9 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 CreateRoleWebModel
+	public class CreateRoleModel
 	{
 		public string Name { get; set; }
 	}
diff --git a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
index 213ec55..1eaad57 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 UpdateRoleWebModel : CreateRoleWebModel
+	public class UpdateRoleModel : CreateRoleModel
 	{
 	}
 }