Merge branch 'LabWork02Hard' into LabWork03Hard

SushiBar/SushiBarContracts/StoragesContracts/ISushiStorage.cs

@@ -1,7 +1,6 @@
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
 
 namespace SushiBarContracts.StoragesContracts
 {
@@ -13,7 +12,5 @@ namespace SushiBarContracts.StoragesContracts
         SushiViewModel? Insert(SushiBindingModel model);
         SushiViewModel? Update(SushiBindingModel model);
         SushiViewModel? Delete(SushiBindingModel model);
-        bool HasSushi(ISushiModel model, int needCount);
-        bool SellSushi(ISushiModel model, int count);
     }
 }

SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs

@@ -41,14 +41,8 @@ namespace SushiBarFileImplement.Implements
         private OrderViewModel GetViewModel(Order order)
         {
             var viewModel = order.GetViewModel;
-            foreach (var sushi in source.ListSushi)
+            var sushi = source.ListSushi.FirstOrDefault(x => x.Id == order.SushiId);
-            {
+            if (sushi != null) viewModel.SushiName = sushi.SushiName;
-                if (sushi.Id == order.SushiId)
-                {
-                    viewModel.SushiName = sushi.SushiName;
-                    break;
-                }
-            }
             return viewModel;
         }
         public OrderViewModel? Insert(OrderBindingModel model)

SushiBar/SushiBarFileImplement/Implements/SushiStorage.cs

@@ -72,40 +72,5 @@ namespace SushiBarFileImplement.Implements
             }
             return null;
         }
-        public bool HasSushi(ISushiModel sushi, int needCount)
-        {
-            var temp = source.Shops
-                .Select(x => x.ListSushi
-                .FirstOrDefault(x => x.Key == sushi.Id).Value.Item2).Sum();
-            return temp >= needCount;
-        }
-
-        public bool SellSushi(ISushiModel model, int count)
-        {
-            if (!HasSushi(model, count))
-            {
-                return false;
-            }
-            
-            foreach (var shop in source.Shops.Where(x => x.ListSushi.ContainsKey(model.Id)))
-            {
-                if (shop.ListSushi[model.Id].Item2 < count)
-                {
-                    shop.ListSushi[model.Id] = (shop.ListSushi[model.Id].Item1, 0);
-                    count -= shop.ListSushi[model.Id].Item2;
-                }
-                else
-                {
-                    shop.ListSushi[model.Id] = (shop.ListSushi[model.Id].Item1, 
-                        shop.ListSushi[model.Id].Item2 - count);
-                    count -= count;
-                }
-                if (count <= 0)
-                {
-                    return true;
-                }
-            }
-            return true;
-        }
     }
 }

SushiBar/SushiBarListImplement/Implements/SushiStorage.cs

@@ -2,7 +2,6 @@
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
 using SushiBarListImplement.Models;
 
 namespace SushiBarListImplement.Implements
@@ -99,15 +98,5 @@ namespace SushiBarListImplement.Implements
             }
             return null;
         }
-
-        public bool HasSushi(ISushiModel model, int needCount)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool SellSushi(ISushiModel model, int count)
-        {
-            throw new NotImplementedException();
-        }
     }
 }