CaseAccounting/CaseAccountingContracts/BindingModels/DealBindingModel.cs

@@ -1,6 +1,4 @@
-using CaseAccountingContracts.ViewModels;
+using CaseAccountingDataModels.Models;
-using CaseAccountingDataModels.Models;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,15 +20,5 @@ namespace CaseAccountingContracts.BindingModels
         public int Id { get; set; }
 
         public Dictionary<int, ICaseModel> Cases { get; set; } = new();
-
-        public List<CaseViewModel> CaseViewModels { get; set; } = new();
-
-        public DealBindingModel() { }
-
-        [JsonConstructor]
-        public DealBindingModel(Dictionary<int, CaseViewModel> Cases)
-        {
-            this.Cases = Cases.ToDictionary(x => x.Key, x => (ICaseModel)x.Value);
-        }
     }
 }

CaseAccounting/CaseAccountingContracts/BindingModels/LawyerBindingModel.cs

@@ -1,6 +1,5 @@
 using CaseAccountingContracts.ViewModels;
 using CaseAccountingDataModels.Models;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,7 +19,7 @@ namespace CaseAccountingContracts.BindingModels
 
         public int Experience { get; set; }
 
-        public int? SpecializationId { get; set; }
+        public int SpecializationId { get; set; }
 
         public int UserId { get; set; }
 
@@ -30,13 +29,6 @@ namespace CaseAccountingContracts.BindingModels
 
         public List<ContractViewModel> ContractViewModels { get; set; } = new();
 
-        public LawyerBindingModel() { }
-
-        [JsonConstructor]
-        public LawyerBindingModel(Dictionary<int, ContractViewModel> Contracts)
-        {
-            this.Contracts = Contracts.ToDictionary(x => x.Key, x => (IContractModel)x.Value);
-        }
 
     }
 }

CaseAccounting/CaseAccountingContracts/CaseAccountingContracts.csproj

@@ -6,10 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\CaseAccountingDataModels\CaseAccountingDataModels.csproj" />
   </ItemGroup>

CaseAccounting/CaseAccountingContracts/ViewModels/LawyerViewModel.cs

@@ -18,7 +18,7 @@ namespace CaseAccountingContracts.ViewModels
 		public string Patronymic { get; set; } = string.Empty;
 		[DisplayName("Опыт работы")]
 		public int Experience { get; set; }
-		public int? SpecializationId { get; set; }
+		public int SpecializationId { get; set; }
 		[DisplayName("Специализация")]
 		public string Specialization { get; set; } = string.Empty;
         public int UserId { get; set; }

CaseAccounting/CaseAccountingCustomerView/Controllers/Lawyers.cs

@@ -1,6 +1,5 @@
 using CaseAccountingContracts.BindingModels;
 using CaseAccountingContracts.ViewModels;
-using CaseAccountingDataModels.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CaseAccountingCustomerView.Controllers
@@ -24,14 +23,7 @@ namespace CaseAccountingCustomerView.Controllers
                 throw new Exception("403");
             }
             lawyerModel.UserId = APIUser.User.Id;
-            lawyerModel.SpecializationId = null;
+            lawyerModel.SpecializationId = 0;
-            var dict = new Dictionary<int, IContractModel>();
-            foreach (var element in lawyerModel.ContractViewModels)
-            {
-                var contract = APIUser.GetRequest<ContractViewModel>($"api/contract/get?id={element.Id}");
-                dict.Add(element.Id, contract);
-            }
-            lawyerModel.Contracts = dict;
             APIUser.PostRequest("api/lawyer/create", lawyerModel);
             Response.Redirect("/Home/Lawyers");
         }

CaseAccounting/CaseAccountingCustomerView/Views/Home/Lawyers.cshtml

@@ -49,10 +49,10 @@
 								@item.Experience
 							</td>
 							<td>
-								@item.Specialization
+								@item.SpecializationName
 							</td>
 							<td>
-								<a id="update-button-@item.Id" class="btn btn-secondary" asp-controller="Lawyers" asp-action="Update" asp-route-id="@item.Id">Изменить</a>
+								<a id="update-button-@item.Id" class="btn btn-secondary" asp-controller="Lawyer" asp-action="Update" asp-route-id="@item.Id">Изменить</a>
 							</td>
 							<td>
 								<a id="remove-button-@item.Id" class="btn btn-secondary remove-btn" data-id="@item.Id">Удалить</a>

CaseAccounting/CaseAccountingCustomerView/Views/Specializations/AddLawyer.cshtml

@@ -54,4 +54,4 @@
     </div>
 }
 
-<script src="~/js/Specializations/specializations-add-lawyer.js" asp-append-version="true"></script>
+<script src="~/js/Specializations/specialization-add-lawyer.js" asp-append-version="true"></script>

CaseAccounting/CaseAccountingCustomerView/wwwroot/js/Specializations/specializations-add-lawyer.js

@@ -16,7 +16,6 @@ window.addEventListener("load", async () => {
         });
         lawyers = lawyersResponse;
 
-        console.log(lawyers);
         lawyers.forEach((lawyer) => {
             createLawyerOption(lawyer);
         });

CaseAccounting/CaseAccountingDataBaseImplement/Migrations/20230519143905_migrSpecializationNull.Designer.cs

@@ -1,554 +0,0 @@
-// <auto-generated />
-using System;
-using CaseAccountingDataBaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace CaseAccountingDataBaseImplement.Migrations
-{
-    [DbContext(typeof(CaseAccountingDatabase))]
-    [Migration("20230519143905_migrSpecializationNull")]
-    partial class migrSpecializationNull
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.5")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Case", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Annotation")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Applicant")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Defendant")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("SpecializationId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SpecializationId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Cases");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseDeal", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CaseId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DealId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CaseId");
-
-                    b.HasIndex("DealId");
-
-                    b.ToTable("CaseDeals");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseLawyer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CaseId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LawyerId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CaseId");
-
-                    b.HasIndex("LawyerId");
-
-                    b.ToTable("CaseLawyers");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Contract", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<decimal>("Coast")
-                        .HasColumnType("numeric");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Service")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Contracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Deal", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Responsibilities")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Deals");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.DealContract", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ContractId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DealId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ContractId");
-
-                    b.HasIndex("DealId");
-
-                    b.ToTable("DealContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Hearing", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CaseId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Information")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CaseId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Hearings");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Lawyer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Experience")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Patronymic")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("SpecializationId")
-                        .IsRequired()
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Surname")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SpecializationId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Lawyers");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.LawyerContract", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ContractId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LawyerId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ContractId");
-
-                    b.HasIndex("LawyerId");
-
-                    b.ToTable("LawyerContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Specialization", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Specializations");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Login")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Role")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Case", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Specialization", "Specialization")
-                        .WithMany("Cases")
-                        .HasForeignKey("SpecializationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Cases")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Specialization");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseDeal", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Case", "Case")
-                        .WithMany("Deals")
-                        .HasForeignKey("CaseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Deal", "Deal")
-                        .WithMany("CaseDeals")
-                        .HasForeignKey("DealId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Case");
-
-                    b.Navigation("Deal");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseLawyer", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Case", "Case")
-                        .WithMany("CaseLawyers")
-                        .HasForeignKey("CaseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Lawyer", "Lawyer")
-                        .WithMany("CaseLawyers")
-                        .HasForeignKey("LawyerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Case");
-
-                    b.Navigation("Lawyer");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Contract", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Contracts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Deal", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Deals")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.DealContract", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Contract", "Contract")
-                        .WithMany("DealContracts")
-                        .HasForeignKey("ContractId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Deal", "Deal")
-                        .WithMany("Contracts")
-                        .HasForeignKey("DealId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Contract");
-
-                    b.Navigation("Deal");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Hearing", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Case", "Case")
-                        .WithMany("Hearings")
-                        .HasForeignKey("CaseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Hearings")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Case");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Lawyer", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Specialization", "Specialization")
-                        .WithMany("Lawyers")
-                        .HasForeignKey("SpecializationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Lawyers")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Specialization");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.LawyerContract", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Contract", "Contract")
-                        .WithMany("LawyerContracts")
-                        .HasForeignKey("ContractId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Lawyer", "Lawyer")
-                        .WithMany("LawyerContracts")
-                        .HasForeignKey("LawyerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Contract");
-
-                    b.Navigation("Lawyer");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Specialization", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Specializations")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Case", b =>
-                {
-                    b.Navigation("CaseLawyers");
-
-                    b.Navigation("Deals");
-
-                    b.Navigation("Hearings");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Contract", b =>
-                {
-                    b.Navigation("DealContracts");
-
-                    b.Navigation("LawyerContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Deal", b =>
-                {
-                    b.Navigation("CaseDeals");
-
-                    b.Navigation("Contracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Lawyer", b =>
-                {
-                    b.Navigation("CaseLawyers");
-
-                    b.Navigation("LawyerContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Specialization", b =>
-                {
-                    b.Navigation("Cases");
-
-                    b.Navigation("Lawyers");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.User", b =>
-                {
-                    b.Navigation("Cases");
-
-                    b.Navigation("Contracts");
-
-                    b.Navigation("Deals");
-
-                    b.Navigation("Hearings");
-
-                    b.Navigation("Lawyers");
-
-                    b.Navigation("Specializations");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

CaseAccounting/CaseAccountingDataBaseImplement/Migrations/20230519143905_migrSpecializationNull.cs

@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CaseAccountingDataBaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class migrSpecializationNull : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

CaseAccounting/CaseAccountingDataBaseImplement/Migrations/20230519145356_migrSpecializationNullAttempt2.Designer.cs

@@ -1,551 +0,0 @@
-// <auto-generated />
-using System;
-using CaseAccountingDataBaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace CaseAccountingDataBaseImplement.Migrations
-{
-    [DbContext(typeof(CaseAccountingDatabase))]
-    [Migration("20230519145356_migrSpecializationNullAttempt2")]
-    partial class migrSpecializationNullAttempt2
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.5")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Case", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Annotation")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Applicant")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Defendant")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("SpecializationId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SpecializationId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Cases");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseDeal", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CaseId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DealId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CaseId");
-
-                    b.HasIndex("DealId");
-
-                    b.ToTable("CaseDeals");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseLawyer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CaseId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LawyerId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CaseId");
-
-                    b.HasIndex("LawyerId");
-
-                    b.ToTable("CaseLawyers");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Contract", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<decimal>("Coast")
-                        .HasColumnType("numeric");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Service")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Contracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Deal", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Responsibilities")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Deals");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.DealContract", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ContractId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DealId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ContractId");
-
-                    b.HasIndex("DealId");
-
-                    b.ToTable("DealContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Hearing", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CaseId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Information")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CaseId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Hearings");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Lawyer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Experience")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Patronymic")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("SpecializationId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Surname")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("SpecializationId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Lawyers");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.LawyerContract", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ContractId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LawyerId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ContractId");
-
-                    b.HasIndex("LawyerId");
-
-                    b.ToTable("LawyerContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Specialization", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("Specializations");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Login")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Role")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Case", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Specialization", "Specialization")
-                        .WithMany("Cases")
-                        .HasForeignKey("SpecializationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Cases")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Specialization");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseDeal", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Case", "Case")
-                        .WithMany("Deals")
-                        .HasForeignKey("CaseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Deal", "Deal")
-                        .WithMany("CaseDeals")
-                        .HasForeignKey("DealId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Case");
-
-                    b.Navigation("Deal");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.CaseLawyer", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Case", "Case")
-                        .WithMany("CaseLawyers")
-                        .HasForeignKey("CaseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Lawyer", "Lawyer")
-                        .WithMany("CaseLawyers")
-                        .HasForeignKey("LawyerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Case");
-
-                    b.Navigation("Lawyer");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Contract", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Contracts")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Deal", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Deals")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.DealContract", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Contract", "Contract")
-                        .WithMany("DealContracts")
-                        .HasForeignKey("ContractId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Deal", "Deal")
-                        .WithMany("Contracts")
-                        .HasForeignKey("DealId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Contract");
-
-                    b.Navigation("Deal");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Hearing", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Case", "Case")
-                        .WithMany("Hearings")
-                        .HasForeignKey("CaseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Hearings")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Case");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Lawyer", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Specialization", "Specialization")
-                        .WithMany("Lawyers")
-                        .HasForeignKey("SpecializationId");
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Lawyers")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Specialization");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.LawyerContract", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Contract", "Contract")
-                        .WithMany("LawyerContracts")
-                        .HasForeignKey("ContractId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.Lawyer", "Lawyer")
-                        .WithMany("LawyerContracts")
-                        .HasForeignKey("LawyerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Contract");
-
-                    b.Navigation("Lawyer");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Specialization", b =>
-                {
-                    b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
-                        .WithMany("Specializations")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Case", b =>
-                {
-                    b.Navigation("CaseLawyers");
-
-                    b.Navigation("Deals");
-
-                    b.Navigation("Hearings");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Contract", b =>
-                {
-                    b.Navigation("DealContracts");
-
-                    b.Navigation("LawyerContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Deal", b =>
-                {
-                    b.Navigation("CaseDeals");
-
-                    b.Navigation("Contracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Lawyer", b =>
-                {
-                    b.Navigation("CaseLawyers");
-
-                    b.Navigation("LawyerContracts");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.Specialization", b =>
-                {
-                    b.Navigation("Cases");
-
-                    b.Navigation("Lawyers");
-                });
-
-            modelBuilder.Entity("CaseAccountingDataBaseImplement.Models.User", b =>
-                {
-                    b.Navigation("Cases");
-
-                    b.Navigation("Contracts");
-
-                    b.Navigation("Deals");
-
-                    b.Navigation("Hearings");
-
-                    b.Navigation("Lawyers");
-
-                    b.Navigation("Specializations");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

CaseAccounting/CaseAccountingDataBaseImplement/Migrations/20230519145356_migrSpecializationNullAttempt2.cs

@@ -1,59 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CaseAccountingDataBaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class migrSpecializationNullAttempt2 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Lawyers_Specializations_SpecializationId",
-                table: "Lawyers");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "SpecializationId",
-                table: "Lawyers",
-                type: "integer",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "integer");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Lawyers_Specializations_SpecializationId",
-                table: "Lawyers",
-                column: "SpecializationId",
-                principalTable: "Specializations",
-                principalColumn: "Id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_Lawyers_Specializations_SpecializationId",
-                table: "Lawyers");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "SpecializationId",
-                table: "Lawyers",
-                type: "integer",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(int),
-                oldType: "integer",
-                oldNullable: true);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Lawyers_Specializations_SpecializationId",
-                table: "Lawyers",
-                column: "SpecializationId",
-                principalTable: "Specializations",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

CaseAccounting/CaseAccountingDataBaseImplement/Migrations/CaseAccountingDatabaseModelSnapshot.cs

@@ -239,7 +239,7 @@ namespace CaseAccountingDataBaseImplement.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<int?>("SpecializationId")
+                    b.Property<int>("SpecializationId")
                         .HasColumnType("integer");
 
                     b.Property<string>("Surname")
@@ -448,7 +448,9 @@ namespace CaseAccountingDataBaseImplement.Migrations
                 {
                     b.HasOne("CaseAccountingDataBaseImplement.Models.Specialization", "Specialization")
                         .WithMany("Lawyers")
-                        .HasForeignKey("SpecializationId");
+                        .HasForeignKey("SpecializationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("CaseAccountingDataBaseImplement.Models.User", "User")
                         .WithMany("Lawyers")

CaseAccounting/CaseAccountingDataBaseImplement/Models/Case.cs

@@ -139,7 +139,6 @@ namespace CaseAccountingDataBaseImplement.Models
             Annotation = Annotation,
             Date = Date,
             SpecializationId = SpecializationId,
-            Specialization = Specialization.Name,
             UserId = UserId
         };
     }

CaseAccounting/CaseAccountingDataBaseImplement/Models/Deal.cs

@@ -64,11 +64,7 @@ namespace CaseAccountingDataBaseImplement.Models
                 Responsibilities = model.Responsibilities,
                 Date = model.Date,
                 UserId = model.UserId,
-                User = context.Users.FirstOrDefault(x => x.Id == model.UserId) ?? throw new Exception("User не существует"),
+                User = context.Users.FirstOrDefault(x => x.Id == model.UserId) ?? throw new Exception("User не существует")
-                CaseDeals = model.Cases.Select(x => new CaseDeal
-                {
-                    Case = context.Cases.First(y => y.Id == x.Key)
-                }).ToList()
             };
         }
 

CaseAccounting/CaseAccountingDataBaseImplement/Models/Lawyer.cs

@@ -27,8 +27,9 @@ namespace CaseAccountingDataBaseImplement.Models
         [Required]
         public int Experience { get; set; }
 
-        public int? SpecializationId { get; set; }
+        [Required]
-        public virtual Specialization? Specialization { get; set; } = new();
+        public int SpecializationId { get; set; }
+        public virtual Specialization Specialization { get; set; } = new();
 
         [Required]
         public int UserId { get; set; }
@@ -37,22 +38,6 @@ namespace CaseAccountingDataBaseImplement.Models
         [ForeignKey("LawyerId")]
         public virtual List<CaseLawyer> CaseLawyers { get; set; } = new();
 
-        private Dictionary<int, ICaseModel>? _cases;
-
-        [NotMapped]
-        public Dictionary<int, ICaseModel> Cases
-        {
-            get 
-            {
-                if (_cases == null)
-                {
-                    _cases = CaseLawyers.ToDictionary(
-                        x => x.CaseId, x => x.Case as ICaseModel);
-                }
-                return _cases;
-            }
-        }
-
         [ForeignKey("LawyerId")]
         public virtual List<LawyerContract> LawyerContracts { get; set; } = new();
 
@@ -86,13 +71,9 @@ namespace CaseAccountingDataBaseImplement.Models
                 Patronymic = model.Patronymic,
                 Experience = model.Experience,
                 SpecializationId = model.SpecializationId,
-                Specialization = context.Specializations.FirstOrDefault(x => model.SpecializationId.HasValue && x.Id == model.SpecializationId),
+                Specialization = context.Specializations.FirstOrDefault(x => x.Id == model.SpecializationId) ?? throw new Exception("specialization not found"),
                 UserId = model.UserId,
-                User = context.Users.FirstOrDefault(x => x.Id == model.UserId) ?? throw new Exception("User not found"),
+                User = context.Users.FirstOrDefault(x => x.Id == model.UserId) ?? throw new Exception("User not found")
-                LawyerContracts = model.Contracts.Select(x => new LawyerContract
-                {
-                    Contract = context.Contracts.First(y => y.Id == x.Key)
-                }).ToList()
             };
         }
 
@@ -149,8 +130,7 @@ namespace CaseAccountingDataBaseImplement.Models
             Patronymic = Patronymic,
             Experience = Experience,
             SpecializationId = SpecializationId,
-            UserId = UserId,
+            UserId = UserId
-            Specialization = Specialization?.Name ?? "Не указан"
         };
     }
 }

CaseAccounting/CaseAccountingDataModels/Models/ILawyerModel.cs

@@ -12,7 +12,7 @@ namespace CaseAccountingDataModels.Models
 		string Surname { get; }	
 		string Patronymic { get; }
 		int Experience { get; }
-		int? SpecializationId { get; }
+		int SpecializationId { get; }
         int UserId { get; }
         Dictionary<int, IContractModel> Contracts { get; }
     }

CaseAccounting/CaseAccountingProviderView/CaseAccountingProviderView.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CaseAccountingContracts\CaseAccountingContracts.csproj" />
-    <ProjectReference Include="..\CaseAccountingDataModels\CaseAccountingDataModels.csproj" />
   </ItemGroup>
 
   <ItemGroup>

CaseAccounting/CaseAccountingProviderView/Controllers/CaseController.cs

@@ -119,15 +119,5 @@ namespace CaseAccountingProviderView.Controllers
 			CaseViewModel? caseModel = APIUser.GetRequest<CaseViewModel>($"api/case/get?id={id}");
 			return caseModel;
 		}
-
-		public List<SpecializationViewModel> GetAllSpecializations()
-		{
-			if (APIUser.User == null)
-			{
-				return new();
-			}
-			List<SpecializationViewModel>? specializationModel = APIUser.GetRequest<List<SpecializationViewModel>>($"api/case/getallspecializations");
-			return specializationModel ?? new();
-		}
 	}
 }

CaseAccounting/CaseAccountingProviderView/Controllers/DealController.cs

@@ -1,6 +1,5 @@
 using CaseAccountingContracts.BindingModels;
 using CaseAccountingContracts.ViewModels;
-using CaseAccountingDataModels.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CaseAccountingProviderView.Controllers
@@ -24,14 +23,7 @@ namespace CaseAccountingProviderView.Controllers
 				throw new Exception("403");
 			}
 			dealModel.UserId = APIUser.User.Id;
-			var dict = new Dictionary<int, ICaseModel>();
+			APIUser.PostRequest("api/deal/create", dealModel);
-			foreach (var element in dealModel.CaseViewModels)
-			{
-				var caseModel = APIUser.GetRequest<CaseViewModel>($"api/case/get?id={element.Id}");
-				dict.Add(element.Id, caseModel);
-			}
-			dealModel.Cases = dict;
-            APIUser.PostRequest("api/deal/create", dealModel);
 			Response.Redirect("/Home/Deals");
 		}
 

CaseAccounting/CaseAccountingProviderView/Views/Case/Create.cshtml

@@ -22,6 +22,7 @@
 <input type="text" id="annotation-input" name="annotation" class="form-control mb-3" />
 <p class="mb-0">Специализация:</p>
 <select id="specialization-select" name="specialization" class="form-control mb-3">
+    <option></option>
 </select>
 
 <button id="create-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/Views/Case/Update.cshtml

@@ -30,6 +30,7 @@
     <input type="text" id="annotation-input" name="annotation" class="form-control mb-3" />
     <p class="mb-0">Специализация:</p>
     <select id="specialization-select" name="specialization" class="form-control mb-3">
+        <option></option>
     </select>
 
     <button id="update-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/Views/Deal/Create.cshtml

@@ -17,25 +17,6 @@
 <p class="mb-0">Дата составления:</p>
 <input type="date" id="date-input" name="date" class="form-control mb-3" />
 
-<div>
-    <div class="scrollable-table">
-        <table class="table table-bordered">
-            <thead class="thead-light">
-            <tr>
-                <th>Номер дела:</th>
-                <th>Истец:</th>
-                <th>Ответчик:</th>
-                <th>Дата составления:</th>
-                <th>Примечание:</th>
-                <th>Специализация:</th>
-            </tr>
-            </thead>
-            <tbody id="scrollable-table__tbody">
-            </tbody>
-        </table>
-     </div>
-</div>
-
 <button id="create-button" type="button" class="btn btn-primary text-button">
     Создать
 </button>

CaseAccounting/CaseAccountingProviderView/Views/Hearing/Create.cshtml

@@ -16,6 +16,7 @@
 <input type="date" id="date-input" name="date" class="form-control mb-3" />
 <p class="mb-0">Дело:</p>
 <select id="case-select" name="case" class="form-control mb-3">
+    <option></option>
 </select>
 
 <button id="create-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/Views/Hearing/Update.cshtml

@@ -24,6 +24,7 @@
     <input type="date" id="date-input" name="date" class="form-control mb-3" />
     <p class="mb-0">Дело:</p>
     <select id="case-select" name="case" class="form-control mb-3">
+        <option></option>
     </select>
 
     <button id="update-button" type="button" class="btn btn-primary text-button">

CaseAccounting/CaseAccountingProviderView/wwwroot/css/site.css

@@ -16,12 +16,3 @@ html {
 body {
   margin-bottom: 60px;
 }
-
-.scrollable-table {
-    max-height: 400px;
-    overflow-y: auto;
-}
-
-.scrollable-table tr {
-    transition: background-color 0.3s ease;
-}

CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-create.js

@@ -10,19 +10,19 @@ var specializations = [];
 
 window.addEventListener("load", async () => {
     try {
-        await $.ajax({
+        const specializationsResponse = await $.ajax({
-            url: `/case/getallspecializations`,
+            url: `/specialization/getall`,
             type: "GET",
             contentType: "json"
-        }).done((result) => {
+        });
-            specializations = result;
+        specializations = specializationsResponse;
-            specializations.forEach((specialization) => {
+
-                const option = document.createElement("option");
+        specializations.forEach((specialization) => {
-                option.value = specialization.id;
+            const option = document.createElement("option");
-                option.innerHTML = specialization.name;
+            option.value = specialization.id;
-                specializationSelect.appendChild(option);
+            option.innerHTML = specialization.name;
-                specializationSelect.selectedIndex = -1;
+            specializationSelect.appendChild(option);
-            });
+            specializationSelect.selectedIndex = -1;
         });
     } catch (error) {
         console.error(error);

CaseAccounting/CaseAccountingProviderView/wwwroot/js/case/case-update.js

@@ -11,19 +11,19 @@ var specializations = [];
 
 window.addEventListener("load", async () => {
     try {
-        await $.ajax({
+        const specializationsResponse = await $.ajax({
-            url: `/case/getallspecializations`,
+            url: `/specialization/getall`,
             type: "GET",
             contentType: "json"
-        }).done((result) => {
+        });
-            specializations = result;
+        specializations = specializationsResponse;
-            specializations.forEach((specialization) => {
+
-                const option = document.createElement("option");
+        specializations.forEach((specialization) => {
-                option.value = specialization.id;
+            const option = document.createElement("option");
-                option.innerHTML = specialization.name;
+            option.value = specialization.id;
-                specializationSelect.appendChild(option);
+            option.innerHTML = specialization.name;
-                specializationSelect.selectedIndex = -1;
+            specializationSelect.appendChild(option);
-            });
+            specializationSelect.selectedIndex = -1;
         });
     } catch (error) {
         console.error(error);

CaseAccounting/CaseAccountingProviderView/wwwroot/js/deal/deal-create.js

@@ -2,37 +2,6 @@
 const subjectInput = document.getElementById("subject-input");
 const responsibilitiesInput = document.getElementById("responsibilities-input");
 const dateInput = document.getElementById("date-input");
-const tbody = document.getElementById("scrollable-table__tbody")
-
-var cases = [];
-var dataArray = [];
-
-window.addEventListener("load", async () => {
-    try {
-        await $.ajax({
-            url: `/case/getallbyuser`,
-            type: "GET",
-            contentType: "json"
-        }).done((result) => {
-            cases = result;
-            cases.forEach((caseModel) => {
-                const { id, name, applicant, defendant, annotation, date, specialization } = caseModel;
-                const row = tbody.insertRow();
-                row.setAttribute("data-id", id);
-
-                const cells = [name, applicant, defendant, annotation, date, specialization];
-                cells.forEach((value) => {
-                    const cell = row.insertCell();
-                    cell.textContent = value;
-                });
-
-                row.addEventListener('click', () => addAndRemoveFromList(row));
-            });
-        });
-    } catch (error) {
-        console.error(error);
-    }
-});
 
 createBtn.addEventListener("click", () => {
     if (!correctData()) {
@@ -57,8 +26,7 @@ createBtn.addEventListener("click", () => {
     let dealModel = {
         "Subject": subjectInput.value,
         "Responsibilities": responsibilitiesInput.value,
-        "Date": new Date(dateInput.value),
+        "Date": new Date(dateInput.value)
-        "CaseViewModels": dataArray
     };
     console.log(dealModel)
     $.ajax({
@@ -70,17 +38,3 @@ createBtn.addEventListener("click", () => {
         window.location.href = "/Home/Deals";
     });
 });
-
-const addAndRemoveFromList = (row) => {
-    var id = parseInt(row.dataset.id);
-    console.log(cases.find(x => x.id === id))
-    var index = dataArray.indexOf(cases.find(x => x.id === id));
-    if (index === -1) {
-        dataArray.push(cases.find(x => x.id === id));
-        row.classList.add("bg-primary");
-    } else {
-        dataArray.splice(index, 1);
-        row.classList.remove("bg-primary");
-    }
-    console.log(dataArray);
-}

CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-create.js

@@ -7,19 +7,19 @@ var cases = [];
 
 window.addEventListener("load", async () => {
     try {
-        $.ajax({
+        const casesResponse = await $.ajax({
-            url: "/case/getallbyuser",
+            url: `/specialization/getall`,
             type: "GET",
             contentType: "json"
-        }).done((result) => {        
+        });
-            cases = result;
+        cases = casesResponse;
-            cases.forEach((element) => {
+
-                const option = document.createElement("option");
+        cases.forEach((element) => {
-                option.value = element.id;
+            const option = document.createElement("option");
-                option.innerHTML = "Дело №" + element.id;
+            option.value = element.id;
-                caseSelect.appendChild(option);
+            option.innerHTML = "Дело №" + element.id;
-                caseSelect.selectedIndex = -1;
+            caseSelect.appendChild(option);
-            });
+            caseSelect.selectedIndex = -1;
         });
     } catch (error) {
         console.error(error);
@@ -51,7 +51,7 @@ createBtn.addEventListener("click", () => {
         "CaseId": parseInt(caseSelect.value),
         "Date": new Date(dateInput.value)
     };
-    console.log(hearingModel)
+    console.log(dealModel)
     $.ajax({
         url: "/hearing/create",
         type: "POST",

CaseAccounting/CaseAccountingProviderView/wwwroot/js/hearing/hearing-update.js

@@ -8,19 +8,19 @@ var cases = [];
 
 window.addEventListener("load", async () => {
     try {
-        $.ajax({
+        const casesResponse = await $.ajax({
-            url: "/case/getallbyuser",
+            url: `/specialization/getall`,
             type: "GET",
             contentType: "json"
-        }).done((result) => {        
+        });
-            cases = result;
+        cases = casesResponse;
-            cases.forEach((element) => {
+
-                const option = document.createElement("option");
+        cases.forEach((element) => {
-                option.value = element.id;
+            const option = document.createElement("option");
-                option.innerHTML = "Дело №" + element.id;
+            option.value = element.id;
-                caseSelect.appendChild(option);
+            option.innerHTML = "Дело №" + element.id;
-                caseSelect.selectedIndex = -1;
+            caseSelect.appendChild(option);
-            });
+            caseSelect.selectedIndex = -1;
         });
     } catch (error) {
         console.error(error);

CaseAccounting/CaseAccountingRestApi/CaseAccountingRestApi.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -20,7 +19,6 @@
     <ProjectReference Include="..\CaseAccountingBusinessLogics\CaseAccountingBusinessLogic.csproj" />
     <ProjectReference Include="..\CaseAccountingContracts\CaseAccountingContracts.csproj" />
     <ProjectReference Include="..\CaseAccountingDataBaseImplement\CaseAccountingDataBaseImplement.csproj" />
-    <ProjectReference Include="..\CaseAccountingDataModels\CaseAccountingDataModels.csproj" />
   </ItemGroup>
 
 </Project>

CaseAccounting/CaseAccountingRestApi/Controllers/CaseController.cs

@@ -1,5 +1,4 @@
-using CaseAccountingBusinessLogic.BusinessLogics;
+using CaseAccountingContracts.BindingModels;
-using CaseAccountingContracts.BindingModels;
 using CaseAccountingContracts.BusinessLogicContracts;
 using CaseAccountingContracts.SearchModels;
 using CaseAccountingContracts.ViewModels;
@@ -12,12 +11,10 @@ namespace CaseAccountingRestApi.Controllers
 	public class CaseController : Controller
 	{
 		private readonly ICaseLogic _logic;
-		private readonly ISpecializationLogic _specializationLogic;
 		
-		public CaseController(ICaseLogic logic, ISpecializationLogic specializationLogic)
+		public CaseController(ICaseLogic logic)
 		{
 			_logic = logic;
-			_specializationLogic = specializationLogic;
 		}
 
 		[HttpGet]
@@ -46,19 +43,6 @@ namespace CaseAccountingRestApi.Controllers
 			}
 		}
 
-		[HttpGet]
-		public List<SpecializationViewModel>? GetAllSpecializations()
-		{
-			try
-			{
-				return _specializationLogic.ReadList(null);
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-
 		[HttpPost]
 		public void Create(CaseBindingModel model)
 		{

CaseAccounting/CaseAccountingRestApi/Controllers/SpecializationController.cs

@@ -44,6 +44,19 @@ namespace CaseAccountingRestApi.Controllers
             }
         }
 
+        [HttpGet]
+        public List<SpecializationViewModel>? GetAll()
+        {
+            try
+            {
+                return specializationLogic.ReadList(null);
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+        }
+
 
         [HttpPost]
         public void Create(SpecializationBindingModel model)

CaseAccounting/CaseAccountingRestApi/Program.cs

@@ -26,8 +26,6 @@ builder.Services.AddTransient<ILawyerLogic, LawyerLogic>();
 builder.Services.AddTransient<ISpecializationLogic, SpecializationLogic>();
 builder.Services.AddTransient<IUserLogic, UserLogic>();
 
-builder.Services.AddControllers().AddNewtonsoftJson();
-
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();