From aa4f7bdd9a2df09fc47e82c2b85fb7647203ba8d Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Tue, 19 Jan 2021 23:01:33 +0200
Subject: Config ExceptionMiddleware; Config Mapper; Fixed User editing;
 Implmeneted Friend add trough HttpPatch

---
 .../Extensions/ConfigureCustomMiddleware.cs              | 16 ----------------
 .../Extensions/ConfigureExceptionHandlerMiddleware.cs    | 16 ++++++++++++++++
 src/DevHive.Web/Configurations/Mapping/UserMappings.cs   |  3 +++
 src/DevHive.Web/Models/Identity/User/UserWebModel.cs     |  2 +-
 src/DevHive.Web/Startup.cs                               |  4 ++--
 5 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 src/DevHive.Web/Configurations/Extensions/ConfigureCustomMiddleware.cs
 create mode 100644 src/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs

(limited to 'src/DevHive.Web')

diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureCustomMiddleware.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureCustomMiddleware.cs
deleted file mode 100644
index efcb8e1..0000000
--- a/src/DevHive.Web/Configurations/Extensions/ConfigureCustomMiddleware.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using DevHive.Web.Middleware;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace DevHive.Web.Configurations.Extensions
-{
-	public static class ConfigureCustomMiddleware
-	{
-		public static void CustomMiddlewareConfiguration(this IServiceCollection services) { }
-
-		public static void UseCustomMiddlewareConfiguration(this IApplicationBuilder app)
-		{
-			app.UseMiddleware<ExceptionMiddleware>();
-		}
-	}
-}
diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs
new file mode 100644
index 0000000..286727f
--- /dev/null
+++ b/src/DevHive.Web/Configurations/Extensions/ConfigureExceptionHandlerMiddleware.cs
@@ -0,0 +1,16 @@
+using DevHive.Web.Middleware;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DevHive.Web.Configurations.Extensions
+{
+	public static class ConfigureExceptionHandlerMiddleware
+	{
+		public static void ExceptionHandlerMiddlewareConfiguration(this IServiceCollection services) { }
+
+		public static void UseExceptionHandlerMiddlewareConfiguration(this IApplicationBuilder app)
+		{
+			app.UseMiddleware<ExceptionMiddleware>();
+		}
+	}
+}
diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
index beb9607..5faf4b5 100644
--- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -20,6 +20,9 @@ namespace DevHive.Web.Configurations.Mapping
 
 			CreateMap<TokenModel, TokenWebModel>();
 
+			CreateMap<FriendWebModel, FriendServiceModel>();
+			CreateMap<FriendServiceModel, FriendWebModel>();
+
 			CreateMap<FriendWebModel, UpdateUserCollectionServiceModel>()
 				.ForMember(f => f.Name, u => u.MapFrom(src => src.UserName));
 			CreateMap<UpdateLanguageWebModel, UpdateUserCollectionServiceModel>();
diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
index 88f199d..1d2d17b 100644
--- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
@@ -15,7 +15,7 @@ namespace DevHive.Web.Models.Identity.User
 
 		[NotNull]
 		[Required]
-		public IList<UserWebModel> Friends { get; set; } = new List<UserWebModel>();
+		public IList<FriendWebModel> Friends { get; set; } = new List<FriendWebModel>();
 
 		[NotNull]
 		[Required]
diff --git a/src/DevHive.Web/Startup.cs b/src/DevHive.Web/Startup.cs
index 8fa346a..92d4359 100644
--- a/src/DevHive.Web/Startup.cs
+++ b/src/DevHive.Web/Startup.cs
@@ -33,7 +33,7 @@ namespace DevHive.Web
 			services.JWTConfiguration(Configuration);
 			services.AutoMapperConfiguration();
 			services.DependencyInjectionConfiguration();
-			services.CustomMiddlewareConfiguration();
+			services.ExceptionHandlerMiddlewareConfiguration();
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -53,11 +53,11 @@ namespace DevHive.Web
 			else
 			{
 				app.UseHsts();
+				app.UseExceptionHandlerMiddlewareConfiguration();
 			}
 
 			app.UseDatabaseConfiguration();
 			app.UseAutoMapperConfiguration();
-			app.UseCustomMiddlewareConfiguration();
 
 			app.UseEndpoints(endpoints =>
 			{
-- 
cgit v1.2.3