Merge branch 'LabWork02_Base' into LabWork02_Hard

LawFirm/LawFirm/FormCreateOrder.cs

@@ -103,7 +103,6 @@ namespace LawFirmView
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
                     DocumentId = Convert.ToInt32(comboBoxDocument.SelectedValue),
-                    DocumentName = comboBoxDocument.Text,
                     Count = Convert.ToInt32(textBoxCount.Text),
                     Sum = Convert.ToDouble(textBoxSum.Text)
                 });

LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -64,7 +64,6 @@ namespace LawFirmBusinessLogic.BusinessLogics
             {
                 Id = viewModel.Id,
                 DocumentId = viewModel.DocumentId,
-                DocumentName = viewModel.DocumentName,
                 Status = viewModel.Status,
                 DateCreate = viewModel.DateCreate,
                 DateImplement = viewModel.DateImplement,
@@ -72,7 +71,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
                 Sum = viewModel.Sum
             };
 
-            CheckModel(model);
+            CheckModel(model, false);
             if (model.Status + 1 != newStatus)
             {
                 _logger.LogWarning("Status update to " + newStatus.ToString() +" operation failed. Order status incorrect.");

LawFirm/LawFirmContracts/BindingModels/OrderBindingModel.cs

@@ -12,8 +12,6 @@ namespace LawFirmContracts.BindingModels
     {
         public int DocumentId { get; set; }
 
-        public string DocumentName { get; set; } = string.Empty;
-
         public int Count { get; set; }
 
         public double Sum { get; set; }

LawFirm/LawFirmDataModels/Models/IOrderModel.cs

@@ -10,7 +10,6 @@ namespace LawFirmDataModels.Models
     public interface IOrderModel : IId
     {
         int DocumentId { get; }
-        string DocumentName { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs

@@ -26,8 +26,8 @@ namespace LawFirmFileImplement.Implements
             {
                 return null;
             }
-            return source.Orders
+            return GetViewModel(source.Orders
-            .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+            .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -38,13 +38,13 @@ namespace LawFirmFileImplement.Implements
             }
             return source.Orders
                 .Where(x => x.Id == model.Id)
-                .Select(x => x.GetViewModel)
+                .Select(x => GetViewModel(x))
                 .ToList();
         }
 
         public List<OrderViewModel> GetFullList()
         {
-            return source.Orders.Select(x => x.GetViewModel).ToList();
+            return source.Orders.Select(x => GetViewModel(x)).ToList();
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -57,7 +57,7 @@ namespace LawFirmFileImplement.Implements
             }
             source.Orders.Add(newOrder);
             source.SaveOrders();
-            return newOrder.GetViewModel;
+            return GetViewModel(newOrder);
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -69,7 +69,7 @@ namespace LawFirmFileImplement.Implements
             }
             order.Update(model);
             source.SaveOrders();
-            return order.GetViewModel;
+            return GetViewModel(order);
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {
@@ -80,7 +80,21 @@ namespace LawFirmFileImplement.Implements
             }
             source.Orders.Remove(order);
             source.SaveOrders();
-            return order.GetViewModel;
+            return GetViewModel(order);
+        }
+
+        private OrderViewModel GetViewModel(Order order)
+        {
+            var viewModel = order.GetViewModel;
+            foreach (var document in source.Documents)
+            {
+                if (document.Id == order.DocumentId)
+                {
+                    viewModel.DocumentName = document.DocumentName;
+                    break;
+                }
+            }
+            return viewModel;
         }
 
     }

LawFirm/LawFirmFileImplement/Models/Order.cs

@@ -15,8 +15,6 @@ namespace LawFirmFileImplement.Models
     {
         public int DocumentId { get; private set; }
 
-        public string DocumentName { get; private set; } = string.Empty;
-
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -38,7 +36,6 @@ namespace LawFirmFileImplement.Models
             return new Order
             {
                 DocumentId = model.DocumentId,
-                DocumentName = model.DocumentName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -57,7 +54,6 @@ namespace LawFirmFileImplement.Models
             return new Order()
             {
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                DocumentName = element.Element("DocumentName")!.Value,
                 DocumentId = Convert.ToInt32(element.Element("DocumentId")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
@@ -73,20 +69,13 @@ namespace LawFirmFileImplement.Models
             {
                 return;
             }
-            DocumentId = model.DocumentId;
-            DocumentName = model.DocumentName;
-            Count = model.Count;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
-            Id = model.Id;
         }
 
         public OrderViewModel GetViewModel => new()
         {
             DocumentId = DocumentId,
-            DocumentName = DocumentName,
             Count = Count,
             Sum = Sum,
             DateCreate = DateCreate,
@@ -98,7 +87,6 @@ namespace LawFirmFileImplement.Models
         public XElement GetXElement => new(
             "Order",
              new XAttribute("Id", Id),
-             new XElement("DocumentName", DocumentName),
              new XElement("DocumentId", DocumentId.ToString()),
              new XElement("Count", Count.ToString()),
              new XElement("Sum", Sum.ToString()),

LawFirm/LawFirmListImplements/Implements/OrderStorage.cs

@@ -30,7 +30,7 @@ namespace LawFirmListImplements.Implements
             {
                 if (model.Id.HasValue && order.Id == model.Id)
                 {
-                    return order.GetViewModel;
+                    return GetViewModel(order);
                 }
             }
             return null;
@@ -47,7 +47,7 @@ namespace LawFirmListImplements.Implements
             {
                 if (order.Id == model.Id)
                 {
-                    result.Add(order.GetViewModel);
+                    result.Add(GetViewModel(order));
                 }
             }
             return result;
@@ -58,7 +58,7 @@ namespace LawFirmListImplements.Implements
             var result = new List<OrderViewModel>();
             foreach (var order in _source.Orders)
             {
-                result.Add(order.GetViewModel);
+                result.Add(GetViewModel(order));
             }
             return result;
         }
@@ -79,7 +79,7 @@ namespace LawFirmListImplements.Implements
                 return null;
             }
             _source.Orders.Add(newOrder);
-            return newOrder.GetViewModel;
+            return GetViewModel(newOrder);
         }
 
         public OrderViewModel? Update(OrderBindingModel model)
@@ -89,7 +89,7 @@ namespace LawFirmListImplements.Implements
                 if (order.Id == model.Id)
                 {
                     order.Update(model);
-                    return order.GetViewModel;
+                    return GetViewModel(order);
                 }
             }
             return null;
@@ -102,11 +102,25 @@ namespace LawFirmListImplements.Implements
                 {
                     var element = _source.Orders[i];
                     _source.Orders.RemoveAt(i);
-                    return element.GetViewModel;
+                    return GetViewModel(element);
                 }
             }
             return null;
         }
 
+        private OrderViewModel GetViewModel(Order order)
+        {
+            var viewModel = order.GetViewModel;
+            foreach (var document in _source.Documents)
+            {
+                if (document.Id == order.DocumentId)
+                {
+                    viewModel.DocumentName = document.DocumentName;
+                    break;
+                }
+            }
+            return viewModel;
+        }
+
     }
 }

LawFirm/LawFirmListImplements/Models/Order.cs

@@ -14,8 +14,6 @@ namespace LawFirmListImplements.Models
     {
         public int DocumentId { get; private set; }
 
-        public string DocumentName { get; private set; } = string.Empty;
-
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -37,7 +35,6 @@ namespace LawFirmListImplements.Models
             return new Order
             {
                 DocumentId = model.DocumentId,
-                DocumentName = model.DocumentName,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -53,20 +50,13 @@ namespace LawFirmListImplements.Models
             {
                 return;
             }
-            DocumentId = model.DocumentId;
-            DocumentName = model.DocumentName;
-            Count = model.Count;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
-            Id = model.Id;
         }
 
         public OrderViewModel GetViewModel => new()
         {
             DocumentId = DocumentId,
-            DocumentName = DocumentName,
             Count = Count,
             Sum = Sum,
             DateCreate = DateCreate,