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

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

@ -62,7 +62,8 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic
model.Status = newStatus;
if (model.Status == OrderStatus.Выдан)
if (model.Status == OrderStatus.Готов)
{
model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
var work = _workStorage.GetElement(new() { Id = viewModel.WorkId });

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

@ -53,7 +53,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic
else
{
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()

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

@ -7,7 +7,7 @@ namespace PlumbingRepairContracts.BindingModels
public string StoreName { 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();

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;
}
}
}
}

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
{
[DbContext(typeof(PlumbingRepairDataBase))]
[Migration("20230304141419_InitMigration")]
partial class InitMigration
[Migration("20230428142925_CreateDB")]
partial class CreateDB
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -82,6 +82,59 @@ namespace PlumbingRepairDatabaseImplement.Migrations
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 =>
{
b.Property<int>("Id")
@ -139,6 +192,25 @@ namespace PlumbingRepairDatabaseImplement.Migrations
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 =>
{
b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component")
@ -163,6 +235,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.Navigation("WorkComponents");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b =>
{
b.Navigation("Works");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b =>
{
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
{
/// <inheritdoc />
public partial class InitMigration : Migration
public partial class CreateDB : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
@ -26,6 +26,22 @@ namespace PlumbingRepairDatabaseImplement.Migrations
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(
name: "Works",
columns: table => new
@ -65,6 +81,33 @@ namespace PlumbingRepairDatabaseImplement.Migrations
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(
name: "WorkComponents",
columns: table => new
@ -97,6 +140,16 @@ namespace PlumbingRepairDatabaseImplement.Migrations
table: "Orders",
column: "WorkId");
migrationBuilder.CreateIndex(
name: "IX_StoreWorks_StoreId",
table: "StoreWorks",
column: "StoreId");
migrationBuilder.CreateIndex(
name: "IX_StoreWorks_WorkId",
table: "StoreWorks",
column: "WorkId");
migrationBuilder.CreateIndex(
name: "IX_WorkComponents_ComponentId",
table: "WorkComponents",
@ -114,9 +167,15 @@ namespace PlumbingRepairDatabaseImplement.Migrations
migrationBuilder.DropTable(
name: "Orders");
migrationBuilder.DropTable(
name: "StoreWorks");
migrationBuilder.DropTable(
name: "WorkComponents");
migrationBuilder.DropTable(
name: "Stores");
migrationBuilder.DropTable(
name: "Components");

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

@ -79,6 +79,59 @@ namespace PlumbingRepairDatabaseImplement.Migrations
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 =>
{
b.Property<int>("Id")
@ -136,6 +189,25 @@ namespace PlumbingRepairDatabaseImplement.Migrations
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 =>
{
b.HasOne("PlumbingRepairDatabaseImplement.Models.Component", "Component")
@ -160,6 +232,11 @@ namespace PlumbingRepairDatabaseImplement.Migrations
b.Navigation("WorkComponents");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Store", b =>
{
b.Navigation("Works");
});
modelBuilder.Entity("PlumbingRepairDatabaseImplement.Models.Work", b =>
{
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();
}
}

4
PlumbingRepair/PlumbingRepairDatabaseImplement/PlumbingRepairDataBase.cs
View File

@ -9,7 +9,7 @@ namespace PlumbingRepairDatabaseImplement
{
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);
}
@ -17,5 +17,7 @@ namespace PlumbingRepairDatabaseImplement
public virtual DbSet<Work> Works { set; get; }
public virtual DbSet<WorkComponent> WorkComponents { set; get; }
public virtual DbSet<Order> Orders { set; get; }
public virtual DbSet<Store> Stores { set; get; }
public virtual DbSet<StoreWork> StoreWorks { set; get; }
}
}