Merge branch 'refactor_user_updating' into dev

8 files changed, 80 insertions, 9 deletions

diff --git a/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs b/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs
new file mode 100644
index 0000000..53bea9e
--- /dev/null
+++ b/src/DevHive.Services/Models/Identity/Role/CreateRoleServiceModel.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace DevHive.Services.Models.Identity.Role
+{
+	public class CreateRoleServiceModel
+	{
+		[NotNull]
+		[Required]
+		[MinLength(3)]
+		[MaxLength(50)]
+		public string Name { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Models/Identity/Role/RoleServiceModel.cs b/src/DevHive.Services/Models/Identity/Role/RoleServiceModel.cs
new file mode 100644
index 0000000..07249fe
--- /dev/null
+++ b/src/DevHive.Services/Models/Identity/Role/RoleServiceModel.cs
@@ -0,0 +1,7 @@
+namespace DevHive.Services.Models.Identity.Role
+{
+	public class RoleServiceModel
+	{
+		public string Name { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Models/Identity/Role/UpdateRoleServiceModel.cs b/src/DevHive.Services/Models/Identity/Role/UpdateRoleServiceModel.cs
new file mode 100644
index 0000000..e21e6b4
--- /dev/null
+++ b/src/DevHive.Services/Models/Identity/Role/UpdateRoleServiceModel.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace DevHive.Services.Models.Identity.Role
+{
+	public class UpdateRoleServiceModel
+	{
+		public Guid Id { get; set; }
+		public string Name { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Models/Identity/User/FriendServiceModel.cs b/src/DevHive.Services/Models/Identity/User/FriendServiceModel.cs
new file mode 100644
index 0000000..a784f5c
--- /dev/null
+++ b/src/DevHive.Services/Models/Identity/User/FriendServiceModel.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace DevHive.Services.Models.Identity.User
+{
+	public class FriendServiceModel
+	{
+		public Guid Id { get; set; }
+		public string UserName { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Models/Identity/User/RegisterServiceModel.cs b/src/DevHive.Services/Models/Identity/User/RegisterServiceModel.cs
index 74f66b4..adc4119 100644
--- a/src/DevHive.Services/Models/Identity/User/RegisterServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/RegisterServiceModel.cs
@@ -6,8 +6,10 @@ namespace DevHive.Services.Models.Identity.User
 {
 	public class RegisterServiceModel : BaseUserServiceModel
 	{
-		public IList<LanguageServiceModel> Languages { get; set; }
-		public IList<TechnologyServiceModel> Technologies { get; set; }
 		public string Password { get; set; }
+
+		public HashSet<LanguageServiceModel> Languages { get; set; }
+
+		public HashSet<TechnologyServiceModel> Technologies { get; set; }
 	}
 }
diff --git a/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs
new file mode 100644
index 0000000..83fcc34
--- /dev/null
+++ b/src/DevHive.Services/Models/Identity/User/UpdateFriendServiceModel.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace DevHive.Services.Models.Identity.User
+{
+	public class UpdateFriendServiceModel
+	{
+		public Guid Id { get; set; }
+		public string Name { get; set; }
+	}
+}
diff --git a/src/DevHive.Services/Models/Identity/User/UpdateUserServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UpdateUserServiceModel.cs
index 96d1ff0..9277e3e 100644
--- a/src/DevHive.Services/Models/Identity/User/UpdateUserServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UpdateUserServiceModel.cs
@@ -1,9 +1,24 @@
 using System;
+using System.Collections.Generic;
+using DevHive.Services.Models.Identity.Role;
+using DevHive.Services.Models.Language;
+using DevHive.Services.Models.Technology;
 
 namespace DevHive.Services.Models.Identity.User
 {
-	public class UpdateUserServiceModel : UserServiceModel
+    public class UpdateUserServiceModel : BaseUserServiceModel
 	{
 		public Guid Id { get; set; }
+
+		public string Password { get; set; }
+
+		public HashSet<UpdateRoleServiceModel> Roles { get; set; } = new HashSet<UpdateRoleServiceModel>();
+
+		public HashSet<UpdateFriendServiceModel> Friends { get; set; } = new HashSet<UpdateFriendServiceModel>();
+
+		public HashSet<UpdateLanguageServiceModel> Languages { get; set; } = new HashSet<UpdateLanguageServiceModel>();
+
+		public HashSet<UpdateTechnologyServiceModel> Technologies { get; set; } = new HashSet<UpdateTechnologyServiceModel>();
+
 	}
 }
diff --git a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
index 8825f50..5fcd494 100644
--- a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
@@ -1,15 +1,18 @@
 using System.Collections.Generic;
-using DevHive.Common.Models.Identity;
+using DevHive.Services.Models.Identity.Role;
 using DevHive.Services.Models.Language;
 using DevHive.Services.Models.Technology;
 
 namespace DevHive.Services.Models.Identity.User
 {
-	public class UserServiceModel : BaseUserServiceModel
+    public class UserServiceModel : BaseUserServiceModel
 	{
-		public IList<RoleModel> Roles { get; set; } = new List<RoleModel>();
-		public IList<UserServiceModel> Friends { get; set; } = new List<UserServiceModel>();
-		public IList<LanguageServiceModel> Languages { get; set; } = new List<LanguageServiceModel>();
-		public IList<TechnologyServiceModel> TechnologyServiceModels { get; set; } = new List<TechnologyServiceModel>();
+		public HashSet<RoleServiceModel> Roles { get; set; } = new HashSet<RoleServiceModel>();
+
+		public HashSet<FriendServiceModel> Friends { get; set; } = new HashSet<FriendServiceModel>();
+
+		public HashSet<LanguageServiceModel> Languages { get; set; } = new HashSet<LanguageServiceModel>();
+
+		public HashSet<TechnologyServiceModel> Technologies { get; set; } = new HashSet<TechnologyServiceModel>();
 	}
 }