Merge branch 'refactor_user_updating' into dev

12 files changed, 100 insertions, 75 deletions

diff --git a/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs
index becb3c9..859cdd9 100644
--- a/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/CreateRoleWebModel.cs
@@ -1,7 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
 namespace DevHive.Web.Models.Identity.Role
 {
-	public class CreateRoleModel
+	public class CreateRoleWebModel
 	{
+		[NotNull]
+		[Required]
+		[MinLength(3)]
+		[MaxLength(50)]
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
index 9e97ffc..99b0f50 100644
--- a/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/RoleWebModel.cs
@@ -1,9 +1,14 @@
-using System;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DevHive.Web.Models.Identity.Role
 {
 	public class RoleWebModel
 	{
+		[NotNull]
+		[Required]
+		[MinLength(3)]
+		[MaxLength(50)]
 		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
index 1eaad57..254affc 100644
--- a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
@@ -1,6 +1,13 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
 namespace DevHive.Web.Models.Identity.Role
 {
-	public class UpdateRoleModel : CreateRoleModel
+	public class UpdateRoleWebModel : RoleWebModel
 	{
+		[NotNull]
+		[Required]
+		public Guid Id { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs
index 2d99786..d7d8d29 100644
--- a/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs
@@ -1,26 +1,31 @@
 using System.ComponentModel.DataAnnotations;
-using DevHive.Web.Models.Identity.Validation;
+using System.Diagnostics.CodeAnalysis;
+using DevHive.Web.Attributes;
 
 namespace DevHive.Web.Models.Identity.User
 {
 	public class BaseUserWebModel
 	{
+		[NotNull]
 		[Required]
 		[MinLength(3)]
 		[MaxLength(50)]
 		[OnlyAlphanumerics(ErrorMessage = "Username can only contain letters and digits!")]
 		public string UserName { get; set; }
 
+		[NotNull]
 		[Required]
 		[EmailAddress]
 		public string Email { get; set; }
 
+		[NotNull]
 		[Required]
 		[MinLength(3)]
 		[MaxLength(30)]
 		[OnlyLetters(ErrorMessage = "First name can only contain letters!")]
 		public string FirstName { get; set; }
 
+		[NotNull]
 		[Required]
 		[MinLength(3)]
 		[MaxLength(30)]
diff --git a/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs b/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs
new file mode 100644
index 0000000..d59bff5
--- /dev/null
+++ b/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using DevHive.Web.Attributes;
+
+namespace DevHive.Web.Models.Identity.User
+{
+	public class FriendWebModel
+	{
+		[NotNull]
+		[Required]
+		[MinLength(3)]
+		[MaxLength(50)]
+		[OnlyAlphanumerics(ErrorMessage = "Username can only contain letters and digits!")]
+		public string UserName { get; set; }
+	}
+}
diff --git a/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs b/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs
index 87c7416..0395274 100644
--- a/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs
@@ -1,8 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using DevHive.Web.Attributes;
+
 namespace DevHive.Web.Models.Identity.User
 {
 	public class LoginWebModel
 	{
+		[NotNull]
+		[Required]
+		[MinLength(3)]
+		[MaxLength(50)]
+		[OnlyAlphanumerics(ErrorMessage = "Username can only contain letters and digits!")]
 		public string UserName { get; set; }
+
+		[NotNull]
+		[Required]
+		[GoodPassword]
 		public string Password { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs b/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs
index 04fd6bd..0fc7ec6 100644
--- a/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs
@@ -1,10 +1,12 @@
 using System.ComponentModel.DataAnnotations;
-using DevHive.Web.Models.Identity.Validation;
+using System.Diagnostics.CodeAnalysis;
+using DevHive.Web.Attributes;
 
 namespace DevHive.Web.Models.Identity.User
 {
 	public class RegisterWebModel : BaseUserWebModel
 	{
+		[NotNull]
 		[Required]
 		[GoodPassword]
 		public string Password { get; set; }
diff --git a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
index 9e41eb6..30c66fb 100644
--- a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
@@ -1,12 +1,34 @@
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using DevHive.Web.Models.Identity.Validation;
+using System.Diagnostics.CodeAnalysis;
+using DevHive.Web.Attributes;
+using DevHive.Web.Models.Identity.Role;
+using DevHive.Web.Models.Language;
+using DevHive.Web.Models.Technology;
 
 namespace DevHive.Web.Models.Identity.User
 {
 	public class UpdateUserWebModel : BaseUserWebModel
 	{
+		[NotNull]
 		[Required]
 		[GoodPassword]
 		public string Password { get; set; }
+
+		[NotNull]
+		[Required]
+		public HashSet<FriendWebModel> Friends { get; set; }
+
+		[NotNull]
+		[Required]
+		public HashSet<UpdateRoleWebModel> Roles { get; set; }
+
+		[NotNull]
+		[Required]
+		public HashSet<UpdateLanguageWebModel> Languages { get; set; }
+
+		[NotNull]
+		[Required]
+		public HashSet<UpdateTechnologyWebModel> Technologies { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
index 8f7995c..5b80ba3 100644
--- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
-using DevHive.Common.Models.Identity;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Models.Identity.Role;
 using DevHive.Web.Models.Language;
 using DevHive.Web.Models.Technology;
@@ -8,9 +9,20 @@ namespace DevHive.Web.Models.Identity.User
 {
 	public class UserWebModel : BaseUserWebModel
 	{
-		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>();
+		[NotNull]
+		[Required]
+		public HashSet<RoleWebModel> Roles { get; set; } = new HashSet<RoleWebModel>();
+
+		[NotNull]
+		[Required]
+		public HashSet<FriendWebModel> Friends { get; set; } = new HashSet<FriendWebModel>();
+
+		[NotNull]
+		[Required]
+		public HashSet<LanguageWebModel> Languages { get; set; } = new HashSet<LanguageWebModel>();
+
+		[NotNull]
+		[Required]
+		public HashSet<TechnologyWebModel> Technologies { get; set; } = new HashSet<TechnologyWebModel>();
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs b/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs
deleted file mode 100644
index f920c35..0000000
--- a/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace DevHive.Web.Models.Identity.Validation
-{
-	public class GoodPassword : ValidationAttribute
-	{
-		public override bool IsValid(object value)
-		{
-			var stringValue = (string)value;
-
-			for (int i = 0; i < stringValue.Length; i++)
-			{
-				if (Char.IsDigit(stringValue[i]))
-				{
-					base.ErrorMessage = "Password must be atleast 5 characters long!";
-					return stringValue.Length >= 5;
-				}
-			}
-			base.ErrorMessage = "Password must contain atleast 1 digit!";
-			return false;
-		}
-	}
-}
diff --git a/src/DevHive.Web/Models/Identity/Validation/OnlyAlphanumericsModelValidation.cs b/src/DevHive.Web/Models/Identity/Validation/OnlyAlphanumericsModelValidation.cs
deleted file mode 100644
index 5c8c66c..0000000
--- a/src/DevHive.Web/Models/Identity/Validation/OnlyAlphanumericsModelValidation.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace DevHive.Web.Models.Identity.Validation
-{
-	public class OnlyAlphanumerics : ValidationAttribute
-	{
-		public override bool IsValid(object value)
-		{
-			var stringValue = (string)value;
-
-			foreach (char ch in stringValue)
-			{
-				if (!Char.IsLetterOrDigit(ch))
-					return false;
-			}
-			return true;
-		}
-	}
-}
diff --git a/src/DevHive.Web/Models/Identity/Validation/OnlyLettersModelValidation.cs b/src/DevHive.Web/Models/Identity/Validation/OnlyLettersModelValidation.cs
deleted file mode 100644
index 29a995a..0000000
--- a/src/DevHive.Web/Models/Identity/Validation/OnlyLettersModelValidation.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace DevHive.Web.Models.Identity.Validation
-{
-	public class OnlyLetters : ValidationAttribute
-	{
-		public override bool IsValid(object value)
-		{
-			var stringValue = (string)value;
-
-			foreach (char ch in stringValue)
-			{
-				if (!Char.IsLetter(ch))
-					return false;
-			}
-			return true;
-		}
-	}
-}