Merge branch 'refactor_user_updating' into dev

6 files changed, 78 insertions, 8 deletions

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>();
 	}
 }