bocchanskyy/PIbd-23-Volkov-N.A.-ComputersShop
bocchanskyy/PIbd-23-Volkov-N.A.-ComputersShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fix with relation between entities

Browse Source
This commit is contained in:
Никита Волков 2024-04-30 04:25:43 +04:00
parent b06e5065f6
commit e7d0077ce4
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ComputersShop/ComputersShopBusinessLogic/BusinessLogics/MessageInfoLogic.cs
View File

@ -82,7 +82,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics
}); });
if (element == null) if (element == null)
{ {
_logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName); _logger.LogWarning("Не удалось найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName);
} }
else else
{ {

8
ComputersShop/ComputersShopDataBaseImplement/Migrations/20240418105123_Init-Create.Designer.cs → ComputersShop/ComputersShopDataBaseImplement/Migrations/20240430002234_InitialCreate.Designer.cs generated
View File

@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace ComputersShopDataBaseImplement.Migrations namespace ComputersShopDataBaseImplement.Migrations
{ {
[DbContext(typeof(ComputersShopDataBase))] [DbContext(typeof(ComputersShopDataBase))]
[Migration("20240418105123_Init-Create")] [Migration("20240430002234_InitialCreate")]
partial class InitCreate partial class InitialCreate
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -237,9 +237,11 @@ namespace ComputersShopDataBaseImplement.Migrations
modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Message", b => modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Message", b =>
{ {
b.HasOne("ComputersShopDataBaseImplement.Models.Client", null) b.HasOne("ComputersShopDataBaseImplement.Models.Client", "Client")
.WithMany("Messages") .WithMany("Messages")
.HasForeignKey("ClientId"); .HasForeignKey("ClientId");
b.Navigation("Client");
}); });
modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Order", b => modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Order", b =>

2
ComputersShop/ComputersShopDataBaseImplement/Migrations/20240418105123_Init-Create.cs → ComputersShop/ComputersShopDataBaseImplement/Migrations/20240430002234_InitialCreate.cs
View File

@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace ComputersShopDataBaseImplement.Migrations namespace ComputersShopDataBaseImplement.Migrations
{ {
/// <inheritdoc /> /// <inheritdoc />
public partial class InitCreate : Migration public partial class InitialCreate : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)

4
ComputersShop/ComputersShopDataBaseImplement/Migrations/ComputersShopDataBaseModelSnapshot.cs
View File

@ -234,9 +234,11 @@ namespace ComputersShopDataBaseImplement.Migrations
modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Message", b => modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Message", b =>
{ {
b.HasOne("ComputersShopDataBaseImplement.Models.Client", null) b.HasOne("ComputersShopDataBaseImplement.Models.Client", "Client")
.WithMany("Messages") .WithMany("Messages")
.HasForeignKey("ClientId"); .HasForeignKey("ClientId");
b.Navigation("Client");
}); });
modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Order", b => modelBuilder.Entity("ComputersShopDataBaseImplement.Models.Order", b =>

2
ComputersShop/ComputersShopDataBaseImplement/Models/Message.cs
View File

@ -17,6 +17,8 @@ namespace ComputersShopDataBaseImplement.Models
public int? ClientId { get; private set; } public int? ClientId { get; private set; }
public virtual Client? Client { get; set; }
public string SenderName { get; private set; } = string.Empty; public string SenderName { get; private set; } = string.Empty;
public DateTime DateDelivery { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); public DateTime DateDelivery { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);

2
ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs
View File

@ -47,7 +47,7 @@ namespace ComputersShopFileImplement
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
Messages = LoadData(MessageFileName, "Message", x => Message.Create(x)); Messages = LoadData(MessageFileName, "Message", x => Message.Create(x)!)!;
} }
private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction) private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
{ {