ns.potapov/PIbd-21_Potapov_N.S._SecuritySystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Реализовано взаимодействие с сущностью клиента в сущности заказа

Browse Source
This commit is contained in:
Никита Потапов 2024-04-06 23:41:33 +04:00
parent d67e4acbb8
commit 2bff37f117
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SecuritySystem/SecuritySystemContracts/SearchModels/OrderSearchModel.cs
View File

@ -5,5 +5,6 @@
public int? Id { get; set; } public int? Id { get; set; }
public DateTime? DateFrom { get; set; } public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; } public DateTime? DateTo { get; set; }
public int? ClientId { get; set; }
} }
} }

2
SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs
View File

@ -11,7 +11,7 @@ namespace SecuritySystemContracts.ViewModels
public int ClientId { get; set; } public int ClientId { get; set; }
public int SecureId { get; set; } public int SecureId { get; set; }
[DisplayName("ФИО клиента")] [DisplayName("ФИО клиента")]
public string ClientFIO { get; set; } public string ClientFIO { get; set; } = string.Empty;
[DisplayName("Изделие")] [DisplayName("Изделие")]
public string SecureName { get; set; } = string.Empty; public string SecureName { get; set; } = string.Empty;
[DisplayName("Количество")] [DisplayName("Количество")]

13
SecuritySystem/SecuritySystemDatabaseImplement/Implements/OrderStorage.cs
View File

@ -16,7 +16,7 @@ namespace SecuritySystemDatabaseImplement.Implements
return null; return null;
} }
using var context = new SecuritySystemDatabase(); using var context = new SecuritySystemDatabase();
return context.Orders.Include(x => x.Secure).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; return context.Orders.Include(x => x.Secure).Include(x => x.Client).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@ -24,6 +24,7 @@ namespace SecuritySystemDatabaseImplement.Implements
using var context = new SecuritySystemDatabase(); using var context = new SecuritySystemDatabase();
var orders = context.Orders var orders = context.Orders
.Include(x => x.Secure) .Include(x => x.Secure)
.Include(x => x.Client)
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
if (model.Id.HasValue) if (model.Id.HasValue)
@ -38,13 +39,17 @@ namespace SecuritySystemDatabaseImplement.Implements
{ {
orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
} }
if (model.ClientId.HasValue)
{
orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
}
return orders; return orders;
} }
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
using var context = new SecuritySystemDatabase(); using var context = new SecuritySystemDatabase();
return context.Orders.Include(x => x.Secure).Select(x => x.GetViewModel).ToList(); return context.Orders.Include(x => x.Secure).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)
@ -57,7 +62,7 @@ namespace SecuritySystemDatabaseImplement.Implements
using var context = new SecuritySystemDatabase(); using var context = new SecuritySystemDatabase();
context.Orders.Add(newOrder); context.Orders.Add(newOrder);
context.SaveChanges(); context.SaveChanges();
return context.Orders.Include(x => x.Secure).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel; return context.Orders.Include(x => x.Secure).Include(x => x.Client).FirstOrDefault(x => x.Id == newOrder.Id)?.GetViewModel;
} }
public OrderViewModel? Update(OrderBindingModel model) public OrderViewModel? Update(OrderBindingModel model)
@ -70,7 +75,7 @@ namespace SecuritySystemDatabaseImplement.Implements
} }
order.Update(model); order.Update(model);
context.SaveChanges(); context.SaveChanges();
return context.Orders.Include(x => x.Secure).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel; return context.Orders.Include(x => x.Secure).Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
} }
public OrderViewModel? Delete(OrderBindingModel model) public OrderViewModel? Delete(OrderBindingModel model)
{ {