TurnerIlya/PIbd-22_Turner_I.A._PlumbingRepair
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

не работает добавление магазина

Browse Source
This commit is contained in:
ityurner02@mail.ru 2023-04-28 19:50:16 +04:00
parent 27e819f656
commit a150273330
13 changed files with 842 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs
View File

@ -8,151 +8,152 @@ using PlumbingRepairDataModels.Enums;
namespace PlumbingRepairBusinessLogic.BusinessLogic namespace PlumbingRepairBusinessLogic.BusinessLogic
{ {
public class OrderLogic : IOrderLogic public class OrderLogic : IOrderLogic
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IOrderStorage _orderStorage; private readonly IOrderStorage _orderStorage;
private readonly IStoreLogic _storeLogic; private readonly IStoreLogic _storeLogic;
private readonly IWorkStorage _workStorage; private readonly IWorkStorage _workStorage;
public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IWorkStorage workStorage, IStoreLogic storeLogic) public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IWorkStorage workStorage, IStoreLogic storeLogic)
{ {
_logger = logger; _logger = logger;
_orderStorage = orderStorage; _orderStorage = orderStorage;
_storeLogic = storeLogic; _storeLogic = storeLogic;
_workStorage = workStorage; _workStorage = workStorage;
} }
public bool CreateOrder(OrderBindingModel model) public bool CreateOrder(OrderBindingModel model)
{ {
CheckModel(model); CheckModel(model);
if (model.Status != OrderStatus.Неизвестен) if (model.Status != OrderStatus.Неизвестен)
{ {
_logger.LogWarning("Insert operation failed. Order status incorrect."); _logger.LogWarning("Insert operation failed. Order status incorrect.");
return false; return false;
} }
model.Status = OrderStatus.Принят; model.Status = OrderStatus.Принят;
if (_orderStorage.Insert(model) == null) if (_orderStorage.Insert(model) == null)
{ {
model.Status = OrderStatus.Неизвестен; model.Status = OrderStatus.Неизвестен;
_logger.LogWarning("Insert operation failed"); _logger.LogWarning("Insert operation failed");
return false; return false;
} }
return true; return true;
} }
public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
{ {
var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
if (viewModel == null) if (viewModel == null)
{ {
throw new ArgumentNullException(nameof(model)); throw new ArgumentNullException(nameof(model));
} }
if (viewModel.Status + 1 != newStatus) if (viewModel.Status + 1 != newStatus)
{ {
_logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect."); _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect.");
return false; return false;
} }
model.Status = newStatus; model.Status = newStatus;
if (model.Status == OrderStatus.Выдан) if (model.Status == OrderStatus.Готов)
model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); {
model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
var work = _workStorage.GetElement(new() { Id = viewModel.WorkId }); var work = _workStorage.GetElement(new() { Id = viewModel.WorkId });
if (work == null) if (work == null)
{ {
throw new ArgumentNullException(nameof(work)); throw new ArgumentNullException(nameof(work));
} }
if (!_storeLogic.AddWork(work, viewModel.Count)) if (!_storeLogic.AddWork(work, viewModel.Count))
{ {
throw new Exception($"AddWork operation failed. Store is full."); throw new Exception($"AddWork operation failed. Store is full.");
} }
} }
else else
{ {
model.DateImplement = viewModel.DateImplement; model.DateImplement = viewModel.DateImplement;
} }
CheckModel(model, false); CheckModel(model, false);
if (_orderStorage.Update(model) == null) if (_orderStorage.Update(model) == null)
{ {
model.Status--; model.Status--;
_logger.LogWarning("Update operation failed"); _logger.LogWarning("Update operation failed");
return false; return false;
} }
return true; return true;
} }
public bool TakeOrderInWork(OrderBindingModel model) public bool TakeOrderInWork(OrderBindingModel model)
{ {
return StatusUpdate(model, OrderStatus.Выполняется); return StatusUpdate(model, OrderStatus.Выполняется);
} }
public bool DeliveryOrder(OrderBindingModel model) public bool DeliveryOrder(OrderBindingModel model)
{ {
return StatusUpdate(model, OrderStatus.Готов); return StatusUpdate(model, OrderStatus.Готов);
} }
public bool FinishOrder(OrderBindingModel model) public bool FinishOrder(OrderBindingModel model)
{ {
return StatusUpdate(model, OrderStatus.Выдан); return StatusUpdate(model, OrderStatus.Выдан);
} }
public List<OrderViewModel>? ReadList(OrderSearchModel? model) public List<OrderViewModel>? ReadList(OrderSearchModel? model)
{ {
_logger.LogInformation("Order. OrderId:{Id}", model?.Id); _logger.LogInformation("Order. OrderId:{Id}", model?.Id);
var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
if (list == null) if (list == null)
{ {
_logger.LogWarning("ReadList return null list"); _logger.LogWarning("ReadList return null list");
return null; return null;
} }
_logger.LogInformation("ReadList. Count:{Count}", list.Count); _logger.LogInformation("ReadList. Count:{Count}", list.Count);
return list; return list;
} }
private void CheckModel(OrderBindingModel model, bool withParams = true) private void CheckModel(OrderBindingModel model, bool withParams = true)
{ {
if (model == null) if (model == null)
{ {
throw new ArgumentNullException(nameof(model)); throw new ArgumentNullException(nameof(model));
} }
if (!withParams) if (!withParams)
{ {
return; return;
} }
if (model.WorkId < 0) if (model.WorkId < 0)
{ {
throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId)); throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId));
} }
if (model.Count <= 0) if (model.Count <= 0)
{ {
throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count));
} }
if (model.Sum <= 0) if (model.Sum <= 0)
{ {
throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum));
} }
_logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId); _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId);
} }
} }
} }

2
PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogic/StoreLogic.cs
View File

@ -53,7 +53,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic
else else
{ {
element.StoreWorks[work.Id] = (work, quantity); element.StoreWorks[work.Id] = (work, quantity);
_logger.LogInformation("AddWork. Added {quantity} new package {package} to '{StoreName}' store", quantity, work.WorkName, element.StoreName); _logger.LogInformation("AddWork. Added {quantity} new work {work} to '{StoreName}' store", quantity, work.WorkName, element.StoreName);
} }
_storeStorage.Update(new() _storeStorage.Update(new()

2
PlumbingRepair/PlumbingRepairContracts/BindingModels/StoreBindingModel.cs
View File

@ -7,7 +7,7 @@ namespace PlumbingRepairContracts.BindingModels
public string StoreName { get; set; } = string.Empty; public string StoreName { get; set; } = string.Empty;
public string StoreAdress { get; set; } = string.Empty; public string StoreAdress { get; set; } = string.Empty;
public DateTime OpeningDate { get; set; } = DateTime.Now; public DateTime OpeningDate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
public Dictionary<int, (IWorkModel, int)> StoreWorks { get; set; } = new(); public Dictionary<int, (IWorkModel, int)> StoreWorks { get; set; } = new();

124
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/ComponentStorage.cs
View File

@ -6,87 +6,87 @@ using PlumbingRepairDatabaseImplement.Models;
namespace PlumbingRepairDatabaseImplement.Implements namespace PlumbingRepairDatabaseImplement.Implements
{ {
public class ComponentStorage : IComponentStorage public class ComponentStorage : IComponentStorage
{ {
public List<ComponentViewModel> GetFullList() public List<ComponentViewModel> GetFullList()
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Components.Select(x => x.GetViewModel).ToList(); return context.Components.Select(x => x.GetViewModel).ToList();
} }
public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model) public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
{ {
if (string.IsNullOrEmpty(model.ComponentName)) if (string.IsNullOrEmpty(model.ComponentName))
{ {
return new(); return new();
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList(); return context.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
} }
public ComponentViewModel? GetElement(ComponentSearchModel model) public ComponentViewModel? GetElement(ComponentSearchModel model)
{ {
if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
{ {
return null; return null;
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; return context.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
} }
public ComponentViewModel? Insert(ComponentBindingModel model) public ComponentViewModel? Insert(ComponentBindingModel model)
{ {
var newComponent = Component.Create(model); var newComponent = Component.Create(model);
if (newComponent == null) if (newComponent == null)
{ {
return null; return null;
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
context.Components.Add(newComponent); context.Components.Add(newComponent);
context.SaveChanges(); context.SaveChanges();
return newComponent.GetViewModel; return newComponent.GetViewModel;
} }
public ComponentViewModel? Update(ComponentBindingModel model) public ComponentViewModel? Update(ComponentBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
var component = context.Components.FirstOrDefault(x => x.Id == model.Id); var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
if (component == null) if (component == null)
{ {
return null; return null;
} }
component.Update(model); component.Update(model);
context.SaveChanges(); context.SaveChanges();
return component.GetViewModel; return component.GetViewModel;
} }
public ComponentViewModel? Delete(ComponentBindingModel model) public ComponentViewModel? Delete(ComponentBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id); var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
if (element != null) if (element != null)
{ {
context.Components.Remove(element); context.Components.Remove(element);
context.SaveChanges(); context.SaveChanges();
return element.GetViewModel; return element.GetViewModel;
} }
return null; return null;
} }
} }
} }

126
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs
View File

@ -6,88 +6,88 @@ using PlumbingRepairDatabaseImplement.Models;
namespace PlumbingRepairDatabaseImplement.Implements namespace PlumbingRepairDatabaseImplement.Implements
{ {
public class OrderStorage : IOrderStorage public class OrderStorage : IOrderStorage
{ {
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Orders.Select(x => x.GetViewModel).ToList(); return context.Orders.Select(x => x.GetViewModel).ToList();
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue) if (!model.Id.HasValue)
{ {
return new(); return new();
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); return context.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
if (!model.Id.HasValue) if (!model.Id.HasValue)
{ {
return null; return null;
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; return context.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)
{ {
var newOrder = Order.Create(model); var newOrder = Order.Create(model);
if (newOrder == null) if (newOrder == null)
{ {
return null; return null;
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
context.Orders.Add(newOrder); context.Orders.Add(newOrder);
context.SaveChanges(); context.SaveChanges();
return newOrder.GetViewModel; return newOrder.GetViewModel;
} }
public OrderViewModel? Update(OrderBindingModel model) public OrderViewModel? Update(OrderBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
var order = context.Orders.FirstOrDefault(x => x.Id == model.Id); var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
if (order == null) if (order == null)
{ {
return null; return null;
} }
order.Update(model); order.Update(model);
context.SaveChanges(); context.SaveChanges();
return order.GetViewModel; return order.GetViewModel;
} }
public OrderViewModel? Delete(OrderBindingModel model) public OrderViewModel? Delete(OrderBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id); var element = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
if (element != null) if (element != null)
{ {
context.Orders.Remove(element); context.Orders.Remove(element);
context.SaveChanges(); context.SaveChanges();
return element.GetViewModel; return element.GetViewModel;
} }
return null; return null;
} }
} }
} }

163
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/StoreStorage.cs Normal file
View File

@ -0,0 +1,163 @@
using Microsoft.EntityFrameworkCore;
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.SearchModels;
using PlumbingRepairContracts.StoragesContracts;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDatabaseImplement.Models;
using PlumbingRepairDataModels.Models;
namespace PlumbingRepairDatabaseImplement.Implements
{
public class StoreStorage : IStoreStorage
{
public StoreViewModel? Delete(StoreBindingModel model)
{
using var context = new PlumbingRepairDataBase();
var element = context.Stores
.Include(x => x.Works)
.FirstOrDefault(rec => rec.Id == model.Id);
if (element != null)
{
context.Stores.Remove(element);
context.SaveChanges();
return element.GetViewModel;
}
return null;
}
public StoreViewModel? GetElement(StoreSearchModel model)
{
if (string.IsNullOrEmpty(model.StoreName) && !model.Id.HasValue)
{
return null;
}
using var context = new PlumbingRepairDataBase();
return context.Stores
.Include(x => x.Works)
.ThenInclude(x => x.Work)
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.StoreName) && x.StoreName == model.StoreName) || (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
public List<StoreViewModel> GetFilteredList(StoreSearchModel model)
{
if (string.IsNullOrEmpty(model.StoreName))
{
return new();
}
using var context = new PlumbingRepairDataBase();
return context.Stores
.Include(x => x.Works)
.ThenInclude(x => x.Work)
.Where(x => x.StoreName.Contains(model.StoreName))
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
public List<StoreViewModel> GetFullList()
{
using var context = new PlumbingRepairDataBase();
return context.Stores
.Include(x => x.Works)
.ThenInclude(x => x.Work)
.ToList()
.Select(x => x.GetViewModel)
.ToList();
}
public StoreViewModel? Insert(StoreBindingModel model)
{
using var context = new PlumbingRepairDataBase();
var newStore = Store.Create(context, model);
if (newStore == null)
{
return null;
}
context.Stores.Add(newStore);
context.SaveChanges();
return newStore.GetViewModel;
}
public bool SellWork(IWorkModel model, int quantity)
{
using var context = new PlumbingRepairDataBase();
using var transaction = context.Database.BeginTransaction();
try
{
foreach (var store in context.Stores
.Include(x => x.Works)
.ThenInclude(x => x.Work)
.ToList()
.Where(x => x.StoreWorks.ContainsKey(model.Id)))
{
int countInCurrentStore = store.StoreWorks[model.Id].Item2;
if (countInCurrentStore <= quantity)
{
var elem = context.StoreWorks
.Where(x => x.WorkId == model.Id)
.FirstOrDefault(x => x.StoreId == store.Id);
context.StoreWorks.Remove(elem);
store.StoreWorks.Remove(model.Id);
quantity -= countInCurrentStore;
}
else
{
store.StoreWorks[model.Id] = (store.StoreWorks[model.Id].Item1, countInCurrentStore - quantity);
quantity = 0;
store.UpdateWorks(context, new()
{
Id = store.Id,
StoreWorks = store.StoreWorks,
});
}
if (quantity == 0)
{
context.SaveChanges();
transaction.Commit();
return true;
}
}
transaction.Rollback();
return false;
}
catch
{
transaction.Rollback();
throw;
}
}
public StoreViewModel? Update(StoreBindingModel model)
{
using var context = new PlumbingRepairDataBase();
using var transaction = context.Database.BeginTransaction();
try
{
var store = context.Stores.FirstOrDefault(rec => rec.Id == model.Id);
if (store == null)
{
return null;
}
store.Update(model);
context.SaveChanges();
store.UpdateWorks(context, model);
transaction.Commit();
return store.GetViewModel;
}
catch
{
transaction.Rollback();
throw;
}
}
}
}

174
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/WorkStorage.cs
View File

@ -7,114 +7,114 @@ using PlumbingRepairDatabaseImplement.Models;
namespace PlumbingRepairDatabaseImplement.Implements namespace PlumbingRepairDatabaseImplement.Implements
{ {
public class WorkStorage : IWorkStorage public class WorkStorage : IWorkStorage
{ {
public List<WorkViewModel> GetFullList() public List<WorkViewModel> GetFullList()
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Works return context.Works
.Include(x => x.Components) .Include(x => x.Components)
.ThenInclude(x => x.Component) .ThenInclude(x => x.Component)
.ToList() .ToList()
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
public List<WorkViewModel> GetFilteredList(WorkSearchModel model) public List<WorkViewModel> GetFilteredList(WorkSearchModel model)
{ {
if (string.IsNullOrEmpty(model.WorkName)) if (string.IsNullOrEmpty(model.WorkName))
{ {
return new(); return new();
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Works return context.Works
.Include(x => x.Components) .Include(x => x.Components)
.ThenInclude(x => x.Component) .ThenInclude(x => x.Component)
.Where(x => x.WorkName.Contains(model.WorkName)) .Where(x => x.WorkName.Contains(model.WorkName))
.ToList() .ToList()
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
public WorkViewModel? GetElement(WorkSearchModel model) public WorkViewModel? GetElement(WorkSearchModel model)
{ {
if (string.IsNullOrEmpty(model.WorkName) && !model.Id.HasValue) if (string.IsNullOrEmpty(model.WorkName) && !model.Id.HasValue)
{ {
return null; return null;
} }
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
return context.Works return context.Works
.Include(x => x.Components) .Include(x => x.Components)
.ThenInclude(x => x.Component) .ThenInclude(x => x.Component)
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.WorkName) && x.WorkName == model.WorkName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; .FirstOrDefault(x => (!string.IsNullOrEmpty(model.WorkName) && x.WorkName == model.WorkName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
} }
public WorkViewModel? Insert(WorkBindingModel model) public WorkViewModel? Insert(WorkBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
var newWork = Work.Create(context, model); var newWork = Work.Create(context, model);
if (newWork == null) if (newWork == null)
{ {
return null; return null;
} }
context.Works.Add(newWork); context.Works.Add(newWork);
context.SaveChanges(); context.SaveChanges();
return newWork.GetViewModel; return newWork.GetViewModel;
} }
public WorkViewModel? Update(WorkBindingModel model) public WorkViewModel? Update(WorkBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
using var transaction = context.Database.BeginTransaction(); using var transaction = context.Database.BeginTransaction();
try try
{ {
var package = context.Works.FirstOrDefault(rec => rec.Id == model.Id); var package = context.Works.FirstOrDefault(rec => rec.Id == model.Id);
if (package == null) if (package == null)
{ {
return null; return null;
} }
package.Update(model); package.Update(model);
context.SaveChanges(); context.SaveChanges();
package.UpdateComponents(context, model); package.UpdateComponents(context, model);
transaction.Commit(); transaction.Commit();
return package.GetViewModel; return package.GetViewModel;
} }
catch catch
{ {
transaction.Rollback(); transaction.Rollback();
throw; throw;
} }
} }
public WorkViewModel? Delete(WorkBindingModel model) public WorkViewModel? Delete(WorkBindingModel model)
{ {
using var context = new PlumbingRepairDataBase(); using var context = new PlumbingRepairDataBase();
var element = context.Works.Include(x => x.Components).FirstOrDefault(rec => rec.Id == model.Id); var element = context.Works.Include(x => x.Components).FirstOrDefault(rec => rec.Id == model.Id);
if (element != null) if (element != null)
{ {
context.Works.Remove(element); context.Works.Remove(element);
context.SaveChanges(); context.SaveChanges();
return element.GetViewModel; return element.GetViewModel;
} }
return null; return null;
} }
} }
} }

81
PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.Designer.cs → PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.Designer.cs generated
View File

@ -12,8 +12,8 @@ using PlumbingRepairDatabaseImplement;
namespace PlumbingRepairDatabaseImplement.Migrations namespace PlumbingRepairDatabaseImplement.Migrations
{ {
[DbContext(typeof(PlumbingRepairDataBase))] [DbContext(typeof(PlumbingRepairDataBase))]
[Migration("20230304141419_InitMigration")] [Migration("20230428142925_CreateDB")]
partial class InitMigration partial class CreateDB
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -82,6 +82,59 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.ToTable("Orders"); b.ToTable("Orders");
}); });
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<DateTime>("OpeningDate")
.HasColumnType("timestamp with time zone");
b.Property<string>("StoreAdress")
.IsRequired()
.HasColumnType("text");
b.Property<string>("StoreName")
.IsRequired()
.HasColumnType("text");
b.Property<int>("WorkMaxCount")
.HasColumnType("integer");
b.HasKey("Id");
b.ToTable("Stores");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("Count")
.HasColumnType("integer");
b.Property<int>("StoreId")
.HasColumnType("integer");
b.Property<int>("WorkId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("StoreId");
b.HasIndex("WorkId");
b.ToTable("StoreWorks");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
@ -139,6 +192,25 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.Navigation("Work"); b.Navigation("Work");
}); });
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b =>
{
b.HasOne("PlumbingRepairDatabaseImplement.Models.Store", "Store")
.WithMany("Works")
.HasForeignKey("StoreId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PlumbingRepairDatabaseImplement.Models.Work", "Work")
.WithMany()
.HasForeignKey("WorkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Store");
b.Navigation("Work");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.WorkComponent", b => modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.WorkComponent", b =>
{ {
b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component") b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component")
@ -163,6 +235,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.Navigation("WorkComponents"); b.Navigation("WorkComponents");
}); });
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b =>
{
b.Navigation("Works");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b =>
{ {
b.Navigation("Components"); b.Navigation("Components");

61
PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230304141419_InitMigration.cs → PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/20230428142925_CreateDB.cs
View File

@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace PlumbingRepairDatabaseImplement.Migrations namespace PlumbingRepairDatabaseImplement.Migrations
{ {
/// <inheritdoc /> /// <inheritdoc />
public partial class InitMigration : Migration public partial class CreateDB : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)
@ -26,6 +26,22 @@ namespace PlumbingRepairDatabaseImplement.Migrations
table.PrimaryKey("PK_Components", x => x.Id); table.PrimaryKey("PK_Components", x => x.Id);
}); });
migrationBuilder.CreateTable(
name: "Stores",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
StoreName = table.Column<string>(type: "text", nullable: false),
StoreAdress = table.Column<string>(type: "text", nullable: false),
OpeningDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
WorkMaxCount = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Stores", x => x.Id);
});
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "Works", name: "Works",
columns: table => new columns: table => new
@ -65,6 +81,33 @@ namespace PlumbingRepairDatabaseImplement.Migrations
onDelete: ReferentialAction.Cascade); onDelete: ReferentialAction.Cascade);
}); });
migrationBuilder.CreateTable(
name: "StoreWorks",
columns: table => new
{
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
WorkId = table.Column<int>(type: "integer", nullable: false),
StoreId = table.Column<int>(type: "integer", nullable: false),
Count = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_StoreWorks", x => x.Id);
table.ForeignKey(
name: "FK_StoreWorks_Stores_StoreId",
column: x => x.StoreId,
principalTable: "Stores",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_StoreWorks_Works_WorkId",
column: x => x.WorkId,
principalTable: "Works",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "WorkComponents", name: "WorkComponents",
columns: table => new columns: table => new
@ -97,6 +140,16 @@ namespace PlumbingRepairDatabaseImplement.Migrations
table: "Orders", table: "Orders",
column: "WorkId"); column: "WorkId");
migrationBuilder.CreateIndex(
name: "IX_StoreWorks_StoreId",
table: "StoreWorks",
column: "StoreId");
migrationBuilder.CreateIndex(
name: "IX_StoreWorks_WorkId",
table: "StoreWorks",
column: "WorkId");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_WorkComponents_ComponentId", name: "IX_WorkComponents_ComponentId",
table: "WorkComponents", table: "WorkComponents",
@ -114,9 +167,15 @@ namespace PlumbingRepairDatabaseImplement.Migrations
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Orders"); name: "Orders");
migrationBuilder.DropTable(
name: "StoreWorks");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "WorkComponents"); name: "WorkComponents");
migrationBuilder.DropTable(
name: "Stores");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Components"); name: "Components");

77
PlumbingRepair/PlumbingRepairDatabaseImplement/Migrations/PlumbingRepairDataBaseModelSnapshot.cs
View File

@ -79,6 +79,59 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.ToTable("Orders"); b.ToTable("Orders");
}); });
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<DateTime>("OpeningDate")
.HasColumnType("timestamp with time zone");
b.Property<string>("StoreAdress")
.IsRequired()
.HasColumnType("text");
b.Property<string>("StoreName")
.IsRequired()
.HasColumnType("text");
b.Property<int>("WorkMaxCount")
.HasColumnType("integer");
b.HasKey("Id");
b.ToTable("Stores");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("Count")
.HasColumnType("integer");
b.Property<int>("StoreId")
.HasColumnType("integer");
b.Property<int>("WorkId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("StoreId");
b.HasIndex("WorkId");
b.ToTable("StoreWorks");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
@ -136,6 +189,25 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.Navigation("Work"); b.Navigation("Work");
}); });
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.StoreWork", b =>
{
b.HasOne("PlumbingRepairDatabaseImplement.Models.Store", "Store")
.WithMany("Works")
.HasForeignKey("StoreId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PlumbingRepairDatabaseImplement.Models.Work", "Work")
.WithMany()
.HasForeignKey("WorkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Store");
b.Navigation("Work");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.WorkComponent", b => modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.WorkComponent", b =>
{ {
b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component") b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component")
@ -160,6 +232,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.Navigation("WorkComponents"); b.Navigation("WorkComponents");
}); });
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b =>
{
b.Navigation("Works");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b => modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b =>
{ {
b.Navigation("Components"); b.Navigation("Components");

105
PlumbingRepair/PlumbingRepairDatabaseImplement/Models/Store.cs Normal file
View File

@ -0,0 +1,105 @@
using PlumbingRepairContracts.BindingModels;
using PlumbingRepairContracts.ViewModels;
using PlumbingRepairDataModels.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PlumbingRepairDatabaseImplement.Models
{
public class Store : IStoreModel
{
[Required]
public string StoreName { get; private set; } = string.Empty;
[Required]
public string StoreAdress { get; private set; } = string.Empty;
[Required]
public DateTime OpeningDate { get; private set; }
[Required]
public int WorkMaxCount { get; private set; }
public int Id { get; private set; }
private Dictionary<int, (IWorkModel, int)> _storeWorks = null;
[NotMapped]
public Dictionary<int, (IWorkModel, int)> StoreWorks
{
get
{
if (_storeWorks == null)
{
_storeWorks = Works
.ToDictionary(recPC => recPC.WorkId, recPC => (recPC.Work as IWorkModel, recPC.Count));
}
return _storeWorks;
}
}
[ForeignKey("StoreId")]
public virtual List<StoreWork> Works { get; set; } = new();
public static Store Create(PlumbingRepairDataBase context, StoreBindingModel model)
{
return new Store()
{
Id = model.Id,
StoreName = model.StoreName,
StoreAdress = model.StoreAdress,
OpeningDate = model.OpeningDate,
WorkMaxCount = model.WorkMaxCount,
Works = model.StoreWorks.Select(x => new StoreWork
{
Work = context.Works.First(y => y.Id == x.Key),
Count = x.Value.Item2
}).ToList()
};
}
public void Update(StoreBindingModel model)
{
StoreName = model.StoreName;
StoreAdress = model.StoreAdress;
OpeningDate = model.OpeningDate;
WorkMaxCount = model.WorkMaxCount;
}
public StoreViewModel GetViewModel => new()
{
Id = Id,
StoreName = StoreName,
StoreAdress = StoreAdress,
OpeningDate = OpeningDate,
WorkMaxCount = WorkMaxCount,
StoreWorks = StoreWorks
};
public void UpdateWorks(PlumbingRepairDataBase context, StoreBindingModel model)
{
var storeWorks = context.StoreWorks.Where(rec => rec.StoreId == model.Id).ToList();
if (storeWorks != null && storeWorks.Count > 0)
{ // удалили те, которых нет в модели
context.StoreWorks.RemoveRange(storeWorks.Where(rec => !model.StoreWorks.ContainsKey(rec.WorkId)));
context.SaveChanges();
// обновили количество у существующих записей
foreach (var updateWork in storeWorks)
{
updateWork.Count = model.StoreWorks[updateWork.WorkId].Item2;
model.StoreWorks.Remove(updateWork.WorkId);
}
context.SaveChanges();
}
var store = context.Stores.First(x => x.Id == Id);
foreach (var sw in model.StoreWorks)
{
context.StoreWorks.Add(new StoreWork
{
Store = store,
Work = context.Works.First(x => x.Id == sw.Key),
Count = sw.Value.Item2
});
context.SaveChanges();
}
_storeWorks = null;
}
}
}

22
PlumbingRepair/PlumbingRepairDatabaseImplement/Models/StoreWork.cs Normal file
View File

@ -0,0 +1,22 @@
using System.ComponentModel.DataAnnotations;
namespace PlumbingRepairDatabaseImplement.Models
{
public class StoreWork
{
public int Id { get; set; }
[Required]
public int WorkId { get; set; }
[Required]
public int StoreId { get; set; }
[Required]
public int Count { get; set; }
public virtual Store Store { get; set; } = new();
public virtual Work Work { get; set; } = new();
}
}

6
PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs
View File

@ -9,7 +9,7 @@ namespace PlumbingRepairDatabaseImplement
{ {
if (optionsBuilder.IsConfigured == false) if (optionsBuilder.IsConfigured == false)
{ {
optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseFull;Username=postgres;Password=186qazwsx"); optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=PlumbingRepairDatabaseHardFull;Username=postgres;Password=186qazwsx");
} }
base.OnConfiguring(optionsBuilder); base.OnConfiguring(optionsBuilder);
} }
@ -17,5 +17,7 @@ namespace PlumbingRepairDatabaseImplement
public virtual DbSet<Work> Works { set; get; } public virtual DbSet<Work> Works { set; get; }
public virtual DbSet<WorkComponent> WorkComponents { set; get; } public virtual DbSet<WorkComponent> WorkComponents { set; get; }
public virtual DbSet<Order> Orders { set; get; } public virtual DbSet<Order> Orders { set; get; }
} public virtual DbSet<Store> Stores { set; get; }
public virtual DbSet<StoreWork> StoreWorks { set; get; }
}
} }