From 8e11fbaa79ad6fba234e8162c5b291174ed31fbb Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Tue, 12 Jan 2021 23:07:13 +0200
Subject: Fixed bugs with Lang features, User's GetById, Lang & User mappings;
 Added more UserService validations

---
 .../Configurations/Extensions/ConfigureDependencyInjection.cs         | 2 --
 src/DevHive.Web/Controllers/ErrorController.cs                        | 3 +++
 src/DevHive.Web/Controllers/UserController.cs                         | 2 ++
 src/DevHive.Web/Models/Identity/User/UserWebModel.cs                  | 4 ++++
 src/DevHive.Web/Models/Language/CreateLanguageWebModel.cs             | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/DevHive.Web')

diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
index cce5174..46b2591 100644
--- a/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
+++ b/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
@@ -20,8 +20,6 @@ namespace DevHive.Web.Configurations.Extensions
 			services.AddTransient<TechnologyService>();
 			services.AddTransient<UserService>();
 			services.AddTransient<PostService>();
-
-			System.Console.WriteLine(services.Count);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/DevHive.Web/Controllers/ErrorController.cs b/src/DevHive.Web/Controllers/ErrorController.cs
index 67a83fe..c3f1e55 100644
--- a/src/DevHive.Web/Controllers/ErrorController.cs
+++ b/src/DevHive.Web/Controllers/ErrorController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using AutoMapper;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -29,6 +30,8 @@ namespace DevHive.Web.Controllers
 			{
 				case ArgumentException _:
 				case InvalidOperationException _:
+				case AutoMapperMappingException _:
+				case AutoMapperConfigurationException _:
 					return MessageToObject(exception.Error.Message);
 				default:
 					return MessageToObject(null);
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index c222ba6..0960915 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -94,6 +94,7 @@ namespace DevHive.Web.Controllers
 		#endregion
 
 		#region Read
+
 		[HttpGet]
 		public async Task<IActionResult> GetById(Guid id, [FromHeader] string authorization)
 		{
@@ -135,6 +136,7 @@ namespace DevHive.Web.Controllers
 		#endregion
 
 		#region Delete
+
 		[HttpDelete]
 		public async Task<IActionResult> Delete(Guid id, [FromHeader] string authorization)
 		{
diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
index 37d6553..260d34c 100644
--- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using DevHive.Common.Models.Identity;
 using DevHive.Web.Models.Identity.Role;
+using DevHive.Web.Models.Language;
+using DevHive.Web.Models.Technology;
 
 namespace DevHive.Web.Models.Identity.User 
 {
@@ -8,5 +10,7 @@ namespace DevHive.Web.Models.Identity.User
 	{
 		public IList<RoleWebModel> Roles { get; set; } = new List<RoleWebModel>();
 		public IList<UserWebModel> Friends { get; set; } = new List<UserWebModel>();
+		public IList<LanguageWebModel> Languages { get; set; } = new List<LanguageWebModel>();
+		public IList<TechnologyWebModel> Technologies { get; set; } = new List<TechnologyWebModel>();
 	}
 }
diff --git a/src/DevHive.Web/Models/Language/CreateLanguageWebModel.cs b/src/DevHive.Web/Models/Language/CreateLanguageWebModel.cs
index 111beed..d261500 100644
--- a/src/DevHive.Web/Models/Language/CreateLanguageWebModel.cs
+++ b/src/DevHive.Web/Models/Language/CreateLanguageWebModel.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace DevHive.Web.Models.Language
 {
-	public class CreateLanguageWebModel : LanguageWebModel
+	public class CreateLanguageWebModel
 	{
 		public string Name { get; set; }
 	}
-- 
cgit v1.2.3