Artyom_Yashin/PIbd-23_Yashin_A_A_ComputersShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Допилил"

Browse Source 
This reverts commit eb9b029ef03ce40fdc6990ea04ad4a78ce34aab8.
This commit is contained in:
Artyom_Yashin 2024-03-25 21:15:53 +04:00
parent eb9b029ef0
commit 2a8cfd8b83
6 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ComputersShop/ComputersShop/FormComputers.cs
View File

@ -29,7 +29,7 @@ namespace ComputersShop
if (list != null)
{
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = true;
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["ComputerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["ComputerComponents"].Visible = false;
}

33
ComputersShop/ComputersShopDatabaseImplement/Implements/OrderStorage.cs
View File

@ -3,7 +3,6 @@ using ComputersShopContracts.SearchModels;
using ComputersShopContracts.StoragesContracts;
using ComputersShopContracts.ViewModels;
using ComputersShopDatabaseImplement.Models;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
@ -17,8 +16,8 @@ namespace ComputersShopDatabaseImplement.Implements
public List<OrderViewModel> GetFullList()
{
using var context = new ComputersShopDatabase();
return context.Orders.Include(x => x.Computer)
.Select(x => x.GetViewModel)
return context.Orders
.Select(x => AccessComputersStorage(x.GetViewModel))
.ToList();
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@ -30,7 +29,7 @@ namespace ComputersShopDatabaseImplement.Implements
using var context = new ComputersShopDatabase();
return context.Orders
.Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
.Select(x => AccessComputersStorage(x.GetViewModel))
.ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
@ -40,19 +39,19 @@ namespace ComputersShopDatabaseImplement.Implements
return null;
}
using var context = new ComputersShopDatabase();
return context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
return AccessComputersStorage(context.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
}
public OrderViewModel? Insert(OrderBindingModel model)
{
using var context = new ComputersShopDatabase();
var newOrder = Order.Create(model);
if (newOrder == null)
{
return null;
}
using var context = new ComputersShopDatabase();
context.Orders.Add(newOrder);
context.SaveChanges();
return newOrder.GetViewModel;
return AccessComputersStorage(newOrder.GetViewModel);
}
public OrderViewModel? Update(OrderBindingModel model)
{
@ -65,7 +64,7 @@ namespace ComputersShopDatabaseImplement.Implements
}
order.Update(model);
context.SaveChanges();
return order.GetViewModel;
return AccessComputersStorage(order.GetViewModel);
}
public OrderViewModel? Delete(OrderBindingModel model)
{
@ -76,9 +75,25 @@ namespace ComputersShopDatabaseImplement.Implements
{
context.Orders.Remove(element);
context.SaveChanges();
return element.GetViewModel;
return AccessComputersStorage(element.GetViewModel);
}
return null;
}
public static OrderViewModel AccessComputersStorage(OrderViewModel model)
{
if (model == null)
return null;
using var context = new ComputersShopDatabase();
foreach (var Computers in context.Computers)
{
if (Computers.Id == model.ComputerId)
{
model.ComputerName = Computers.ComputerName;
break;
}
}
return model;
}
}
}

6
ComputersShop/ComputersShopDatabaseImplement/Migrations/20240324163854_InitialCreate.Designer.cs → ComputersShop/ComputersShopDatabaseImplement/Migrations/20240312150451_InitialCreate.Designer.cs generated
View File

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace ComputersShopDatabaseImplement.Migrations
{
[DbContext(typeof(ComputersShopDatabase))]
[Migration("20240324163854_InitialCreate")]
[Migration("20240312150451_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
@ -145,13 +145,11 @@ namespace ComputersShopDatabaseImplement.Migrations
modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Order", b =>
{
b.HasOne("ComputersShopDatabaseImplement.Models.Computer", "Computer")
b.HasOne("ComputersShopDatabaseImplement.Models.Computer", null)
.WithMany("Orders")
.HasForeignKey("ComputerId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Computer");
});
modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Component", b =>

0
ComputersShop/ComputersShopDatabaseImplement/Migrations/20240324163854_InitialCreate.cs → ComputersShop/ComputersShopDatabaseImplement/Migrations/20240312150451_InitialCreate.cs
View File

4
ComputersShop/ComputersShopDatabaseImplement/Migrations/ComputersShopDatabaseModelSnapshot.cs
View File

@ -142,13 +142,11 @@ namespace ComputersShopDatabaseImplement.Migrations
modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Order", b =>
{
b.HasOne("ComputersShopDatabaseImplement.Models.Computer", "Computer")
b.HasOne("ComputersShopDatabaseImplement.Models.Computer", null)
.WithMany("Orders")
.HasForeignKey("ComputerId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Computer");
});
modelBuilder.Entity("ComputersShopDatabaseImplement.Models.Component", b =>

10
ComputersShop/ComputersShopDatabaseImplement/Models/Order.cs
View File

@ -3,7 +3,6 @@ using ComputersShopContracts.ViewModels;
using ComputersShopDataModels.Enums;
using System.ComponentModel.DataAnnotations;
using System.Runtime.CompilerServices;
namespace ComputersShopDatabaseImplement.Models
{
@ -22,10 +21,12 @@ namespace ComputersShopDatabaseImplement.Models
[Required]
public int ComputerId { get; private set; }
public virtual Computer Computer { get; set; } = new();
public static Order? Create(OrderBindingModel model)
{
if (model == null)
{
return null;
}
return new Order()
{
Id = model.Id,
@ -47,7 +48,7 @@ namespace ComputersShopDatabaseImplement.Models
Status = model.Status;
DateImplement = model.DateImplement;
}
public OrderViewModel GetViewModel => new()
{
ComputerId = ComputerId,
@ -57,7 +58,6 @@ namespace ComputersShopDatabaseImplement.Models
DateCreate = DateCreate,
DateImplement = DateImplement,
Id = Id,
ComputerName = Computer.ComputerName
};
}
}