From 875857f118d0364a94eb88bf03673e1d0165c23c Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Thu, 17 Dec 2020 19:42:45 +0200
Subject: Fixed namespaces

---
 src/DevHive.Services/Configurations/Mapping/RoleMapings.cs    |  6 +++---
 src/DevHive.Services/Models/Identity/User/UserServiceModel.cs |  2 --
 src/DevHive.Services/Services/RoleService.cs                  | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/DevHive.Services')

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!");
-- 
cgit v1.2.3