Lang layer working

9 files changed, 25 insertions, 10 deletions

diff --git a/src/DevHive.Services/Configurations/Mapping/LanguageMappings.cs b/src/DevHive.Services/Configurations/Mapping/LanguageMappings.cs
index e483fff..9c572df 100644
--- a/src/DevHive.Services/Configurations/Mapping/LanguageMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/LanguageMappings.cs
@@ -9,12 +9,14 @@ namespace DevHive.Services.Configurations.Mapping
 		public LanguageMappings()
 		{
 			CreateMap<LanguageServiceModel, Language>();
+			CreateMap<ReadLanguageServiceModel, Language>();
 			CreateMap<CreateLanguageServiceModel, Language>();
 			CreateMap<UpdateLanguageServiceModel, Language>();
 
 			CreateMap<Language, LanguageServiceModel>();
+			CreateMap<Language, ReadLanguageServiceModel>();
 			CreateMap<Language, CreateLanguageServiceModel>();
 			CreateMap<Language, UpdateLanguageServiceModel>();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/DevHive.Services/Interfaces/ILanguageService.cs b/src/DevHive.Services/Interfaces/ILanguageService.cs
index 1b39dfb..4d16ea3 100644
--- a/src/DevHive.Services/Interfaces/ILanguageService.cs
+++ b/src/DevHive.Services/Interfaces/ILanguageService.cs
@@ -8,7 +8,7 @@ namespace DevHive.Services.Interfaces
 	{
 		Task<bool> CreateLanguage(CreateLanguageServiceModel createLanguageServiceModel);
 
-		Task<LanguageServiceModel> GetLanguageById(Guid id);
+		Task<ReadLanguageServiceModel> GetLanguageById(Guid id);
 
 		Task<bool> UpdateLanguage(UpdateLanguageServiceModel languageServiceModel);
 
diff --git a/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs b/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs
new file mode 100644
index 0000000..653444e
--- /dev/null
+++ b/src/DevHive.Services/Models/Language/ReadLanguageServiceModel.cs
@@ -0,0 +1,7 @@
+namespace DevHive.Services.Models.Language
+{
+	public class ReadLanguageServiceModel
+	{
+		public string Name { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Services/LanguageService.cs b/src/DevHive.Services/Services/LanguageService.cs
index 12e230e..f457a31 100644
--- a/src/DevHive.Services/Services/LanguageService.cs
+++ b/src/DevHive.Services/Services/LanguageService.cs
@@ -35,14 +35,14 @@ namespace DevHive.Services.Services
 
 		#region Read
 
-		public async Task<LanguageServiceModel> GetLanguageById(Guid id)
+		public async Task<ReadLanguageServiceModel> GetLanguageById(Guid id)
 		{
 			Language language = await this._languageRepository.GetByIdAsync(id);
 
 			if (language == null)
 				throw new ArgumentException("The language does not exist");
 
-			return this._languageMapper.Map<LanguageServiceModel>(language);
+			return this._languageMapper.Map<ReadLanguageServiceModel>(language);
 		}
 		#endregion
 
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs
index cbcb6b3..1dc1bd5 100644
--- a/src/DevHive.Services/Services/UserService.cs
+++ b/src/DevHive.Services/Services/UserService.cs
@@ -11,10 +11,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Collections.Generic;
 using DevHive.Common.Models.Identity;
-using DevHive.Services.Models.Language;
 using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Technology;
-using DevHive.Data.Repositories;
 using DevHive.Data.Interfaces.Repositories;
 
 namespace DevHive.Services.Services
diff --git a/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs b/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
index 3c2a4d0..8cac3ca 100644
--- a/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
@@ -9,10 +9,12 @@ namespace DevHive.Web.Configurations.Mapping
 		public LanguageMappings()
 		{
 			CreateMap<LanguageWebModel, LanguageServiceModel>();
+			CreateMap<ReadLanguageWebModel, ReadLanguageServiceModel>();
 			CreateMap<CreateLanguageWebModel, CreateLanguageServiceModel>();
 			CreateMap<UpdateLanguageWebModel, UpdateLanguageServiceModel>();
 
 			CreateMap<LanguageServiceModel, LanguageWebModel>();
+			CreateMap<ReadLanguageServiceModel, ReadLanguageWebModel>();
 			CreateMap<CreateLanguageServiceModel, CreateLanguageWebModel>();
 			CreateMap<UpdateLanguageServiceModel, UpdateLanguageWebModel>();
 		}
diff --git a/src/DevHive.Web/Controllers/LanguageController.cs b/src/DevHive.Web/Controllers/LanguageController.cs
index 784e535..bbac409 100644
--- a/src/DevHive.Web/Controllers/LanguageController.cs
+++ b/src/DevHive.Web/Controllers/LanguageController.cs
@@ -37,8 +37,8 @@ namespace DevHive.Web.Controllers
 		[HttpGet]
 		public async Task<IActionResult> GetById(Guid id)
 		{
-			LanguageServiceModel languageServiceModel = await this._languageService.GetLanguageById(id);
-			LanguageWebModel languageWebModel = this._languageMapper.Map<LanguageWebModel>(languageServiceModel);
+			ReadLanguageServiceModel languageServiceModel = await this._languageService.GetLanguageById(id);
+			ReadLanguageWebModel languageWebModel = this._languageMapper.Map<ReadLanguageWebModel>(languageServiceModel);
 
 			return new OkObjectResult(languageWebModel);
 		}
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index 8d48705..bba55e8 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -72,7 +72,7 @@ namespace DevHive.Web.Controllers
 		}
 
 		[HttpGet]
-		[Route("GetAFriend")]
+		[Route("GetFriend")]
 		[AllowAnonymous]
 		public async Task<IActionResult> GetAFriend(string username)
 		{
diff --git a/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs b/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs
new file mode 100644
index 0000000..f1e0ecc
--- /dev/null
+++ b/src/DevHive.Web/Models/Language/ReadLanguageWebModel.cs
@@ -0,0 +1,7 @@
+namespace DevHive.Web.Models.Language
+{
+	public class ReadLanguageWebModel
+	{
+		public string Name { get; set; }
+	}
+}