ujijrujijr/PIbd-22_Chernyshev_Shabunov_CourseWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавил бизнес-логику (ПРОВЕРИТЬ) и подправил слой базы данных (ПРОВЕРИТЬ)

Browse Source
This commit is contained in:
ujijrujijr
2024-04-27 15:55:58 +04:00
parent 8bca6105f2
commit 2d89e0973b
15 changed files with 577 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
ComputerShopDatabaseImplement/Implements/OrderStorage.cs
View File

@@ -1,6 +1,10 @@
using ComputerShopContracts.StorageContracts;
using ComputerShopContracts.BindingModels;
using ComputerShopContracts.SearchModels;
using ComputerShopContracts.StorageContracts;
using ComputerShopContracts.ViewModels;
using ComputerShopDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,19 +14,116 @@ using System.Threading.Tasks;
namespace ComputerShopDatabaseImplement.Implements
{
//!!!ПОДОБИЕ component
//!!! ДОПИСАТЬ
public class OrderStorage : IOrderStorage
{
//!!!ТУТ НАДО ПОЛУЧАТЬ СПИСОК ТОЛЬКО ПОЛЬЗОВАТЕЛЯ, КАК-ТО ДОБАВИТЬ (мб убрать этот метод)
//!!!ТУТ СВЯЗЬ С НЕСКОЛЬКИМИ СУЩНОСТЯМИ
public List<RequestViewModel> GetFullList()
//!!!НЕ ФАКТ, ЧТО ПРАВИЛЬНО
//!!!мб присоединять user
public List<OrderViewModel> GetFullList()
{
//using var context = new ComputerShopDatabase();
//return context.Orders
// .Include(x => x.Shi)
// .ThenInclude(x => x.Order)
// .ToList()
// .Select(x => x.GetViewModel)
// .ToList();
using var context = new ComputerShopDatabase();
return context.Orders
.Include(x => x.ShipmentOrders)
.ThenInclude(x => x.Shipment)
.Include(x => x.RequestOrders)
.ThenInclude(x => x.Request)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
//!!!ПРОВЕРИТЬ
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
using var context = new ComputerShopDatabase();
if (model.DateFrom.HasValue && model.DateTo.HasValue)
{
return context.Orders
.Where(x => (x.UserId == model.UserId) && (x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo))
.Include(x => x.ShipmentOrders)
.ThenInclude(x => x.Shipment)
.Include(x => x.RequestOrders)
.ThenInclude(x => x.Request)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
else if (model.Status.HasValue)
{
return context.Orders
.Where(x => (x.UserId == model.UserId) && (x.Status == model.Status))
.Include(x => x.ShipmentOrders)
.ThenInclude(x => x.Shipment)
.Include(x => x.RequestOrders)
.ThenInclude(x => x.Request)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
//возвращение просто всех заказов пользователя (замена GetFullList)
return context.Orders
.Where(x => x.UserId == model.UserId)
.Include(x => x.ShipmentOrders)
.ThenInclude(x => x.Shipment)
.Include(x => x.RequestOrders)
.ThenInclude(x => x.Request)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
//!!!ПРОВЕРИТЬ
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return null;
}
using var context = new ComputerShopDatabase();
return context.Orders
.Include(x => x.ShipmentOrders)
.ThenInclude(x => x.Shipment)
.Include(x => x.RequestOrders)
.ThenInclude(x => x.Request)
.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
}
public OrderViewModel? Insert(OrderBindingModel model)
{
using var context = new ComputerShopDatabase();
var newOrder = Order.Create(model);
if (newOrder == null)
{
return null;
}
context.Orders.Add(newOrder);
context.SaveChanges();
return newOrder.GetViewModel;
}
public OrderViewModel? Update(OrderBindingModel model)
{
using var context = new ComputerShopDatabase();
var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
if (order == null)
{
return null;
}
order.Update(model);
context.SaveChanges();
return order.GetViewModel;
}
public OrderViewModel? Delete(OrderBindingModel model)
{
using var context = new ComputerShopDatabase();
var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
if (order != null)
{
context.Orders.Remove(order);
context.SaveChanges();
return order.GetViewModel;
}
return null;
}
}
}

45
ComputerShopDatabaseImplement/Implements/RequestStorage.cs
View File

@@ -15,51 +15,65 @@ namespace ComputerShopDatabaseImplement.Implements
//!!!ПОДОБИЕ textile
public class RequestStorage : IRequestStorage
{
//!!!ТУТ НАДО ПОЛУЧАТЬ СПИСОК ТОЛЬКО ПОЛЬЗОВАТЕЛЯ, КАК-ТО ДОБАВИТЬ (мб убрать этот метод)
//!!!КАК ПРИСОЕДИНИТЬ СБОРКУ И НАДО ЛИ?
public List<RequestViewModel> GetFullList()
{
using var context = new ComputerShopDatabase();
return context.Requests
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.Include(x => x.Assembly)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
//!!!тут добавил .Include(x => x.Assembly)
public List<RequestViewModel> GetFilteredList(RequestSearchModel model) {
using var context = new ComputerShopDatabase();
if (model.DateFrom.HasValue && model.DateTo.HasValue)
{
return context.Requests
.Where(x => x.UserId == model.UserId)
.Where(x => x.UserId == model.UserId && x.DateRequest >= model.DateFrom && x.DateRequest <= model.DateTo)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.Where(x => x.DateRequest >= model.DateFrom && x.DateRequest <= model.DateTo)
.Include(x => x.Assembly)
.Select(x => x.GetViewModel)
.ToList();
}
//Получение заявок по сборкам
else if (model.AssemblyId.HasValue)
{
return context.Requests
.Where(x => x.UserId == model.UserId)
.Where(x => x.UserId == model.UserId && x.AssemblyId == model.AssemblyId)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.Where(x => x.AssemblyId == model.AssemblyId)
.Include(x => x.Assembly)
.Select(x => x.GetViewModel)
.ToList();
}
else if (!string.IsNullOrEmpty(model.ClientFIO))
{
return context.Requests
.Where(x => x.UserId == model.UserId)
.Where(x => x.UserId == model.UserId && x.ClientFIO == model.ClientFIO)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.Where(x => x.ClientFIO == model.ClientFIO)
.Include (x => x.Assembly)
.Select(x => x.GetViewModel)
.ToList();
}
return new();
//возвращение просто всех заявок пользователя (замена GetFullList)
return context.Requests
.Where(x => x.UserId == model.UserId)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.Include(x => x.Assembly)
.Select(x => x.GetViewModel)
.ToList();
}
//!!!мб тут надо будет в FirstOrDefault добавить другие параметры
@@ -74,8 +88,7 @@ namespace ComputerShopDatabaseImplement.Implements
.Where(x => x.UserId == model.UserId)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)
|| (!string.IsNullOrEmpty(model.ClientFIO) && x.ClientFIO == model.ClientFIO))
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
@@ -93,11 +106,7 @@ namespace ComputerShopDatabaseImplement.Implements
//!!!мб тут вернуть другое значение
//!!!МБ ТУТ НЕЛЬЗЯ WHERE первым
//!!!мб тут и не надо where по пользователю (попробовать потом без него)
return context.Requests
.Where(x => x.UserId == model.UserId)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.FirstOrDefault(x => x.Id == newRequest.Id)?.GetViewModel;
return newRequest.GetViewModel;
}
public RequestViewModel? Update(RequestBindingModel model)
@@ -115,11 +124,7 @@ namespace ComputerShopDatabaseImplement.Implements
context.SaveChanges();
request.UpdateOrders(context, model);
transaction.Commit();
return context.Requests
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.FirstOrDefault(x => x.Id == model.Id)?
.GetViewModel;
return request.GetViewModel;
}
catch
{

11
ComputerShopDatabaseImplement/Implements/ShipmentStorage.cs
View File

@@ -33,9 +33,18 @@ namespace ComputerShopDatabaseImplement.Implements
public List<ShipmentViewModel> GetFilteredList(ShipmentSearchModel model)
{
using var context = new ComputerShopDatabase();
if (model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && string.IsNullOrEmpty(model.ProviderName))
{
return context.Shipments
.Where(x => x.UserId == model.Id)
.Include(x => x.Orders)
.ThenInclude(x => x.Order)
.Select(x => x.GetViewModel)
.ToList();
}
//!!!мб добавить if (model.Id.HasValue)
//!!!МБ WHERE НЕЛЬЗЯ СТАВИТЬ ПЕРВЫМ
if (model.DateFrom.HasValue && model.DateTo.HasValue)
else if (model.DateFrom.HasValue && model.DateTo.HasValue)
{
return context.Shipments
.Where(x => x.UserId == model.UserId)

24
ComputerShopDatabaseImplement/Implements/UserStorage.cs
View File

@@ -3,6 +3,7 @@ using ComputerShopContracts.SearchModels;
using ComputerShopContracts.StorageContracts;
using ComputerShopContracts.ViewModels;
using ComputerShopDatabaseImplement.Models;
using ComputerShopDataModels.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -14,14 +15,16 @@ namespace ComputerShopDatabaseImplement.Implements
public class UserStorage : IUserStorage
{
//!!!ТУТ МБ РАЗДЕЛИТЬ НА 2 МЕТОДА: исполнителя и поручителя и добавить where
public List<UserViewModel> GetFullList()
public List<UserViewModel> GetFullList(UserRole role)
{
using var context = new ComputerShopDatabase();
return context.Users.Select(x => x.GetViewModel).ToList();
return context.Users.Where(x => x.Role == role).Select(x => x.GetViewModel).ToList();
}
//!!!ТУТ МБ РАЗДЕЛИТЬ НА 2 МЕТОДА: исполнителя и поручителя и добавить where
//!!!ДОПИСАТЬ
//!!!мб не надо, т.к. есть getelement для получения 1 пользователя и получение всех пользователей по роли.
//при фильтрации всегда (?) будет либо 1, либо все пользователи роли
public List<UserViewModel> GetFilteredList(UserSearchModel model)
{
if (string.IsNullOrEmpty(model.Login))
@@ -29,13 +32,24 @@ namespace ComputerShopDatabaseImplement.Implements
return new();
}
using var context = new ComputerShopDatabase();
if (!string.IsNullOrEmpty(model.Login))
{
}
}
//!!!ДОПИСАТЬ
//!!!ПРОВЕРИТЬ
public UserViewModel? GetElement(UserSearchModel model)
{
if (string.IsNullOrEmpty(model.Login) && string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
{
return null;
}
using var context = new ComputerShopDatabase();
return context.Users.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)
|| (!string.IsNullOrEmpty(model.Login) && x.Login == model.Login)
|| (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email))
?.GetViewModel;
}
public UserViewModel? Insert(UserBindingModel model)

1
ComputerShopDatabaseImplement/Models/Order.cs
View File

@@ -73,7 +73,6 @@ namespace ComputerShopDatabaseImplement.Models
{
Id = Id,
UserId = UserId,
UserLogin = User.Login,
DateCreate = DateCreate,
Status = Status,
Sum = Sum

17
ComputerShopDatabaseImplement/Models/Request.cs
View File

@@ -23,6 +23,9 @@ namespace ComputerShopDatabaseImplement.Models
public int? AssemblyId { get; set; }
//!!!МБ ТУТ НЕ НАДО, НО НА ПОДОБИЕ С ЗАКАЗОМ И СВЯЗЬЮ С implmenter В ЛАБАХ НАДО
public virtual Assembly? Assembly { get; set; } = new();
[Required]
public DateTime DateRequest { get; set; }
@@ -52,12 +55,15 @@ namespace ComputerShopDatabaseImplement.Models
[ForeignKey("RequestId")]
public virtual List<RequestOrder> Orders { get; set; } = new();
public static Request Create(ComputerShopDatabase context, RequestBindingModel model)
{
return new Request() {
Id = model.Id,
UserId = model.UserId,
User = context.Users.First(x => x.Id == model.UserId),
AssemblyId = model.AssemblyId,
Assembly = model.AssemblyId.HasValue ? context.Assemblies.First(x => x.Id == model.AssemblyId) : null,
DateRequest = model.DateRequest,
ClientFIO = model.ClientFIO,
Orders = model.RequestOrders.Select(x => new RequestOrder
@@ -69,23 +75,28 @@ namespace ComputerShopDatabaseImplement.Models
//!!!МБ ТУТ ЕЩЁ ЧТО-ТО ОБНОВИТЬ
public void Update(RequestBindingModel model)
{
if (model == null) {
return;
}
using var context = new ComputerShopDatabase();
DateRequest = model.DateRequest;
AssemblyId = model.AssemblyId.HasValue ? model.AssemblyId : AssemblyId;
Assembly = model.AssemblyId.HasValue ? context.Assemblies.First(x => x.Id == model.AssemblyId) : Assembly;
ClientFIO = model.ClientFIO;
context.SaveChanges();
}
//!!!МБ ТУТ НЕ ВСЁ НАДО ПРИСВАИВАТЬ
public RequestViewModel GetViewModel => new()
{
Id = Id,
UserId = UserId,
UserLogin = User.Login,
AssemblyId = AssemblyId,
DateRequest = DateRequest,
ClientFIO = ClientFIO
};
//!!!ДОПИСАТЬ UpdateOrders
//!!!МБ ЭТОТ МЕТОД БУДЕТ НЕ НУЖЕН, ПОТОМУ ЧТО ПО ЗАДАНИЮ НЕ НАПИСАНО, ЧТО МОЖНО ОБНОВЛЯТЬ
//!!!МБ НАЗВАТЬ КАК-ТО ПО-ДРУГОМУ (мб метод вынести в Implement)
//!!!МБ ПЕРЕДАВАТЬ ЧТО-ТО ДРУГОЕ
//!!!ПРОВЕРИТЬ, ЧТО ВСЁ ПРАВИЛЬНО ИЗВЛЕКАЮ
//!!!делаю как в Textile

1
ComputerShopDatabaseImplement/Models/Shipment.cs
View File

@@ -77,7 +77,6 @@ namespace ComputerShopDatabaseImplement.Models
{
Id = Id,
UserId = UserId,
UserLogin = User.Login,
ProviderName = ProviderName,
DateShipment = DateShipment,
ShipmentOrders = ShipmentOrders