FurnitureFactory/FurnitureContracts/BindingModels/UserBindingModel.cs

@@ -6,12 +6,14 @@ using System.Threading.Tasks;
 using FurnitureFactoryDataModels.Models;
 namespace FurnitureContracts.BindingModels
 {
-    public class MasterBindingModel : IMasterModel
+    public class UserBindingModel : IUserModel
     {
+        public int Login { get; set; }
+
+        public int Password { get; set; }
+
         public string UserName { get; set; } = string.Empty;
-        public string Login { get; set; } = string.Empty;
+
-        public string Password { get; set; } = string.Empty;
+        public int RoleID { get; set; }
-        public string Email { get; set; } = string.Empty;
-        public int Id { get; set; }
     }
 }

FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IMasterLogic.cs

@@ -1,20 +0,0 @@
-using FurnitureContracts.BindingModels;
-using FurnitureContracts.SearchModels;
-using FurnitureContracts.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureContracts.BusinessLogicsContracts
-{
-    public interface IMasterLogic
-    {
-        List<MasterViewModel>? ReadList(MasterSearchModel? model);
-        MasterViewModel? ReadElement(MasterSearchModel model);
-        bool Create(MasterBindingModel model);
-        bool Update(MasterBindingModel model);
-        bool Delete(MasterBindingModel model);
-    }
-}

FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IUserLogic.cs

@@ -0,0 +1,20 @@
+using FurnitureContracts.BindingModels;
+using FurnitureContracts.SearchModels;
+using FurnitureContracts.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FurnitureContracts.BusinessLogicsContracts
+{
+    interface IUserLogic
+    {
+        List<UserViewModel>? ReadList(UserSearchModel? model);
+        UserViewModel? ReadElement(UserSearchModel model);
+        bool Create(UserBindingModel model);
+        bool Update(UserBindingModel model);
+        bool Delete(UserBindingModel model);
+    }
+}

FurnitureFactory/FurnitureContracts/SearchModels/UserSearchModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace FurnitureContracts.SearchModels
 {
-    public class MasterSearchModel
+    public class UserSearchModel
     {
         public string? Name { get; set; }
         public int? Id { get; set; }

FurnitureFactory/FurnitureContracts/StoragesContracts/IMasterStorage.cs

@@ -1,21 +0,0 @@
-using FurnitureContracts.BindingModels;
-using FurnitureContracts.SearchModels;
-using FurnitureContracts.ViewModel;
-
-namespace FurnitureContracts.StoragesContracts
-{
-    public interface IMasterStorage
-    {
-        List<MasterViewModel> GetFullList();
-
-        List<MasterViewModel> GetFilteredList(MasterSearchModel model);
-
-        MasterViewModel? GetElement(MasterSearchModel model);
-
-        MasterViewModel? Insert(MasterBindingModel model);
-
-        MasterViewModel? Update(MasterBindingModel model);
-
-        MasterViewModel? Delete(MasterBindingModel model);
-    }
-}

FurnitureFactory/FurnitureContracts/StoragesContracts/IUserStorage.cs

@@ -0,0 +1,21 @@
+using FurnitureContracts.BindingModels;
+using FurnitureContracts.SearchModels;
+using FurnitureContracts.ViewModel;
+
+namespace FurnitureContracts.StoragesContracts
+{
+    public interface IUserStorage
+    {
+        List<UserViewModel> GetFullList();
+
+        List<UserViewModel> GetFilteredList(UserSearchModel model);
+
+        UserViewModel? GetElement(UserSearchModel model);
+
+        UserViewModel? Insert(UserBindingModel model);
+
+        UserViewModel? Update(UserBindingModel model);
+
+        UserViewModel? Delete(UserBindingModel model);
+    }
+}

FurnitureFactory/FurnitureContracts/ViewModel/UserViewModel.cs

@@ -8,15 +8,16 @@ using System.Threading.Tasks;
 
 namespace FurnitureContracts.ViewModel
 {
-    public class MasterViewModel : IMasterModel
+    public class UserViewModel : IUserModel
     {
         [DisplayName("Логин")]
-        public string Login { get; set; }
+        public int Login { get; set; }
         [DisplayName("Пароль")]
-        public string Password { get; set; }
+        public int Password { get; set; }
         [DisplayName("Имя пользователя")]
-        public string Email { get; set; }
+
         public string UserName { get; set; } = string.Empty;
-        public int Id { get; set; }
+
+        public int RoleID { get; set; }
     }
 }

FurnitureFactory/FurnitureDataBaseImplement/Models/Material.cs

@@ -1,7 +1,6 @@
 using FurnitureFactoryDataModels.Models;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,13 +9,13 @@ namespace FurnitureDataBaseImplement.Models
 {
     public class Material : IMaterialModel
     {
-        [Required]
+
         public string Name { get; set; } = string.Empty;
-        [Required]
+
         public int Cost { get; set; }
-        [Required]
+
         public int UserID { get; set; }
-        [Required]
+
         public int Id { get; set; }
     }
 }

FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Material.cs

@@ -1,20 +0,0 @@
-using FurnitureFactoryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FurnitureFactoryDataBaseImplement.Models
-{
-    public class Material : IMaterialModel
-    {
-        public string Name { get; set; } = string.Empty;
-
-        public int Cost { get; set; }
-
-        public int UserID { get; set; }
-
-        public int Id { get; set; }
-    }
-}

FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs

@@ -6,11 +6,11 @@ using System.Threading.Tasks;
 
 namespace FurnitureFactoryDataModels.Models
 {
-    public interface IMasterModel : IId
+    public interface IUserModel
     {
         string Login { get;}
-        string Password { get; }
+        int Password { get; }
         string UserName { get; }
-        string Email { get; }
+        int RoleID { get; }
     }
 }