From df52b1068e16adc50ffd365e2e8b8ea19b59fac3 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Tue, 26 Jan 2021 11:44:41 +0200
Subject: UserUpdate does not allow updating roles if not admin; HTTP Put now
 works properly; UserUpdate validates properly

---
 .../Models/Identity/User/UpdateFriendServiceModel.cs              | 2 +-
 src/DevHive.Services/Models/Identity/User/UserServiceModel.cs     | 8 ++++----
 .../Models/Language/UpdateLanguageServiceModel.cs                 | 4 +++-
 .../Models/Technology/UpdateTechnologyServiceModel.cs             | 4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/DevHive.Services/Models')

diff --git a/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs
index 83fcc34..b0efe10 100644
--- a/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs
@@ -5,6 +5,6 @@ namespace DevHive.Services.Models.Identity.User
 	public class UpdateFriendServiceModel
 	{
 		public Guid Id { get; set; }
-		public string Name { get; set; }
+		public string UserName { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
index 3e41057..7da54b8 100644
--- a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
@@ -7,12 +7,12 @@ namespace DevHive.Services.Models.Identity.User
 {
 	public class UserServiceModel : BaseUserServiceModel
 	{
-		public HashSet<ReadRoleServiceModel> Roles { get; set; } = new HashSet<ReadRoleServiceModel>();
+		public HashSet<RoleServiceModel> Roles { get; set; } = new();
 
-		public HashSet<FriendServiceModel> Friends { get; set; } = new HashSet<FriendServiceModel>();
+		public HashSet<FriendServiceModel> Friends { get; set; } = new();
 
-		public HashSet<LanguageServiceModel> Languages { get; set; } = new HashSet<LanguageServiceModel>();
+		public HashSet<LanguageServiceModel> Languages { get; set; } = new();
 
-		public HashSet<TechnologyServiceModel> Technologies { get; set; } = new HashSet<TechnologyServiceModel>();
+		public HashSet<TechnologyServiceModel> Technologies { get; set; } = new();
 	}
 }
diff --git a/src/DevHive.Services/Models/Language/UpdateLanguageServiceModel.cs b/src/DevHive.Services/Models/Language/UpdateLanguageServiceModel.cs
index 8536693..84b7f27 100644
--- a/src/DevHive.Services/Models/Language/UpdateLanguageServiceModel.cs
+++ b/src/DevHive.Services/Models/Language/UpdateLanguageServiceModel.cs
@@ -2,8 +2,10 @@ using System;
 
 namespace DevHive.Services.Models.Language
 {
-	public class UpdateLanguageServiceModel : LanguageServiceModel
+	public class UpdateLanguageServiceModel
 	{
+		public Guid Id { get; set; }
+
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Technology/UpdateTechnologyServiceModel.cs b/src/DevHive.Services/Models/Technology/UpdateTechnologyServiceModel.cs
index a18e286..f4c7921 100644
--- a/src/DevHive.Services/Models/Technology/UpdateTechnologyServiceModel.cs
+++ b/src/DevHive.Services/Models/Technology/UpdateTechnologyServiceModel.cs
@@ -2,8 +2,10 @@ using System;
 
 namespace DevHive.Services.Models.Technology
 {
-	public class UpdateTechnologyServiceModel : TechnologyServiceModel
+	public class UpdateTechnologyServiceModel
 	{
+		public Guid Id { get; set; }
+
 		public string Name { get; set; }
 	}
 }
-- 
cgit v1.2.3