From b7f880a90a6b29addd9e36fb22524e88e9525c42 Mon Sep 17 00:00:00 2001 From: "a.puchkina" Date: Sat, 27 Apr 2024 22:16:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D1=8F=D0=BB=D1=8F=20=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=83=D1=87=D0=BC=D0=B8=D1=82=D0=B5=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs | 8 ++------ .../LawFirmDatabaseImplement.csproj | 1 + LawFim/LawFirmDatabaseImplement/Models/Consultation.cs | 4 ++-- LawFim/LawFirmDatabaseImplement/Models/Guarantor.cs | 7 +++++++ LawFim/LawFirmDatabaseImplement/Models/Hearing.cs | 4 ++-- LawFim/LawFirmDatabaseImplement/Models/Lawyer.cs | 2 +- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs b/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs index eea439c..e1b203d 100644 --- a/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs +++ b/LawFim/LawFirmDatabaseImplement/LawFirmDatabase.cs @@ -11,12 +11,8 @@ namespace LawFirmDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - - // optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-ON2V3BB\SQLEXPRESS;Initial Catalog=LawFirmDatabase; - //Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); - // менять нада, пока скелетик - // optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-7A1PHA0\SQLEXPRESS;Initial Catalog=LawFirmDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); - } + optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=SchoolAgainStudyDataBase;Username=postgres;Password=186qazwsx"); + } base.OnConfiguring(optionsBuilder); } public virtual DbSet Cases { set; get; } diff --git a/LawFim/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj b/LawFim/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj index fb74b6d..742e7ed 100644 --- a/LawFim/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj +++ b/LawFim/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj @@ -8,6 +8,7 @@ + diff --git a/LawFim/LawFirmDatabaseImplement/Models/Consultation.cs b/LawFim/LawFirmDatabaseImplement/Models/Consultation.cs index 6960378..04130d1 100644 --- a/LawFim/LawFirmDatabaseImplement/Models/Consultation.cs +++ b/LawFim/LawFirmDatabaseImplement/Models/Consultation.cs @@ -19,6 +19,8 @@ namespace LawFirmDatabaseImplement.Models public int GuarantorId { get; set; } private Dictionary? _consultationLawyers = null; + [ForeignKey("ConsultationId")] + public virtual List Lawyers { get; set; } = new(); [NotMapped] public Dictionary ConsultationLawyers { @@ -34,8 +36,6 @@ namespace LawFirmDatabaseImplement.Models return _consultationLawyers; } } - [ForeignKey("ConsultationId")] - public virtual List Lawyers { get; set; } = new(); public static Consultation? Create(LawFirmDatabase context, ConsultationBindingModel? model) { if (model == null) diff --git a/LawFim/LawFirmDatabaseImplement/Models/Guarantor.cs b/LawFim/LawFirmDatabaseImplement/Models/Guarantor.cs index 1bfa0e8..64b38ae 100644 --- a/LawFim/LawFirmDatabaseImplement/Models/Guarantor.cs +++ b/LawFim/LawFirmDatabaseImplement/Models/Guarantor.cs @@ -2,6 +2,7 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.ViewModels; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace LawFirmDatabaseImplement.Models { @@ -14,6 +15,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/LawFim/LawFirmDatabaseImplement/Models/Hearing.cs b/LawFim/LawFirmDatabaseImplement/Models/Hearing.cs index a428dc5..b0afb96 100644 --- a/LawFim/LawFirmDatabaseImplement/Models/Hearing.cs +++ b/LawFim/LawFirmDatabaseImplement/Models/Hearing.cs @@ -17,6 +17,8 @@ namespace LawFirmDatabaseImplement.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 LawFirmDatabaseImplement.Models return _hearingLawyers; } } - [ForeignKey("HearingId")] - public virtual List Lawyers { get; set; } = new(); public static Hearing? Create(LawFirmDatabase context, HearingBindingModel? model) { if (model == null) diff --git a/LawFim/LawFirmDatabaseImplement/Models/Lawyer.cs b/LawFim/LawFirmDatabaseImplement/Models/Lawyer.cs index cf50a3f..51e3e78 100644 --- a/LawFim/LawFirmDatabaseImplement/Models/Lawyer.cs +++ b/LawFim/LawFirmDatabaseImplement/Models/Lawyer.cs @@ -19,7 +19,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)