diff --git a/ComputersShop/ComputersShopDataBaseImplement/Models/Client.cs b/ComputersShop/ComputersShopDataBaseImplement/Models/Client.cs index 825ff80..2887e2b 100644 --- a/ComputersShop/ComputersShopDataBaseImplement/Models/Client.cs +++ b/ComputersShop/ComputersShopDataBaseImplement/Models/Client.cs @@ -8,20 +8,25 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace ComputersShopDataBaseImplement.Models { + [DataContract] public class Client : IClientModel { [Required] + [DataMember] public string ClientFIO { get; set; } = string.Empty; [Required] + [DataMember] public string Email { get; set; } = string.Empty; [Required] + [DataMember] public string Password { get; set; } = string.Empty; - + [DataMember] public int Id { get; set; } [ForeignKey("ClientId")] diff --git a/ComputersShop/ComputersShopDataBaseImplement/Models/Component.cs b/ComputersShop/ComputersShopDataBaseImplement/Models/Component.cs index 2f4742a..384d8dd 100644 --- a/ComputersShop/ComputersShopDataBaseImplement/Models/Component.cs +++ b/ComputersShop/ComputersShopDataBaseImplement/Models/Component.cs @@ -9,16 +9,21 @@ using System.Text; using System.Threading.Tasks; using ComputersShopContracts.BindingModels; using ComputersShopContracts.ViewModels; +using System.Runtime.Serialization; namespace ComputersShopDataBaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } [Required] - public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public string ComponentName { get; private set; } = string.Empty; [Required] - public double Cost { get; set; } + [DataMember] + public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List ComputerComponents { get; set; } = new(); public static Component? Create(ComponentBindingModel model) diff --git a/ComputersShop/ComputersShopDataBaseImplement/Models/Computer.cs b/ComputersShop/ComputersShopDataBaseImplement/Models/Computer.cs index 60b02b3..b739985 100644 --- a/ComputersShop/ComputersShopDataBaseImplement/Models/Computer.cs +++ b/ComputersShop/ComputersShopDataBaseImplement/Models/Computer.cs @@ -8,16 +8,21 @@ using System.Text; using System.Threading.Tasks; using ComputersShopContracts.BindingModels; using ComputersShopContracts.ViewModels; +using System.Runtime.Serialization; namespace ComputersShopDataBaseImplement.Models { + [DataContract] public class Computer : IComputerModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } [Required] - public string ComputerName { get; set; } = string.Empty; + [DataMember] + public string ComputerName { get; set; } = string.Empty; [Required] - public double Price { get; set; } + [DataMember] + public double Price { get; set; } private Dictionary? _ComputerComponents = null; [NotMapped] public Dictionary ComputerComponents diff --git a/ComputersShop/ComputersShopDataBaseImplement/Models/Implementer.cs b/ComputersShop/ComputersShopDataBaseImplement/Models/Implementer.cs index ade0055..158074e 100644 --- a/ComputersShop/ComputersShopDataBaseImplement/Models/Implementer.cs +++ b/ComputersShop/ComputersShopDataBaseImplement/Models/Implementer.cs @@ -8,24 +8,31 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace ComputersShopDataBaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } [Required] - public string ImplementerFIO { get; set; } = string.Empty; + [DataMember] + public string ImplementerFIO { get; set; } = string.Empty; [Required] - public string Password { get; set; } = string.Empty; + [DataMember] + public string Password { get; set; } = string.Empty; [Required] - public int WorkExperience { get; set; } + [DataMember] + public int WorkExperience { get; set; } [Required] - public int Qualification { get; set; } + [DataMember] + public int Qualification { get; set; } [ForeignKey("ImplementerId")] public virtual List Orders { get; set; } = new(); diff --git a/ComputersShop/ComputersShopDataBaseImplement/Models/Message.cs b/ComputersShop/ComputersShopDataBaseImplement/Models/Message.cs index 28e78c7..b05f9ec 100644 --- a/ComputersShop/ComputersShopDataBaseImplement/Models/Message.cs +++ b/ComputersShop/ComputersShopDataBaseImplement/Models/Message.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; @@ -13,7 +14,8 @@ namespace ComputersShopDataBaseImplement.Models public class Message : IMessageInfoModel { [Key] - public string MessageId { get; private set; } = string.Empty; + [DataMember] + public string MessageId { get; private set; } = string.Empty; public int? ClientId { get; private set; } diff --git a/ComputersShop/ComputersShopDataBaseImplement/Models/Order.cs b/ComputersShop/ComputersShopDataBaseImplement/Models/Order.cs index 48c9fe8..925712f 100644 --- a/ComputersShop/ComputersShopDataBaseImplement/Models/Order.cs +++ b/ComputersShop/ComputersShopDataBaseImplement/Models/Order.cs @@ -7,27 +7,36 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection.Metadata; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace ComputersShopDataBaseImplement.Models { + [DataContract] public class Order : IOrderModel { [Required] + [DataMember] public int ComputerId { get; set; } [Required] + [DataMember] public int ClientId { get; private set; } - public int? ImplementerId { get; set; } + [DataMember] + public int? ImplementerId { get; set; } [Required] + [DataMember] public int Count { get; set; } [Required] + [DataMember] public double Sum { get; set; } [Required] + [DataMember] public OrderStatus Status { get; set; } [Required] + [DataMember] public DateTime DateCreate { get; set; } - + [DataMember] public DateTime? DateImplement { get; set; } public virtual Computer Computer { get; set; } public virtual Client Client { get; set; } diff --git a/ComputersShop/ComputersShopFileImplement/Models/Client.cs b/ComputersShop/ComputersShopFileImplement/Models/Client.cs index 3e3b617..2d56c82 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/Client.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/Client.cs @@ -4,20 +4,23 @@ using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace ComputersShopFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public string ClientFIO { get; private set; } = string.Empty; - + [DataMember] public string Email { get; private set; } = string.Empty; - + [DataMember] public string Password { get; private set; } = string.Empty; - + [DataMember] public int Id { get; private set; } public static Client? Create(ClientBindingModel model) diff --git a/ComputersShop/ComputersShopFileImplement/Models/Component.cs b/ComputersShop/ComputersShopFileImplement/Models/Component.cs index c25e38b..d70c09c 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/Component.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/Component.cs @@ -4,16 +4,21 @@ using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace ComputersShopFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ComponentName { get; private set; } = string.Empty; + [DataMember] public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { diff --git a/ComputersShop/ComputersShopFileImplement/Models/Computer.cs b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs index 5854244..76fab49 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/Computer.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs @@ -4,16 +4,21 @@ using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace ComputersShopFileImplement.Models { + [DataContract] public class Computer : IComputerModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ComputerName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _ComputerComponents = null; diff --git a/ComputersShop/ComputersShopFileImplement/Models/Implementer.cs b/ComputersShop/ComputersShopFileImplement/Models/Implementer.cs index a777a6f..9754e0a 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/Implementer.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/Implementer.cs @@ -4,23 +4,26 @@ using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace ComputersShopFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public string ImplementerFIO { get; set; } = string.Empty; - + [DataMember] public string Password { get; set; } = string.Empty; - - public int WorkExperience { get; set; } - - public int Qualification { get; set; } - - public int Id { get; set; } + [DataMember] + public int WorkExperience { get; set; } + [DataMember] + public int Qualification { get; set; } + [DataMember] + public int Id { get; set; } public static Implementer? Create(ImplementerBindingModel? model) { diff --git a/ComputersShop/ComputersShopFileImplement/Models/Message.cs b/ComputersShop/ComputersShopFileImplement/Models/Message.cs index 5a2676d..ea82bff 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/Message.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/Message.cs @@ -4,24 +4,27 @@ using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace ComputersShopFileImplement.Models { + [DataContract] public class Message : IMessageInfoModel { + [DataMember] public string MessageId { get; private set; } = string.Empty; - + [DataMember] public int? ClientId { get; private set; } - + [DataMember] public string SenderName { get; private set; } = string.Empty; - + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; - + [DataMember] public string Subject { get; private set; } = string.Empty; - + [DataMember] public string Body { get; private set; } = string.Empty; public int Id => throw new NotImplementedException(); diff --git a/ComputersShop/ComputersShopFileImplement/Models/Order.cs b/ComputersShop/ComputersShopFileImplement/Models/Order.cs index e92d75e..222bb70 100644 --- a/ComputersShop/ComputersShopFileImplement/Models/Order.cs +++ b/ComputersShop/ComputersShopFileImplement/Models/Order.cs @@ -5,30 +5,33 @@ using ComputersShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace ComputersShopFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int ComputerId { get; private set; } - + [DataMember] public int ClientId { get; set; } - - public int? ImplementerId { get; private set; } - - public int Count { get; private set; } - + [DataMember] + public int? ImplementerId { get; private set; } + [DataMember] + public int Count { get; private set; } + [DataMember] public double Sum { get; private set; } - + [DataMember] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - + [DataMember] public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); - + [DataMember] public DateTime? DateImplement { get; private set; } - + [DataMember] public int Id { get; private set; } public static Order? Create(OrderBindingModel? model)