переделала

This commit is contained in:
malimova 2024-03-29 10:25:32 +04:00
parent 1aa7bda038
commit 0334b81e8f
2 changed files with 24 additions and 21 deletions

View File

@ -15,8 +15,7 @@ namespace ConfectioneryDatabaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabaseFull;Integrated
Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}

View File

@ -14,34 +14,38 @@ namespace ConfectioneryDatabaseImplement.Models
public class Order : IOrderModel
{
public int Id { get; private set; }
[Required]
public int Count { get; private set; }
[Required]
public double Sum { get; private set; }
[Required]
public OrderStatus Status { get; private set; }
[Required]
public DateTime DateCreate { get; private set; }
public DateTime? DateImplement { get; private set; }
[Required]
public int PastryId { get; private set; }
public virtual Pastry Pastry { get; private set; }
public static Order? Create(ConfectioneryDatabase context, OrderBindingModel model)
public virtual Pastry Pastry { get; set; } = new();
[Required]
public int Count { get; private set; }
[Required]
public double Sum { get; private set; }
[Required]
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
[Required]
public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; }
public static Order Create(ConfectioneryDatabase context, OrderBindingModel model)
{
if (model == null)
{
return null;
}
return new Order()
{
Id = model.Id,
PastryId = model.PastryId,
Pastry = context.Pastrys.First(x => x.Id == model.PastryId),
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
DateCreate = model.DateCreate,
DateImplement = model.DateImplement,
PastryId = model.PastryId,
Pastry = context.Pastrys.FirstOrDefault(x => x.Id == model.PastryId)
};
}
@ -57,14 +61,14 @@ namespace ConfectioneryDatabaseImplement.Models
public OrderViewModel GetViewModel => new()
{
Id = Id,
PastryId = PastryId,
PastryName = Pastry.PastryName,
Count = Count,
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement,
PastryName = Pastry.PastryName,
Id = Id,
};
}
}