From 10dd71a9c74b1e6320f1ccb9840707c84516fb3c Mon Sep 17 00:00:00 2001 From: sofiaivv Date: Wed, 1 May 2024 17:43:44 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B0=20=D0=BA=D1=82=D0=BE=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B9=20=D0=B1=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D1=88=D0=BE=D0=B9=20=D1=81=D0=B5=D0=BA=D1=80=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LawCompany/LawCompany.sln | 6 +++--- .../LawCompanyDatabaseImplement/Models/Consultation.cs | 4 ++-- .../LawCompanyDatabaseImplement/Models/Guarantor.cs | 8 ++++++++ LawCompany/LawCompanyDatabaseImplement/Models/Hearing.cs | 4 ++-- LawCompany/LawCompanyDatabaseImplement/Models/Lawyer.cs | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/LawCompany/LawCompany.sln b/LawCompany/LawCompany.sln index c64215d..ce170c6 100644 --- a/LawCompany/LawCompany.sln +++ b/LawCompany/LawCompany.sln @@ -5,11 +5,11 @@ VisualStudioVersion = 17.9.34723.18 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyDataModels", "LawCompany\LawCompanyDataModels.csproj", "{E38D3745-25B2-45EC-B47E-14C6100C9413}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawCompanyContracts", "LawCompanyContracts\LawCompanyContracts.csproj", "{DD8E5EB4-CA20-4C49-9DBF-F9778202331B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyContracts", "LawCompanyContracts\LawCompanyContracts.csproj", "{DD8E5EB4-CA20-4C49-9DBF-F9778202331B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawCompanyBusinessLogic", "LawCompanyBusinessLogic\LawCompanyBusinessLogic.csproj", "{14D20CC6-D50F-4674-AC2A-4F80C85EDB4D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyBusinessLogic", "LawCompanyBusinessLogic\LawCompanyBusinessLogic.csproj", "{14D20CC6-D50F-4674-AC2A-4F80C85EDB4D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawCompanyDatabaseImplement", "LawCompanyDatabaseImplement\LawCompanyDatabaseImplement.csproj", "{9A4CBD1F-020F-4036-A71D-AB6BF3489EE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyDatabaseImplement", "LawCompanyDatabaseImplement\LawCompanyDatabaseImplement.csproj", "{9A4CBD1F-020F-4036-A71D-AB6BF3489EE0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/LawCompany/LawCompanyDatabaseImplement/Models/Consultation.cs b/LawCompany/LawCompanyDatabaseImplement/Models/Consultation.cs index 0eef22e..eb00572 100644 --- a/LawCompany/LawCompanyDatabaseImplement/Models/Consultation.cs +++ b/LawCompany/LawCompanyDatabaseImplement/Models/Consultation.cs @@ -20,6 +20,8 @@ namespace LawCompanyDatabaseImplement.Models public int GuarantorId { get; set; } private Dictionary? _consultationLawyers = null; + [ForeignKey("ConsultationId")] + public virtual List Lawyers { get; set; } = new(); [NotMapped] public Dictionary ConsultationLawyers { @@ -35,8 +37,6 @@ namespace LawCompanyDatabaseImplement.Models return _consultationLawyers; } } - [ForeignKey("ConsultationId")] - public virtual List Lawyers { get; set; } = new(); public static Consultation? Create(LawCompanyDatabase context, ConsultationBindingModel? model) { if (model == null) diff --git a/LawCompany/LawCompanyDatabaseImplement/Models/Guarantor.cs b/LawCompany/LawCompanyDatabaseImplement/Models/Guarantor.cs index a7c1560..dee00dd 100644 --- a/LawCompany/LawCompanyDatabaseImplement/Models/Guarantor.cs +++ b/LawCompany/LawCompanyDatabaseImplement/Models/Guarantor.cs @@ -1,7 +1,9 @@ using LawCompanyContracts.BindingModels; using LawCompanyContracts.ViewModels; +using LawCompanyDatabaseImplement.Models; using LawCompanyDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace LawFirmDatabaseImplement.Models { @@ -14,6 +16,12 @@ namespace LawFirmDatabaseImplement.Models public string Email { get; private set; } = string.Empty; [Required] public string Password { get; private set; } = string.Empty; + [ForeignKey("GuarantorId")] + public virtual List Hearings { get; set; } = new(); + [ForeignKey("GuarantorId")] + public virtual List Lawyers { get; set; } = new(); + [ForeignKey("GuarantorId")] + public virtual List Consultations { get; set; } = new(); public static Guarantor? Create(GuarantorBindingModel? model) { diff --git a/LawCompany/LawCompanyDatabaseImplement/Models/Hearing.cs b/LawCompany/LawCompanyDatabaseImplement/Models/Hearing.cs index a0b20c1..01ff90b 100644 --- a/LawCompany/LawCompanyDatabaseImplement/Models/Hearing.cs +++ b/LawCompany/LawCompanyDatabaseImplement/Models/Hearing.cs @@ -17,6 +17,8 @@ namespace LawCompanyDatabaseImplement.Models public string Judge { get; private set; } = string.Empty; public int GuarantorId { get; set; } private Dictionary? _hearingLawyers = null; + [ForeignKey("HearingId")] + public virtual List Lawyers { get; set; } = new(); [NotMapped] public Dictionary HearingLawyers { @@ -32,8 +34,6 @@ namespace LawCompanyDatabaseImplement.Models return _hearingLawyers; } } - [ForeignKey("HearingId")] - public virtual List Lawyers { get; set; } = new(); public static Hearing? Create(LawCompanyDatabase context, HearingBindingModel? model) { if (model == null) diff --git a/LawCompany/LawCompanyDatabaseImplement/Models/Lawyer.cs b/LawCompany/LawCompanyDatabaseImplement/Models/Lawyer.cs index 9ed3b5f..8a927bd 100644 --- a/LawCompany/LawCompanyDatabaseImplement/Models/Lawyer.cs +++ b/LawCompany/LawCompanyDatabaseImplement/Models/Lawyer.cs @@ -20,7 +20,7 @@ namespace LawFirmDatabaseImplement.Models [ForeignKey("LawyerId")] public virtual List HearingLawyers { get; set; } = new(); [ForeignKey("LawyerId")] - public virtual List LawyerConsultations { get; set; } = new(); + public virtual List ConsultationLawyers { get; set; } = new(); public int GuarantorId { get; set; } public static Lawyer? Create(LawyerBindingModel? model)