models and contracts are ready

Canteen/CanteenContracts/BindingModels/CookBindingModel.cs

@@ -11,12 +11,8 @@ namespace CanteenContracts.BindingModels
     {
         public int Id { get; set; }
         public int ManagerId { get; set; }
-        public string Name { get; set; } = string.Empty;
+        public string FIO { get; set; } = string.Empty;
-
-        public string Surname { get; set; } = string.Empty;
-
-        public string Patronymic { get; set; } = string.Empty;
-
         public string Position { get; set; } = string.Empty;
     }
+
 }

Canteen/CanteenContracts/BindingModels/DishBindingModel.cs

@@ -11,8 +11,9 @@ namespace CanteenContracts.BindingModels
     {
         public int Id { get; set; }
         public string DishName { get; set; } = string.Empty;
-        public double Cost { get; set; }
+        public double Price { get; set; }
         public int ManagerId { get; set; }
         public Dictionary<int, (IProductModel, int)> DishProducts { get; set; } = new();
     }
+
 }

Canteen/CanteenContracts/BindingModels/DishLinkBindingModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.BindingModels
-{
-    public class DishLinkBindingModel
-    {
-        public int Id { get; set; }
-    }
-}

Canteen/CanteenContracts/BindingModels/LunchBindingModel.cs

@@ -13,9 +13,11 @@ namespace CanteenContracts.BindingModels
         public int Id { get; set; }
         public int VisitorId { get; set; }
         public string LunchName { get; set; } = string.Empty;
-        public double Cost { get; set; }
+        public double Sum { get; set; }
-        public Dictionary<int, (IProductModel, int)> LunchProducts { get; set; } = new();
+        public LunchStatus Status { get; set; }
-
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+        public DateTime? DateImplement { get; set; }
+        public Dictionary<int, (IProductModel, int)> LunchProducts { get; set; } = new Dictionary<int, (IProductModel, int)>();
+    }
 
 }
-}

Canteen/CanteenContracts/BindingModels/LunchLinkBindingModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.BindingModels
-{
-    public class LunchLinkBindingModel
-    {
-        public int Id { get; set; }
-    }
-}

Canteen/CanteenContracts/BindingModels/ManagerBindingModel.cs

@@ -18,7 +18,5 @@ namespace CanteenContracts.BindingModels
 
         public string PhoneNumber { get; set; } = string.Empty;
 
-        public int RoleId { get; set; }
-
     }
 }

Canteen/CanteenContracts/BindingModels/OrderBindingModel.cs

@@ -13,7 +13,8 @@ namespace CanteenContracts.BindingModels
         public int Id { get; set; }
         public int VisitorId { get; set; }
         public string Description { get; set; } = string.Empty;
-        public double Sum { get; set; }
+        public double? Sum { get; set; }
-        public DateTime DateCreate { get; } = DateTime.Now;
+        public Dictionary<int, (IDishModel, int)> OrderDishes { get; set; } = new ();
     }
+
 }

Canteen/CanteenContracts/BindingModels/ProductBindingModel.cs

@@ -11,12 +11,8 @@ namespace CanteenContracts.BindingModels
     {
         public int Id { get; set; }
         public string ProductName { get; set; } = string.Empty;
-
+        public double Price { get; set; }
-        public double Cost { get; set; }
-
         public int ManagerId { get; set; }
-
+        public Dictionary<int, ICookModel> ProductCooks { get; set; } = new Dictionary<int, ICookModel>();
-        public Dictionary<int, ICookModel> ProductCooks{ get; set; } = new();
-
     }
 }

Canteen/CanteenContracts/BindingModels/RoleBindingModel.cs

@@ -1,16 +0,0 @@
-using CanteenDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.BindingModels
-{
-    public class RoleBindingModel : IRoleModel
-    {
-        public int Id { get; set; }
-        public string RoleName { get; set; } = string.Empty;
-        
-    }
-}

Canteen/CanteenContracts/BindingModels/TablewareBindingModel.cs

@@ -10,10 +10,9 @@ namespace CanteenContracts.BindingModels
     public class TablewareBindingModel : ITablewareModel
     {
         public int Id { get; set; }
+        public int VisitorId { get; set; }
+        public int OrderId { get; set; }
         public string TablewareName { get; set; } = string.Empty;
         public int Count { get; set; }
-        public int ManagerId { get; set; }
-        public int OrderId { get; set; }
-
     }
 }

Canteen/CanteenContracts/BindingModels/VisitorBindingModel.cs

@@ -17,7 +17,5 @@ namespace CanteenContracts.BindingModels
         public string Password { get; set; } = string.Empty;
 
         public string PhoneNumber { get; set; } = string.Empty;
-
-        public int RoleId { get; set; }
     }
 }

Canteen/CanteenContracts/BusinessLogicsContracts/ILunchLogic.cs

@@ -15,6 +15,7 @@ namespace CanteenContracts.BusinessLogicsContracts
         LunchViewModel? ReadElement(LunchSearchModel model);
         bool Create(LunchBindingModel model);
         bool Update(LunchBindingModel model);
-        bool Delete(LunchBindingModel model);
+        bool Finish(LunchBindingModel model);
+        bool AddOrder(OrderBindingModel model);
     }
 }

Canteen/CanteenContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -13,9 +13,9 @@ namespace CanteenContracts.BusinessLogicsContracts
     {
         List<OrderViewModel>? ReadList(OrderSearchModel? model);
         OrderViewModel? ReadElement(OrderSearchModel model);
-        bool CreateOrder(OrderBindingModel model);
+        bool Create(OrderBindingModel model);
-        bool AddLunch(LunchLinkBindingModel model);
+        bool Delete(OrderBindingModel model);
-        bool AddDish(DishLinkBindingModel model);
+        bool Update(OrderBindingModel model);
-        bool AddCook(CookLinkBindingModel model);
+        bool AddCook(CookBindingModel model);
     }
 }

Canteen/CanteenContracts/BusinessLogicsContracts/IRoleLogic.cs

@@ -1,20 +0,0 @@
-using CanteenContracts.BindingModels;
-using CanteenContracts.SearchModel;
-using CanteenContracts.View;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.BusinessLogicsContracts
-{
-    public interface IRoleLogic
-    {
-        List<RoleViewModel>? ReadList(RoleSearchModel? model);
-        RoleViewModel? ReadElement(RoleSearchModel model);
-        bool Create(RoleBindingModel model);
-        bool Update(RoleBindingModel model);
-        bool Delete(RoleBindingModel model);
-    }
-}

Canteen/CanteenContracts/CanteenContracts.csproj

@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <Folder Include="ViewModels\" />
-    <Folder Include="BusinessLogicsContracts\" />
     <Folder Include="SearchModels\" />
     <Folder Include="StoragesContracts\" />
   </ItemGroup>

Canteen/CanteenContracts/SearchModels/CookSearchModel.cs

@@ -10,8 +10,5 @@ namespace CanteenContracts.SearchModel
     {
         public int? Id { get; set; }
         public int? ManagerId { get; set; }
-        public string? Name { get; set; }
-        public string? Surname { get; set; }
-        public string? Patronymic { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/DishSearchModel.cs

@@ -10,6 +10,5 @@ namespace CanteenContracts.SearchModel
     {
         public int? Id { get; set; }
         public int? ManagerId { get; set; }
-        public string? DishName { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/LunchSearchModel.cs

@@ -10,6 +10,7 @@ namespace CanteenContracts.SearchModel
     {
         public int? Id { get; set; }
         public int? VisitorId { get; set; }
-        public string? LunchName { get; set; }
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/ManagerSearchModel.cs

@@ -9,9 +9,8 @@ namespace CanteenContracts.SearchModel
     public class ManagerSearchModel
     {
         public int? Id { get; set; }
-        public string? ClientFIO { get; set; }
-        public string? PhoneNumber { get; set; }
         public string? Login { get; set; }
         public string? Password { get; set; }
+        public string? PhoneNumber { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/OrderSearchModel.cs

@@ -10,7 +10,5 @@ namespace CanteenContracts.SearchModel
     {
         public int? Id { get; set; }
         public int? VisitorId { get; set; }
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/ProductSearchModel.cs

@@ -10,6 +10,5 @@ namespace CanteenContracts.SearchModel
     {
         public int? Id { get; set; }
         public int? ManagerId { get; set; }
-        public string? ProductName { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/RoleSearchModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.SearchModel
-{
-    public class RoleSearchModel
-    {
-        public int? Id { get; set; }
-        public string? RoleName { get; set; }
-
-    }
-}

Canteen/CanteenContracts/SearchModels/TablewareSearchModel.cs

@@ -10,6 +10,5 @@ namespace CanteenContracts.SearchModel
     {
         public int? Id { get; set; }
         public int? VisitorId { get; set; }
-        public string? TablewareName { get; set; }
     }
 }

Canteen/CanteenContracts/SearchModels/VisitorSearchModel.cs

@@ -9,9 +9,8 @@ namespace CanteenContracts.SearchModel
     public class VisitorSearchModel
     {
         public int? Id { get; set; }
-        public string? ClientFIO { get; set; }
-        public string? PhoneNumber { get; set; }
         public string? Login { get; set; }
         public string? Password { get; set; }
+        public string? PhoneNumber { get; set; }
     }
 }

Canteen/CanteenContracts/StoragesContracts/ILunchStorage.cs

@@ -17,5 +17,6 @@ namespace CanteenContracts.StoragesContracts
         LunchViewModel? Insert(LunchBindingModel model);
         LunchViewModel? Update(LunchBindingModel model);
         LunchViewModel? Delete(LunchBindingModel model);
+        OrderViewModel? AddOrder(OrderBindingModel model);
     }
 }

Canteen/CanteenContracts/StoragesContracts/IOrderStorage.cs

@@ -17,8 +17,6 @@ namespace CanteenContracts.StoragesContracts
         OrderViewModel? Insert(OrderBindingModel model);
         OrderViewModel? Update(OrderBindingModel model);
         OrderViewModel? Delete(OrderBindingModel model);
-        OrderViewModel? AddLunch(LunchLinkBindingModel model);
+        OrderViewModel? AddCook(CookBindingModel model);
-        OrderViewModel? AddDish(DishLinkBindingModel model);
-        OrderViewModel? AddCook(CookLinkBindingModel model);
     }
 }

Canteen/CanteenContracts/StoragesContracts/IRoleStorage.cs

@@ -1,21 +0,0 @@
-using CanteenContracts.BindingModels;
-using CanteenContracts.SearchModel;
-using CanteenContracts.View;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.StoragesContracts
-{
-    public interface IRoleStorage
-    {
-        List<RoleViewModel> GetFullList();
-        List<RoleViewModel> GetFilteredList(RoleSearchModel model);
-        RoleViewModel? GetElement(RoleSearchModel model);
-        RoleViewModel? Insert(RoleBindingModel model);
-        RoleViewModel? Update(RoleBindingModel model);
-        RoleViewModel? Delete(RoleBindingModel model);
-    }
-}

Canteen/CanteenContracts/ViewModels/CookViewModel.cs

@@ -10,17 +10,12 @@ namespace CanteenContracts.View
 {
     public class CookViewModel : ICookModel
     {
-        [DisplayName("Имя")]
+        [DisplayName("ФИО")]
-        public string Name { get; set; } = string.Empty;
+        public string FIO { get; set; } = string.Empty;
-        [DisplayName("Фамилия")]
-        public string Surname { get; set; } = string.Empty;
-        [DisplayName("Отчество")]
-        public string? Patronymic { get; set; } = string.Empty;
         [DisplayName("Должность")]
         public string Position { get; set; } = string.Empty;
-
+        [DisplayName("ID менеджера")]
         public int ManagerId { get; set; }
-
         public int Id { get; set; }
     }
 }

Canteen/CanteenContracts/ViewModels/DishViewModel.cs

@@ -10,12 +10,13 @@ namespace CanteenContracts.View
 {
     public class DishViewModel : IDishModel
     {
-        public int Id { get; set; }
-        public int ManagerId { get; set; }
         [DisplayName("Название блюда")]
-        public string DishName { get; set; } = string.Empty;
+        public string DishName { get; set; }
         [DisplayName("Цена")]
-        public double Cost { get; set; }
+        public double Price { get; set; }
-        public Dictionary<int, (IProductModel, int)> DishProducts { get; set; } = new();
+        [DisplayName("ID менеджера")]
+        public int ManagerId { get; set; }
+        public int Id { get; set; }
+        public Dictionary<int, (IProductModel, int)> DishProducts { get; set; }
     }
 }

Canteen/CanteenContracts/ViewModels/LunchViewModel.cs

@@ -1,4 +1,5 @@
-using CanteenDataModels.Models;
+using CanteenDataModels.Enums;
+using CanteenDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,11 +12,18 @@ namespace CanteenContracts.View
     public class LunchViewModel : ILunchModel
     {
         public int Id { get; set; }
+        [DisplayName("ID посетителя")]
         public int VisitorId { get; set; }
         [DisplayName("Название обеда")]
         public string LunchName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
+        [DisplayName("Сумма")]
-        public double Cost { get; set; }
+        public double Sum { get; set; }
+        [DisplayName("Статус")]
+        public LunchStatus Status { get; set; }
+        [DisplayName("Дата создания")]
+        public DateTime DateCreate { get; set; }
+        [DisplayName("Дата реализации")]
+        public DateTime? DateImplement { get; set; }
         public Dictionary<int, (IProductModel, int)> LunchProducts { get; set; } = new();
     }
 }

Canteen/CanteenContracts/ViewModels/ManagerViewModel.cs

@@ -10,7 +10,7 @@ namespace CanteenContracts.View
 {
     public class ManagerViewModel : IManagerModel
     {
-        [DisplayName("ФИО управляющего")]
+        [DisplayName("ФИО")]
         public string FIO { get; set; } = string.Empty;
         [DisplayName("Логин")]
         public string Login { get; set; } = string.Empty;
@@ -18,9 +18,7 @@ namespace CanteenContracts.View
         public string Password { get; set; } = string.Empty;
         [DisplayName("Номер телефона")]
         public string PhoneNumber { get; set; } = string.Empty;
-
-        public int RoleId { get; set; }
-
         public int Id { get; set; }
     }
+
 }

Canteen/CanteenContracts/ViewModels/OrderViewModel.cs

@@ -11,15 +11,15 @@ namespace CanteenContracts.View
 {
     public class OrderViewModel : IOrderModel
     {
-        [DisplayName("Номер")]
+        [DisplayName("ID посетителя")]
-        public int Id { get; set; }
         public int VisitorId { get; set; }
-        [DisplayName("ФИО посетителя")]
+        [DisplayName("Описание")]
-        public string VisitorFIO { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
         [DisplayName("Сумма")]
-        public double Sum { get; set; }
+        public double? Sum { get; set; }
-        [DisplayName("Дата создания")]
+        [DisplayName("Блюда в заказе")]
-        public DateTime DateCreate { get; set; } = DateTime.Now;
+        public Dictionary<int, (IDishModel, int)> OrderDishes { get; set; } = new Dictionary<int, (IDishModel, int)>();
+        public int Id { get; set; }
     }
+
 }

Canteen/CanteenContracts/ViewModels/ProductViewModel.cs

@@ -10,12 +10,18 @@ namespace CanteenContracts.View
 {
     public class ProductViewModel : IProductModel
     {
-        public int Id { get; set; }
-        public int ManagerId { get; set; }
         [DisplayName("Название продукта")]
         public string ProductName { get; set; } = string.Empty;
+
         [DisplayName("Цена")]
-        public double Cost { get; set; }
+        public double Price { get; set; }
+
+        [DisplayName("ID менеджера")]
+        public int ManagerId { get; set; }
+
         public Dictionary<int, ICookModel> ProductCooks { get; set; } = new();
+
+        public int Id { get; set; }
     }
+
 }

Canteen/CanteenContracts/ViewModels/RoleViewModel.cs

@@ -1,19 +0,0 @@
-using CanteenDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenContracts.View
-{
-    public class RoleViewModel : IRoleModel
-    {
-        [DisplayName("Название роли")]
-        public string RoleName { get; set; } = string.Empty;
-
-        public int Id { get; set; }
-    }
-}

Canteen/CanteenContracts/ViewModels/TablewareViewModel.cs

@@ -10,13 +10,19 @@ namespace CanteenContracts.View
 {
     public class TablewareViewModel : ITablewareModel
     {
-
+        [DisplayName("ID посетителя")]
-        public int Id { get; set; }
         public int VisitorId { get; set; }
+
+        [DisplayName("ID заказа")]
         public int OrderId { get; set; }
+
         [DisplayName("Название прибора")]
         public string TablewareName { get; set; } = string.Empty;
 
+        [DisplayName("Количество")]
         public int Count { get; set; }
+
+        public int Id { get; set; }
     }
+
 }

Canteen/CanteenContracts/ViewModels/VisitorViewModel.cs

@@ -11,14 +11,17 @@ namespace CanteenContracts.View
     public class VisitorViewModel : IVisitorModel
     {
         public int Id { get; set; }
+
         [DisplayName("ФИО посетителя")]
         public string FIO { get; set; } = string.Empty;
+
         [DisplayName("Логин")]
         public string Login { get; set; } = string.Empty;
+
         [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
+
         [DisplayName("Номер телефона")]
         public string PhoneNumber { get; set; } = string.Empty;
-        public int RoleId { get; set; }
     }
 }

Canteen/CanteenDataModels/CanteenDataModels.csproj

@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Enums\" />
     <Folder Include="Models\" />
   </ItemGroup>
 

Canteen/CanteenDataModels/Enums/LunchStatus.cs

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CanteenContracts.BindingModels
+namespace CanteenDataModels.Enums
 {
-    public class CookLinkBindingModel
+    public enum LunchStatus
     {
-        public int Id { get; set; }
+        Создан = 0,
+        Окончен = 1
     }
 }

Canteen/CanteenDataModels/Enums/OrderStatus.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenDataModels.Enums
-{
-    public enum OrderStatus
-    {
-        Неизвестен = -1,
-        Принят = 0,
-        Выполняется = 1,
-        Готов = 2,
-        Выдан = 3
-    }
-}

Canteen/CanteenDataModels/Models/ICookModel.cs

@@ -9,12 +9,7 @@ namespace CanteenDataModels.Models
     public interface ICookModel : IId
     {
         int ManagerId { get; }
-        string Name { get; }
+        string FIO { get; }
-
-        string Surname { get; }
-
-        string Patronymic { get; }
-
         string Position { get; }
     }
 }

Canteen/CanteenDataModels/Models/IDishModel.cs

@@ -9,7 +9,7 @@ namespace CanteenDataModels.Models
     public interface IDishModel : IId
     {
         string DishName { get; }
-        double Cost { get; }
+        double Price { get; }
         int ManagerId { get; }
         Dictionary<int, (IProductModel, int)> DishProducts { get; }
     }

Canteen/CanteenDataModels/Models/ILunchModel.cs

@@ -1,4 +1,5 @@
-using System;
+using CanteenDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,7 +11,10 @@ namespace CanteenDataModels.Models
     {
         int VisitorId { get; }
         string LunchName { get; }
-        double Cost { get; }
+        double Sum { get; }
+        LunchStatus Status { get; }
+        DateTime DateCreate { get; }
+        DateTime? DateImplement { get; }
         Dictionary<int, (IProductModel, int)> LunchProducts { get; }
     }
 }

Canteen/CanteenDataModels/Models/IManagerModel.cs

@@ -15,7 +15,5 @@ namespace CanteenDataModels.Models
         string Password { get; }
 
         string PhoneNumber { get; }
-
-        int RoleId { get; }
     }
 }

Canteen/CanteenDataModels/Models/IOrderModel.cs

@@ -11,7 +11,7 @@ namespace CanteenDataModels.Models
     {
         int VisitorId { get; }
         string Description { get; }
-        double Sum { get; }
+        double? Sum { get; }
-        DateTime DateCreate { get; }
+        Dictionary<int, (IDishModel, int)> OrderDishes { get; }
     }
 }

Canteen/CanteenDataModels/Models/IProductModel.cs

@@ -9,7 +9,7 @@ namespace CanteenDataModels.Models
     public interface IProductModel : IId
     {
         string ProductName { get; }
-        double Cost { get; }
+        double Price { get; }
         int ManagerId { get; }
         Dictionary<int, ICookModel> ProductCooks { get; }
     }

Canteen/CanteenDataModels/Models/IRoleModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CanteenDataModels.Models
-{
-    public interface IRoleModel : IId
-    {
-        string RoleName { get; }
-    }
-}

Canteen/CanteenDataModels/Models/IVisitorModel.cs

@@ -12,6 +12,5 @@ namespace CanteenDataModels.Models
         string Login { get; }
         string Password { get; }
         string PhoneNumber { get; }
-        int RoleId { get; }
     }
 }