From e485a46c9f9a9cbe8a57d5eefc878619346de755 Mon Sep 17 00:00:00 2001 From: Ivan_Starostin Date: Fri, 21 Jun 2024 21:41:18 +0400 Subject: [PATCH] Upload files to 'ShipyardFileImplement' --- ShipyardFileImplement/MessageInfo.cs | 9 ++++++ ShipyardFileImplement/Order.cs | 29 +++++++++++++------ ShipyardFileImplement/Ship.cs | 19 +++++++----- .../ShipyardFileImplemented.csproj | 4 +-- 4 files changed, 43 insertions(+), 18 deletions(-) diff --git a/ShipyardFileImplement/MessageInfo.cs b/ShipyardFileImplement/MessageInfo.cs index 2ba9ab6..4057cfe 100644 --- a/ShipyardFileImplement/MessageInfo.cs +++ b/ShipyardFileImplement/MessageInfo.cs @@ -4,20 +4,29 @@ using ShipyardDataModels; 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 ShipyardFileImplemented.Models { + [DataContract] public class MessageInfo : 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(); public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/ShipyardFileImplement/Order.cs b/ShipyardFileImplement/Order.cs index 6368785..5e453d0 100644 --- a/ShipyardFileImplement/Order.cs +++ b/ShipyardFileImplement/Order.cs @@ -5,23 +5,34 @@ using ShipyardDataModels.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 ShipyardFileImplement.Models { - public class Order : IOrderModel - { - public int Id { get; private set; } - public int ShipId { get; private set; } - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } - public DateTime DateCreate { get; private set; } - public DateTime? DateImplement { get; private set; } + [DataContract] + public class Order : IOrderModel + { + [DataMember] + public int Id { get; private set; } + [DataMember] + public int ShipId { get; private set; } + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } = null; + [DataMember] + public int Count { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel model) { diff --git a/ShipyardFileImplement/Ship.cs b/ShipyardFileImplement/Ship.cs index ebcaea9..cfcd54b 100644 --- a/ShipyardFileImplement/Ship.cs +++ b/ShipyardFileImplement/Ship.cs @@ -4,20 +4,25 @@ using ShipyardDataModels.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 ShipyardFileImplement.Models { - public class Ship : IShipModel - { - public int Id { get; private set; } - public string ShipName { get; private set; } = string.Empty; - public double Price { get; private set; } - public Dictionary Components { get; private set; } = new(); + [DataContract] + public class Ship : IShipModel + { + public int Id { get; private set; } + [DataMember] + public string ShipName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); private Dictionary? _ShipComponents = null; - public Dictionary ShipComponents + [DataMember] + public Dictionary ShipComponents { get { diff --git a/ShipyardFileImplement/ShipyardFileImplemented.csproj b/ShipyardFileImplement/ShipyardFileImplemented.csproj index 6559eb4..432db0f 100644 --- a/ShipyardFileImplement/ShipyardFileImplemented.csproj +++ b/ShipyardFileImplement/ShipyardFileImplemented.csproj @@ -16,8 +16,8 @@ - - + +