Вторая усложнённая лабораторная работа.

This commit is contained in:
abazov73 2023-04-26 23:58:53 +04:00
parent b9a705aee6
commit cce2b9f879
14 changed files with 344 additions and 9 deletions

View File

@ -40,6 +40,8 @@
this.PastryId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.PastryId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PastryName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.PastryName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.textBoxCapacity = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -77,7 +79,7 @@
// //
// buttonCancel // buttonCancel
// //
this.buttonCancel.Location = new System.Drawing.Point(376, 276); this.buttonCancel.Location = new System.Drawing.Point(376, 313);
this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(94, 29); this.buttonCancel.Size = new System.Drawing.Size(94, 29);
this.buttonCancel.TabIndex = 7; this.buttonCancel.TabIndex = 7;
@ -87,7 +89,7 @@
// //
// buttonSave // buttonSave
// //
this.buttonSave.Location = new System.Drawing.Point(276, 276); this.buttonSave.Location = new System.Drawing.Point(276, 313);
this.buttonSave.Name = "buttonSave"; this.buttonSave.Name = "buttonSave";
this.buttonSave.Size = new System.Drawing.Size(94, 29); this.buttonSave.Size = new System.Drawing.Size(94, 29);
this.buttonSave.TabIndex = 6; this.buttonSave.TabIndex = 6;
@ -120,7 +122,7 @@
this.PastryId, this.PastryId,
this.PastryName, this.PastryName,
this.Count}); this.Count});
this.dataGridView.Location = new System.Drawing.Point(120, 105); this.dataGridView.Location = new System.Drawing.Point(120, 142);
this.dataGridView.MultiSelect = false; this.dataGridView.MultiSelect = false;
this.dataGridView.Name = "dataGridView"; this.dataGridView.Name = "dataGridView";
this.dataGridView.RowHeadersVisible = false; this.dataGridView.RowHeadersVisible = false;
@ -155,11 +157,29 @@
this.Count.ReadOnly = true; this.Count.ReadOnly = true;
this.Count.Width = 125; this.Count.Width = 125;
// //
// textBoxCapacity
//
this.textBoxCapacity.Location = new System.Drawing.Point(120, 105);
this.textBoxCapacity.Name = "textBoxCapacity";
this.textBoxCapacity.Size = new System.Drawing.Size(350, 27);
this.textBoxCapacity.TabIndex = 16;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(11, 108);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(103, 20);
this.label3.TabIndex = 15;
this.label3.Text = "Вместимость:";
//
// FormShop // FormShop
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(478, 317); this.ClientSize = new System.Drawing.Size(478, 354);
this.Controls.Add(this.textBoxCapacity);
this.Controls.Add(this.label3);
this.Controls.Add(this.dataGridView); this.Controls.Add(this.dataGridView);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.openingDateTimePicker); this.Controls.Add(this.openingDateTimePicker);
@ -192,5 +212,7 @@
private DataGridViewTextBoxColumn PastryId; private DataGridViewTextBoxColumn PastryId;
private DataGridViewTextBoxColumn PastryName; private DataGridViewTextBoxColumn PastryName;
private DataGridViewTextBoxColumn Count; private DataGridViewTextBoxColumn Count;
private TextBox textBoxCapacity;
private Label label3;
} }
} }

View File

@ -43,6 +43,11 @@ namespace Confectionery
MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return; return;
} }
if (string.IsNullOrEmpty(textBoxCapacity.Text))
{
MessageBox.Show("Заполните вместимость", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
_logger.LogInformation("Сохранение магазина"); _logger.LogInformation("Сохранение магазина");
try try
{ {
@ -52,6 +57,7 @@ namespace Confectionery
ShopName = textBoxName.Text, ShopName = textBoxName.Text,
ShopAdress = textBoxAdress.Text, ShopAdress = textBoxAdress.Text,
OpeningDate = openingDateTimePicker.Value.Date, OpeningDate = openingDateTimePicker.Value.Date,
PastryCapacity = Convert.ToInt32(textBoxCapacity.Text),
ShopPastries = _shopPastries ShopPastries = _shopPastries
}; };
var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
@ -83,6 +89,7 @@ namespace Confectionery
textBoxName.Text = view.ShopName; textBoxName.Text = view.ShopName;
textBoxAdress.Text = view.ShopAdress; textBoxAdress.Text = view.ShopAdress;
openingDateTimePicker.Value = view.OpeningDate; openingDateTimePicker.Value = view.OpeningDate;
textBoxCapacity.Text = view.PastryCapacity.ToString();
_shopPastries = view.ShopPastries; _shopPastries = view.ShopPastries;
foreach (var pc in view.ShopPastries) foreach (var pc in view.ShopPastries)
{ {

View File

@ -17,11 +17,13 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage; private readonly IOrderStorage _orderStorage;
private readonly IShopStorage _shopStorage;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage) public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
{ {
_logger = logger; _logger = logger;
_orderStorage = orderStorage; _orderStorage = orderStorage;
_shopStorage = shopStorage;
} }
public bool CreateOrder(OrderBindingModel model) public bool CreateOrder(OrderBindingModel model)
@ -54,6 +56,7 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
_logger.LogWarning("Status change operation failed"); _logger.LogWarning("Status change operation failed");
throw new InvalidOperationException("Заказ должен быть переведен в статус готовности перед выдачей!"); throw new InvalidOperationException("Заказ должен быть переведен в статус готовности перед выдачей!");
} }
model.Status = OrderStatus.Выдан; model.Status = OrderStatus.Выдан;
model.DateImplement = DateTime.Now; model.DateImplement = DateTime.Now;
_orderStorage.Update(model); _orderStorage.Update(model);
@ -77,6 +80,8 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
_logger.LogWarning("Status change operation failed"); _logger.LogWarning("Status change operation failed");
throw new InvalidOperationException("Заказ должен быть переведен в статус выполнения перед готовностью!"); throw new InvalidOperationException("Заказ должен быть переведен в статус выполнения перед готовностью!");
} }
bool hasFreeSpace = _shopStorage.Supply(element.PastryId, element.Count);
if (!hasFreeSpace) throw new InvalidOperationException("В магазинах недостаточно места, чтобы вместить данный заказ!");
model.Status = OrderStatus.Готов; model.Status = OrderStatus.Готов;
_orderStorage.Update(model); _orderStorage.Update(model);
return true; return true;

View File

@ -106,6 +106,10 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
{ {
throw new ArgumentNullException("Нет адресса иагазина", nameof(model.ShopAdress)); throw new ArgumentNullException("Нет адресса иагазина", nameof(model.ShopAdress));
} }
if (model.PastryCapacity <= 0)
{
throw new InvalidOperationException("Вместимоcть должна быть больше 0");
}
_logger.LogInformation("Shop. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id); _logger.LogInformation("Shop. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
var element = _shopStorage.GetElement(new ShopSearchModel var element = _shopStorage.GetElement(new ShopSearchModel
{ {
@ -152,7 +156,8 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
ShopName = element.ShopName, ShopName = element.ShopName,
ShopAdress = element.ShopAdress, ShopAdress = element.ShopAdress,
OpeningDate = element.OpeningDate, OpeningDate = element.OpeningDate,
ShopPastries = element.ShopPastries ShopPastries = element.ShopPastries,
PastryCapacity = element.PastryCapacity
}); });
return true; return true;
} }

View File

@ -12,6 +12,7 @@ namespace ConfectioneryContracts.BindingModels
public int Id { get; set; } public int Id { get; set; }
public string ShopName { get; set; } = string.Empty; public string ShopName { get; set; } = string.Empty;
public string ShopAdress { get; set; } = string.Empty; public string ShopAdress { get; set; } = string.Empty;
public int PastryCapacity { get; set; }
public DateTime OpeningDate { get; set; } public DateTime OpeningDate { get; set; }
public Dictionary<int, (IPastryModel, int)> ShopPastries public Dictionary<int, (IPastryModel, int)> ShopPastries
{ {

View File

@ -1,6 +1,7 @@
using ConfectioneryContracts.BindingModels; using ConfectioneryContracts.BindingModels;
using ConfectioneryContracts.SearchModels; using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.ViewModels; using ConfectioneryContracts.ViewModels;
using ConfectioneryDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -17,5 +18,7 @@ namespace ConfectioneryContracts.StoragesContracts
ShopViewModel? Insert(ShopBindingModel model); ShopViewModel? Insert(ShopBindingModel model);
ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Update(ShopBindingModel model);
ShopViewModel? Delete(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model);
bool Supply(int pastryId, int count);
bool Sell(int pastryId, int count);
} }
} }

View File

@ -17,6 +17,8 @@ namespace ConfectioneryContracts.ViewModels
public string ShopAdress { get; set; } = String.Empty; public string ShopAdress { get; set; } = String.Empty;
[DisplayName("Дата открытия")] [DisplayName("Дата открытия")]
public DateTime OpeningDate { get; set; } public DateTime OpeningDate { get; set; }
[DisplayName("Макс. вместимость")]
public int PastryCapacity { get; set; }
public Dictionary<int, (IPastryModel, int)> ShopPastries public Dictionary<int, (IPastryModel, int)> ShopPastries
{ {
get; get;

View File

@ -10,6 +10,7 @@ namespace ConfectioneryDataModels.Models
{ {
string ShopName { get; } string ShopName { get; }
string ShopAdress { get; } string ShopAdress { get; }
int PastryCapacity { get; }
DateTime OpeningDate { get; } DateTime OpeningDate { get; }
Dictionary<int, (IPastryModel, int)> ShopPastries { get; } Dictionary<int, (IPastryModel, int)> ShopPastries { get; }
} }

View File

@ -15,9 +15,11 @@ namespace ConfectioneryFileImplement
private readonly string IngredientFileName = "Ingredient.xml"; private readonly string IngredientFileName = "Ingredient.xml";
private readonly string OrderFileName = "Order.xml"; private readonly string OrderFileName = "Order.xml";
private readonly string PastryFileName = "Pastry.xml"; private readonly string PastryFileName = "Pastry.xml";
private readonly string ShopFileName = "Shop.xml";
public List<Ingredient> Ingredients { get; private set; } public List<Ingredient> Ingredients { get; private set; }
public List<Order> Orders { get; private set; } public List<Order> Orders { get; private set; }
public List<Pastry> Pastries { get; private set; } public List<Pastry> Pastries { get; private set; }
public List<Shop> Shops { get; private set; }
public static DataFileSingleton GetInstance() public static DataFileSingleton GetInstance()
{ {
if (instance == null) if (instance == null)
@ -29,11 +31,13 @@ namespace ConfectioneryFileImplement
public void SaveIngredients() => SaveData(Ingredients, IngredientFileName, "Ingredients", x => x.GetXElement); public void SaveIngredients() => SaveData(Ingredients, IngredientFileName, "Ingredients", x => x.GetXElement);
public void SavePastries() => SaveData(Pastries, PastryFileName, "Pastries", x => x.GetXElement); public void SavePastries() => SaveData(Pastries, PastryFileName, "Pastries", x => x.GetXElement);
public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
private DataFileSingleton() private DataFileSingleton()
{ {
Ingredients = LoadData(IngredientFileName, "Ingredient", x => Ingredient.Create(x)!)!; Ingredients = LoadData(IngredientFileName, "Ingredient", x => Ingredient.Create(x)!)!;
Pastries = LoadData(PastryFileName, "Pastry", x => Pastry.Create(x)!)!; Pastries = LoadData(PastryFileName, "Pastry", x => Pastry.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
} }
private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction) private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
{ {

View File

@ -0,0 +1,166 @@
using ConfectioneryContracts.BindingModels;
using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.StoragesContracts;
using ConfectioneryContracts.ViewModels;
using ConfectioneryDataModels.Models;
using ConfectioneryFileImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace ConfectioneryFileImplement.Implements
{
public class ShopStorage : IShopStorage
{
private readonly DataFileSingleton source;
public ShopStorage()
{
source = DataFileSingleton.GetInstance();
}
public List<ShopViewModel> GetFullList()
{
return source.Shops
.Select(x => x.GetViewModel)
.ToList();
}
public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
{
if (string.IsNullOrEmpty(model.ShopName))
{
return new();
}
return source.Shops
.Where(x => x.ShopName.Contains(model.ShopName))
.Select(x => x.GetViewModel)
.ToList();
}
public ShopViewModel? GetElement(ShopSearchModel model)
{
if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
{
return null;
}
return source.Shops
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
(model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
public ShopViewModel? Insert(ShopBindingModel model)
{
model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
var newShop = Shop.Create(model);
if (newShop == null)
{
return null;
}
source.Shops.Add(newShop);
source.SaveShops();
return newShop.GetViewModel;
}
public ShopViewModel? Update(ShopBindingModel model)
{
var pastry = source.Shops.FirstOrDefault(x => x.Id == model.Id);
if (pastry == null)
{
return null;
}
pastry.Update(model);
source.SaveShops();
return pastry.GetViewModel;
}
public ShopViewModel? Delete(ShopBindingModel model)
{
var element = source.Shops.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
source.Shops.Remove(element);
source.SaveShops();
return element.GetViewModel;
}
return null;
}
public bool Supply(int pastryId, int count)
{
int freeSpace = source.Shops.Select(x => x.PastryCapacity - x.ShopPastries.Select(y => y.Value.Item2).Sum()).Sum();
if (freeSpace < count)
{
return false;
}
foreach (Shop shop in source.Shops){
int freeShopSpace = shop.PastryCapacity - shop.ShopPastries.Select(y => y.Value.Item2).Sum();
if (freeShopSpace > 0)
{
if (freeShopSpace >= count)
{
if (shop.Pastries.ContainsKey(pastryId))
{
shop.Pastries[pastryId] += count;
}
else
{
shop.Pastries.Add(pastryId, count);
}
shop.setShopPastriesNull();
return true;
}
else
{
int dif = count - freeShopSpace;
count -= freeShopSpace;
if (shop.Pastries.TryGetValue(pastryId, out var pastryCount))
{
shop.Pastries[pastryId] = pastryCount + count;
}
else
{
shop.Pastries.Add(pastryId, count);
}
shop.setShopPastriesNull();
}
}
}
return false;
}
public bool Sell(int pastryId, int count)
{
int pastryCount = source.Shops.Select(x => x.ShopPastries.Select(y => y.Value).Where(y => y.Item1.Id == pastryId).Sum(y => y.Item2)).Sum();
if (pastryCount < count)
{
return false;
}
foreach (Shop shop in source.Shops)
{
int shopPastryCount = shop.ShopPastries.Select(x => x.Value).Where(x => x.Item1.Id == pastryId).Sum(x => x.Item2);
if (count - shopPastryCount >= 0)
{
count -= shopPastryCount;
shop.Pastries.Remove(pastryId);
shop.setShopPastriesNull();
}
else
{
count = 0;
shop.Pastries[pastryId] -= count;
shop.setShopPastriesNull();
}
if (count == 0)
{
source.SaveShops();
return true;
}
}
return false;
}
}
}

View File

@ -10,7 +10,7 @@ using System.Xml.Linq;
namespace ConfectioneryFileImplement.Models namespace ConfectioneryFileImplement.Models
{ {
public class Pastry public class Pastry : IPastryModel
{ {
public int Id { get; private set; } public int Id { get; private set; }
public string PastryName { get; private set; } = string.Empty; public string PastryName { get; private set; } = string.Empty;

View File

@ -0,0 +1,104 @@
using ConfectioneryContracts.BindingModels;
using ConfectioneryContracts.ViewModels;
using ConfectioneryDataModels.Models;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace ConfectioneryFileImplement.Models
{
public class Shop : IShopModel
{
public int Id { get; private set; }
public string ShopName { get; private set; } = string.Empty;
public string ShopAdress { get; private set; } = string.Empty;
public int PastryCapacity { get; private set; }
public DateTime OpeningDate { get; private set; }
public Dictionary<int, int> Pastries { get; private set; } = new();
private Dictionary<int, (IPastryModel, int)>? _shopPastries = null;
public Dictionary<int, (IPastryModel, int)> ShopPastries
{
get
{
if (_shopPastries == null)
{
var source = DataFileSingleton.GetInstance();
_shopPastries = Pastries.ToDictionary(x => x.Key, y => ((source.Pastries.FirstOrDefault(z => z.Id == y.Key) as IPastryModel)!, y.Value));
}
return _shopPastries;
}
}
public static Shop? Create(ShopBindingModel? model)
{
if (model == null)
{
return null;
}
return new Shop()
{
Id = model.Id,
ShopName = model.ShopName,
ShopAdress = model.ShopAdress,
OpeningDate = model.OpeningDate,
Pastries = model.ShopPastries.ToDictionary(x => x.Key, x => x.Value.Item2),
PastryCapacity = model.PastryCapacity
};
}
public static Shop? Create(XElement element)
{
if (element == null)
{
return null;
}
return new Shop()
{
Id = Convert.ToInt32(element.Attribute("Id")!.Value),
ShopName = element.Element("ShopName")!.Value,
ShopAdress = element.Element("ShopAdress")!.Value,
PastryCapacity = Convert.ToInt32(element.Element("PastryCapacity")!.Value),
OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
Pastries = element.Element("ShopPastries")!.Elements("ShopPastry").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
};
}
public void Update(ShopBindingModel? model)
{
if (model == null)
{
return;
}
ShopName = model.ShopName;
ShopAdress = model.ShopAdress;
OpeningDate = model.OpeningDate;
Pastries = model.ShopPastries.ToDictionary(x => x.Key, x => x.Value.Item2);
_shopPastries = null;
PastryCapacity = model.PastryCapacity;
}
public ShopViewModel GetViewModel => new()
{
Id = Id,
ShopName = ShopName,
ShopAdress = ShopAdress,
ShopPastries = ShopPastries,
OpeningDate = OpeningDate,
PastryCapacity = PastryCapacity,
};
internal void setShopPastriesNull()
{
_shopPastries = null;
}
public XElement GetXElement => new("Shop",
new XAttribute("Id", Id),
new XElement("ShopName", ShopName),
new XElement("ShopAdress", ShopAdress),
new XElement("PastryCapacity", PastryCapacity.ToString()),
new XElement("OpeningDate", OpeningDate.ToString()),
new XElement("ShopPastries", Pastries.Select(x => new XElement("ShopPastry",
new XElement("Key", x.Key),
new XElement("Value", x.Value)))
.ToArray()));
}
}

View File

@ -2,6 +2,7 @@
using ConfectioneryContracts.SearchModels; using ConfectioneryContracts.SearchModels;
using ConfectioneryContracts.StoragesContracts; using ConfectioneryContracts.StoragesContracts;
using ConfectioneryContracts.ViewModels; using ConfectioneryContracts.ViewModels;
using ConfectioneryDataModels.Models;
using ConfectioneryListImplement.Models; using ConfectioneryListImplement.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -107,5 +108,15 @@ namespace ConfectioneryListImplement.Implements
} }
return null; return null;
} }
public bool Supply(int pastryId, int count)
{
throw new NotImplementedException();
}
public bool Sell(int pastryId, int count)
{
throw new NotImplementedException();
}
} }
} }

View File

@ -15,6 +15,7 @@ namespace ConfectioneryListImplement.Models
public int Id { get; private set; } public int Id { get; private set; }
public string ShopName { get; private set; } = string.Empty; public string ShopName { get; private set; } = string.Empty;
public string ShopAdress { get; private set; } = string.Empty; public string ShopAdress { get; private set; } = string.Empty;
public int PastryCapacity { get; private set; }
public DateTime OpeningDate { get; private set; } public DateTime OpeningDate { get; private set; }
public Dictionary<int, (IPastryModel, int)> ShopPastries { get; private set; } = new Dictionary<int, (IPastryModel, int)>(); public Dictionary<int, (IPastryModel, int)> ShopPastries { get; private set; } = new Dictionary<int, (IPastryModel, int)>();
public static Shop? Create(ShopBindingModel? model) public static Shop? Create(ShopBindingModel? model)
@ -29,7 +30,8 @@ namespace ConfectioneryListImplement.Models
ShopName = model.ShopName, ShopName = model.ShopName,
ShopAdress = model.ShopAdress, ShopAdress = model.ShopAdress,
OpeningDate = model.OpeningDate, OpeningDate = model.OpeningDate,
ShopPastries = model.ShopPastries ShopPastries = model.ShopPastries,
PastryCapacity = model.PastryCapacity
}; };
} }
public void Update(ShopBindingModel? model) public void Update(ShopBindingModel? model)
@ -42,6 +44,7 @@ namespace ConfectioneryListImplement.Models
ShopAdress = model.ShopAdress; ShopAdress = model.ShopAdress;
OpeningDate = model.OpeningDate; OpeningDate = model.OpeningDate;
ShopPastries = model.ShopPastries; ShopPastries = model.ShopPastries;
PastryCapacity = model.PastryCapacity;
} }
public ShopViewModel GetViewModel => new() public ShopViewModel GetViewModel => new()
{ {
@ -49,7 +52,8 @@ namespace ConfectioneryListImplement.Models
ShopName = ShopName, ShopName = ShopName,
ShopAdress = ShopAdress, ShopAdress = ShopAdress,
ShopPastries = ShopPastries, ShopPastries = ShopPastries,
OpeningDate = OpeningDate OpeningDate = OpeningDate,
PastryCapacity = PastryCapacity,
}; };
} }
} }