diff --git a/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs b/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs index 7a84e24..52fbcf2 100644 --- a/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs +++ b/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs @@ -29,16 +29,7 @@ namespace ConfectioneryBusinessLogic.MailWorker objMailMessage.Body = info.Text; objMailMessage.SubjectEncoding = Encoding.UTF8; objMailMessage.BodyEncoding = Encoding.UTF8; - if (info.MessageId != null) - { - objMailMessage.Headers.Add("Message-Id", info.MessageId); - } - if (info.ReplyMessageId != null) - { - objMailMessage.Headers.Add("In-Reply-To", info.ReplyMessageId); - objMailMessage.Headers.Add("References", info.ReplyMessageId); - } objSmtpClient.UseDefaultCredentials = false; objSmtpClient.EnableSsl = true; objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; diff --git a/ConfectionaryFileImplement/MessageInfo.cs b/ConfectionaryFileImplement/MessageInfo.cs index de80714..ba0dc59 100644 --- a/ConfectionaryFileImplement/MessageInfo.cs +++ b/ConfectionaryFileImplement/MessageInfo.cs @@ -25,7 +25,7 @@ namespace ConfectioneryFileImplement.Models public string Body { get; private set; } = string.Empty; public bool HasRead { get; private set; } - public string? ReplyMessageId { get; private set; } + public string? Reply { get; private set; } public static MessageInfo? Create(MessageInfoBindingModel model) { @@ -36,13 +36,13 @@ namespace ConfectioneryFileImplement.Models return new() { Body = model.Body, - HasRead = model.HasRead, + Reply = model.Reply, + HasRead = model.HasRead, Subject = model.Subject, ClientId = model.ClientId, MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, - ReplyMessageId = model.ReplyMessageId, }; } @@ -55,13 +55,13 @@ namespace ConfectioneryFileImplement.Models return new() { Body = element.Attribute("Body")!.Value, + Reply = element.Attribute("Reply")!.Value, HasRead = Convert.ToBoolean(element.Attribute("HasRead")!.Value), Subject = element.Attribute("Subject")!.Value, ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), MessageId = element.Attribute("MessageId")!.Value, SenderName = element.Attribute("SenderName")!.Value, DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), - ReplyMessageId = element.Attribute("ReplyMessageId")!.Value, }; } @@ -71,28 +71,25 @@ namespace ConfectioneryFileImplement.Models { return; } - ReplyMessageId = model.ReplyMessageId; + Reply = model.Reply; HasRead = model.HasRead; } public MessageInfoViewModel GetViewModel => new() { Body = Body, + Reply = Reply, HasRead = HasRead, Subject = Subject, ClientId = ClientId, MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, - ReplyMessageId = ReplyMessageId, - ReplyText = DataFileSingleton.GetInstance().Messages - .FirstOrDefault(x => ReplyMessageId != null && ReplyMessageId.Equals(x.MessageId)) - ?.Body ?? string.Empty, }; public XElement GetXElement => new("MessageInfo", new XAttribute("Body", Body), - new XAttribute("ReplyMessageId", ReplyMessageId), + new XAttribute("Reply", Reply), new XAttribute("HasRead", HasRead), new XAttribute("Subject", Subject), new XAttribute("ClientId", ClientId), diff --git a/ConfectionaryListImplement/MessageInfo.cs b/ConfectionaryListImplement/MessageInfo.cs index bceff6f..588b890 100644 --- a/ConfectionaryListImplement/MessageInfo.cs +++ b/ConfectionaryListImplement/MessageInfo.cs @@ -24,7 +24,7 @@ namespace ConfectioneryListImplement.Models public string Body { get; private set; } = string.Empty; public bool HasRead { get; private set; } - public string? ReplyMessageId { get; private set; } + public string? Reply { get; private set; } public static MessageInfo? Create(MessageInfoBindingModel model) { @@ -35,13 +35,13 @@ namespace ConfectioneryListImplement.Models return new() { Body = model.Body, + Reply = model.Reply, HasRead = model.HasRead, Subject = model.Subject, ClientId = model.ClientId, MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, - ReplyMessageId = model.ReplyMessageId, }; } @@ -51,40 +51,22 @@ namespace ConfectioneryListImplement.Models { return; } - ReplyMessageId = model.MessageId; + Reply = model.Reply; HasRead = model.HasRead; } - public MessageInfoViewModel GetViewModel - { - get - { - var res = new MessageInfoViewModel() - { - Body = Body, - HasRead = HasRead, - Subject = Subject, - ClientId = ClientId, - MessageId = MessageId, - SenderName = SenderName, - DateDelivery = DateDelivery, - ReplyMessageId = ReplyMessageId, - }; - if (ReplyMessageId != null) - { - foreach (var msg in DataListSingleton.GetInstance().Messages) - { - if (msg.MessageId.Equals(ReplyMessageId)) - { - res.ReplyText = msg.Body; - return res; - } - } - } + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Reply = Reply, + HasRead = HasRead, + Subject = Subject, + ClientId = ClientId, + MessageId = MessageId, + SenderName = SenderName, + DateDelivery = DateDelivery, + }; - return res; - } - } - } + } } diff --git a/Confectionery/FormReplyMail.cs b/Confectionery/FormReplyMail.cs index e726575..8247d8e 100644 --- a/Confectionery/FormReplyMail.cs +++ b/Confectionery/FormReplyMail.cs @@ -40,29 +40,17 @@ namespace ConfectioneryView private void ButtonSave_Click(object sender, EventArgs e) { - var guid = Guid.NewGuid(); - var newMsgId = $"<{guid.ToString().Replace("-", "")}@f129.i.mail.ru>"; _mailWorker.MailSendAsync(new() { - MessageId = newMsgId, - ReplyMessageId = _message.MessageId, MailAddress = _message.SenderName, Subject = _message.Subject, Text = textBoxReply.Text, }); - _logic.Create(new() - { - MessageId = newMsgId, - Body = textBoxReply.Text, - ClientId = _message.ClientId, - HasRead = false, - Subject = _message.Subject, - }); _logic.Update(new() { MessageId = MessageId, + Reply = textBoxReply.Text, HasRead = true, - ReplyMessageId = newMsgId, }); MessageBox.Show("Успешно отправлено письмо", "Отправка письма", MessageBoxButtons.OK); DialogResult = DialogResult.OK; diff --git a/Confectionery/FormViewMail.cs b/Confectionery/FormViewMail.cs index 951f9f0..2bedb35 100644 --- a/Confectionery/FormViewMail.cs +++ b/Confectionery/FormViewMail.cs @@ -47,7 +47,7 @@ namespace ConfectioneryView { dataGridView.DataSource = list; dataGridView.Columns["ClientId"].Visible = false; - + dataGridView.Columns["MessageId"].Visible = false; dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка списка писем"); diff --git a/ConfectioneryContracts/BindingModels/MailSendInfoBindingModel.cs b/ConfectioneryContracts/BindingModels/MailSendInfoBindingModel.cs index 62f1151..8fd8e76 100644 --- a/ConfectioneryContracts/BindingModels/MailSendInfoBindingModel.cs +++ b/ConfectioneryContracts/BindingModels/MailSendInfoBindingModel.cs @@ -8,9 +8,6 @@ namespace ConfectioneryContracts.BindingModels { public class MailSendInfoBindingModel { - public string? MessageId { get; set; } = string.Empty; - - public string? ReplyMessageId { get; set; } = string.Empty; public string MailAddress { get; set; } = string.Empty; public string Subject { get; set; } = string.Empty; public string Text { get; set; } = string.Empty; diff --git a/ConfectioneryContracts/BindingModels/MessageInfoBindingModel.cs b/ConfectioneryContracts/BindingModels/MessageInfoBindingModel.cs index 43d4b1d..47b1fce 100644 --- a/ConfectioneryContracts/BindingModels/MessageInfoBindingModel.cs +++ b/ConfectioneryContracts/BindingModels/MessageInfoBindingModel.cs @@ -22,6 +22,6 @@ namespace ConfectioneryContracts.BindingModels public DateTime DateDelivery { get; set; } public bool HasRead { get; set; } - public string? ReplyMessageId { get; set; } + public string? Reply { get; set; } } } diff --git a/ConfectioneryContracts/ViewModels/MessageInfoViewModel.cs b/ConfectioneryContracts/ViewModels/MessageInfoViewModel.cs index df9290a..2955d75 100644 --- a/ConfectioneryContracts/ViewModels/MessageInfoViewModel.cs +++ b/ConfectioneryContracts/ViewModels/MessageInfoViewModel.cs @@ -29,9 +29,7 @@ namespace ConfectioneryContracts.ViewModels [DisplayName("Прочитано")] public bool HasRead { get; set; } - [DisplayName("Ответ")] - public string ReplyText { get; set; } = string.Empty; - - public string? ReplyMessageId { get; set; } + [DisplayName("Ответ")] + public string? Reply { get; set; } } } diff --git a/ConfectioneryDataModels/IMessageInfoModel.cs b/ConfectioneryDataModels/IMessageInfoModel.cs index a01c444..8db6579 100644 --- a/ConfectioneryDataModels/IMessageInfoModel.cs +++ b/ConfectioneryDataModels/IMessageInfoModel.cs @@ -22,6 +22,6 @@ namespace ConfectioneryDataModels public bool HasRead { get; } - public string? ReplyMessageId { get; } + public string? Reply { get; } } } diff --git a/ConfectioneryDatabaseImplement/MessageInfo.cs b/ConfectioneryDatabaseImplement/MessageInfo.cs index 4352fe2..4225660 100644 --- a/ConfectioneryDatabaseImplement/MessageInfo.cs +++ b/ConfectioneryDatabaseImplement/MessageInfo.cs @@ -23,12 +23,8 @@ namespace ConfectioneryDatabaseImplement.Models public Client? Client { get; private set; } - public MessageInfo? ReplyMessage { get; private set; } - - public List Messages { get; private set; } = new(); - public bool HasRead { get; private set; } - public string? ReplyMessageId { get; private set; } + public string? Reply { get; private set; } public static MessageInfo? Create(MessageInfoBindingModel model) { @@ -39,13 +35,13 @@ namespace ConfectioneryDatabaseImplement.Models return new() { Body = model.Body, + Reply = model.Reply, HasRead = model.HasRead, Subject = model.Subject, ClientId = model.ClientId, MessageId = model.MessageId, SenderName = model.SenderName, DateDelivery = model.DateDelivery, - ReplyMessageId = model.ReplyMessageId, }; } @@ -55,23 +51,21 @@ namespace ConfectioneryDatabaseImplement.Models { return; } - - ReplyMessageId = ReplyMessageId; + Reply = model.Reply; HasRead = model.HasRead; } public MessageInfoViewModel GetViewModel => new() { Body = Body, + Reply = Reply, HasRead = HasRead, Subject = Subject, ClientId = ClientId, MessageId = MessageId, SenderName = SenderName, DateDelivery = DateDelivery, - ReplyMessageId = ReplyMessageId, - ReplyText = ReplyMessage?.Body ?? string.Empty, - }; + }; } diff --git a/ConfectioneryDatabaseImplement/MessageInfoStorage.cs b/ConfectioneryDatabaseImplement/MessageInfoStorage.cs index 98af1d6..19b93c1 100644 --- a/ConfectioneryDatabaseImplement/MessageInfoStorage.cs +++ b/ConfectioneryDatabaseImplement/MessageInfoStorage.cs @@ -3,7 +3,6 @@ using ConfectioneryContracts.SearchModels; using ConfectioneryContracts.StoragesContract; using ConfectioneryContracts.ViewModels; using ConfectioneryDatabaseImplement.Models; -using Microsoft.EntityFrameworkCore; namespace ConfectioneryDatabaseImplement { @@ -15,9 +14,7 @@ namespace ConfectioneryDatabaseImplement using var context = new ConfectioneryDatabase(); if (model.MessageId != null) { - return context.Messages - .Include(x => x.ReplyMessage) - .FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; } return null; } @@ -26,8 +23,7 @@ namespace ConfectioneryDatabaseImplement { using var context = new ConfectioneryDatabase(); var res = context.Messages - .Include(x => x.ReplyMessage) - .Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId) + .Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId) .Select(x => x.GetViewModel); if (!(model.Page.HasValue && model.PageSize.HasValue)) { @@ -40,8 +36,7 @@ namespace ConfectioneryDatabaseImplement { using var context = new ConfectioneryDatabase(); return context.Messages - .Include(x => x.ReplyMessage) - .Select(x => x.GetViewModel) + .Select(x => x.GetViewModel) .ToList(); } diff --git a/ConfectioneryDatabaseImplement/Migrations/20230318021140_add_self_reply_message.Designer.cs b/ConfectioneryDatabaseImplement/Migrations/20230318021140_add_self_reply_message.Designer.cs deleted file mode 100644 index 1be1cd4..0000000 --- a/ConfectioneryDatabaseImplement/Migrations/20230318021140_add_self_reply_message.Designer.cs +++ /dev/null @@ -1,408 +0,0 @@ -// -using System; -using ConfectioneryDatabaseImplement; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace ConfectioneryDatabaseImplement.Migrations -{ - [DbContext(typeof(ConfectioneryDatabase))] - [Migration("20230318021140_add_self_reply_message")] - partial class add_self_reply_message - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.3") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Email") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ComponentName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Cost") - .HasColumnType("float"); - - b.HasKey("Id"); - - b.ToTable("Components"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ImplementerFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Qualification") - .HasColumnType("int"); - - b.Property("WorkExperience") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("Implementers"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b => - { - b.Property("MessageId") - .HasColumnType("nvarchar(450)"); - - b.Property("Body") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("DateDelivery") - .HasColumnType("datetime2"); - - b.Property("HasRead") - .HasColumnType("bit"); - - b.Property("ReplyMessageId") - .HasColumnType("nvarchar(450)"); - - b.Property("SenderName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Subject") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("MessageId"); - - b.HasIndex("ClientId"); - - b.HasIndex("ReplyMessageId"); - - b.ToTable("Messages"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("Count") - .HasColumnType("int"); - - b.Property("DateCreate") - .HasColumnType("datetime2"); - - b.Property("DateImplement") - .HasColumnType("datetime2"); - - b.Property("ImplementerId") - .HasColumnType("int"); - - b.Property("PastryId") - .HasColumnType("int"); - - b.Property("Status") - .HasColumnType("int"); - - b.Property("Sum") - .HasColumnType("float"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.HasIndex("ImplementerId"); - - b.HasIndex("PastryId"); - - b.ToTable("Orders"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("PastryName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Price") - .HasColumnType("float"); - - b.HasKey("Id"); - - b.ToTable("Pastries"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ComponentId") - .HasColumnType("int"); - - b.Property("Count") - .HasColumnType("int"); - - b.Property("PastryId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ComponentId"); - - b.HasIndex("PastryId"); - - b.ToTable("PastryComponents"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Shop", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Address") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("DateOpening") - .HasColumnType("datetime2"); - - b.Property("MaxCountPastries") - .HasColumnType("int"); - - b.Property("Name") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("PastryId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("PastryId"); - - b.ToTable("Shops"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.ShopPastry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Count") - .HasColumnType("int"); - - b.Property("PastryId") - .HasColumnType("int"); - - b.Property("ShopId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("PastryId"); - - b.HasIndex("ShopId"); - - b.ToTable("ShopPastries"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b => - { - b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client") - .WithMany("Messages") - .HasForeignKey("ClientId"); - - b.HasOne("ConfectioneryDatabaseImplement.Models.MessageInfo", "ReplyMessage") - .WithMany("Messages") - .HasForeignKey("ReplyMessageId"); - - b.Navigation("Client"); - - b.Navigation("ReplyMessage"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b => - { - b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client") - .WithMany("Orders") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("ConfectioneryDatabaseImplement.Models.Implementer", "Implementer") - .WithMany("Orders") - .HasForeignKey("ImplementerId"); - - b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry") - .WithMany("Orders") - .HasForeignKey("PastryId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Client"); - - b.Navigation("Implementer"); - - b.Navigation("Pastry"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b => - { - b.HasOne("ConfectioneryDatabaseImplement.Models.Component", "Component") - .WithMany("PastryComponents") - .HasForeignKey("ComponentId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry") - .WithMany("Components") - .HasForeignKey("PastryId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Component"); - - b.Navigation("Pastry"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Shop", b => - { - b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", null) - .WithMany("Shops") - .HasForeignKey("PastryId"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.ShopPastry", b => - { - b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry") - .WithMany() - .HasForeignKey("PastryId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("ConfectioneryDatabaseImplement.Models.Shop", "Shop") - .WithMany("ShopPastries") - .HasForeignKey("ShopId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Pastry"); - - b.Navigation("Shop"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b => - { - b.Navigation("Messages"); - - b.Navigation("Orders"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b => - { - b.Navigation("PastryComponents"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b => - { - b.Navigation("Orders"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b => - { - b.Navigation("Messages"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b => - { - b.Navigation("Components"); - - b.Navigation("Orders"); - - b.Navigation("Shops"); - }); - - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Shop", b => - { - b.Navigation("ShopPastries"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/ConfectioneryDatabaseImplement/Migrations/20230318021140_add_self_reply_message.cs b/ConfectioneryDatabaseImplement/Migrations/20230318021140_add_self_reply_message.cs deleted file mode 100644 index 087a76d..0000000 --- a/ConfectioneryDatabaseImplement/Migrations/20230318021140_add_self_reply_message.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace ConfectioneryDatabaseImplement.Migrations -{ - /// - public partial class add_self_reply_message : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "Reply", - table: "Messages"); - - migrationBuilder.AddColumn( - name: "ReplyMessageId", - table: "Messages", - type: "nvarchar(450)", - nullable: true); - - migrationBuilder.CreateIndex( - name: "IX_Messages_ReplyMessageId", - table: "Messages", - column: "ReplyMessageId"); - - migrationBuilder.AddForeignKey( - name: "FK_Messages_Messages_ReplyMessageId", - table: "Messages", - column: "ReplyMessageId", - principalTable: "Messages", - principalColumn: "MessageId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Messages_Messages_ReplyMessageId", - table: "Messages"); - - migrationBuilder.DropIndex( - name: "IX_Messages_ReplyMessageId", - table: "Messages"); - - migrationBuilder.DropColumn( - name: "ReplyMessageId", - table: "Messages"); - - migrationBuilder.AddColumn( - name: "Reply", - table: "Messages", - type: "nvarchar(max)", - nullable: true); - } - } -} diff --git a/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs b/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs index b2e2573..be68b52 100644 --- a/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs +++ b/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs @@ -112,8 +112,8 @@ namespace ConfectioneryDatabaseImplement.Migrations b.Property("HasRead") .HasColumnType("bit"); - b.Property("ReplyMessageId") - .HasColumnType("nvarchar(450)"); + b.Property("Reply") + .HasColumnType("nvarchar(max)"); b.Property("SenderName") .IsRequired() @@ -127,8 +127,6 @@ namespace ConfectioneryDatabaseImplement.Migrations b.HasIndex("ClientId"); - b.HasIndex("ReplyMessageId"); - b.ToTable("Messages"); }); @@ -285,13 +283,7 @@ namespace ConfectioneryDatabaseImplement.Migrations .WithMany("Messages") .HasForeignKey("ClientId"); - b.HasOne("ConfectioneryDatabaseImplement.Models.MessageInfo", "ReplyMessage") - .WithMany("Messages") - .HasForeignKey("ReplyMessageId"); - b.Navigation("Client"); - - b.Navigation("ReplyMessage"); }); modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b => @@ -381,11 +373,6 @@ namespace ConfectioneryDatabaseImplement.Migrations b.Navigation("Orders"); }); - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b => - { - b.Navigation("Messages"); - }); - modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b => { b.Navigation("Components");