diff --git a/VeterinaryClinic/VeterinaryClinic/VeterinaryClinic.csproj b/VeterinaryClinic/VeterinaryClinic/VeterinaryClinic.csproj index c78c9c7..c521d9d 100644 --- a/VeterinaryClinic/VeterinaryClinic/VeterinaryClinic.csproj +++ b/VeterinaryClinic/VeterinaryClinic/VeterinaryClinic.csproj @@ -6,4 +6,15 @@ enable + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/VeterinaryClinicBusinessLogic/BusinessLogics/MedicationLogic.cs b/VeterinaryClinicBusinessLogic/BusinessLogics/MedicationLogic.cs index be5f1fe..d37882b 100644 --- a/VeterinaryClinicBusinessLogic/BusinessLogics/MedicationLogic.cs +++ b/VeterinaryClinicBusinessLogic/BusinessLogics/MedicationLogic.cs @@ -89,12 +89,12 @@ namespace VeterinaryClinicBusinessLogic.BusinessLogics } if (string.IsNullOrEmpty(model.MedicationName)) { - throw new ArgumentNullException("Нет названия компонента", + throw new ArgumentNullException("Нет названия Медикамента", nameof(model.MedicationName)); } if (model.Cost <= 0) { - throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); + throw new ArgumentNullException("Цена Медикамента должна быть больше 0", nameof(model.Cost)); } _logger.LogInformation("Medication. MedicationName:{MedicationName}. Cost:{ Cost}. Id: { Id}", model.MedicationName, model.Cost, model.Id); var element = _MedicationStorage.GetElement(new MedicationSearchModel @@ -103,7 +103,7 @@ namespace VeterinaryClinicBusinessLogic.BusinessLogics }); if (element != null && element.Id != model.Id) { - throw new InvalidOperationException("Компонент с таким названием уже есть"); + throw new InvalidOperationException("Медикамент с таким названием уже есть"); } } } diff --git a/VeterinaryClinicBusinessLogic/BusinessLogics/MedicineLogic.cs b/VeterinaryClinicBusinessLogic/BusinessLogics/MedicineLogic.cs index bb6ca6b..7d799a5 100644 --- a/VeterinaryClinicBusinessLogic/BusinessLogics/MedicineLogic.cs +++ b/VeterinaryClinicBusinessLogic/BusinessLogics/MedicineLogic.cs @@ -97,7 +97,7 @@ namespace VeterinaryClinicBusinessLogic.BusinessLogics } if (string.IsNullOrEmpty(model.MedicineName)) { - throw new ArgumentNullException("Нет названия компонента", + throw new ArgumentNullException("Нет названия Медикамента", nameof(model.MedicineName)); } if (model.Price <= 0) diff --git a/VeterinaryClinicBusinessLogic/VeterinaryClinicBusinessLogic.csproj b/VeterinaryClinicBusinessLogic/VeterinaryClinicBusinessLogic.csproj index b316ab2..3f3297b 100644 --- a/VeterinaryClinicBusinessLogic/VeterinaryClinicBusinessLogic.csproj +++ b/VeterinaryClinicBusinessLogic/VeterinaryClinicBusinessLogic.csproj @@ -8,6 +8,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/VeterinaryClinicContracts/ViewModels/ClientViewModel.cs b/VeterinaryClinicContracts/ViewModels/ClientViewModel.cs index 82a6cb3..3e49ba3 100644 --- a/VeterinaryClinicContracts/ViewModels/ClientViewModel.cs +++ b/VeterinaryClinicContracts/ViewModels/ClientViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.MedicationModel; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/VeterinaryClinicContracts/ViewModels/MedicationViewModel.cs b/VeterinaryClinicContracts/ViewModels/MedicationViewModel.cs index bdc500e..0083c0b 100644 --- a/VeterinaryClinicContracts/ViewModels/MedicationViewModel.cs +++ b/VeterinaryClinicContracts/ViewModels/MedicationViewModel.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using System.MedicationModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.ComponentModel; using VeterinaryClinicDataModels.Models; namespace VeterinaryClinicContracts.ViewModels @@ -11,7 +11,7 @@ namespace VeterinaryClinicContracts.ViewModels public class MedicationViewModel : IMedicationModel { public int Id { get; set; } - [DisplayName("Название компонента")] + [DisplayName("Название Медикамента")] public string MedicationName { get; set; } = string.Empty; [DisplayName("Цена")] public double Cost { get; set; } diff --git a/VeterinaryClinicContracts/ViewModels/MedicineViewModel.cs b/VeterinaryClinicContracts/ViewModels/MedicineViewModel.cs index 64d2e89..a33e65f 100644 --- a/VeterinaryClinicContracts/ViewModels/MedicineViewModel.cs +++ b/VeterinaryClinicContracts/ViewModels/MedicineViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.MedicationModel; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/VeterinaryClinicContracts/ViewModels/OrderViewModel.cs b/VeterinaryClinicContracts/ViewModels/OrderViewModel.cs index 4e1f68b..390e0d3 100644 --- a/VeterinaryClinicContracts/ViewModels/OrderViewModel.cs +++ b/VeterinaryClinicContracts/ViewModels/OrderViewModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.MedicationModel; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/VeterinaryClinicDatabaseImplement/Implements/MedicationStorage.cs b/VeterinaryClinicDatabaseImplement/Implements/MedicationStorage.cs index a54ead3..54ad46d 100644 --- a/VeterinaryClinicDatabaseImplement/Implements/MedicationStorage.cs +++ b/VeterinaryClinicDatabaseImplement/Implements/MedicationStorage.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.MedicationModel; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -77,7 +77,7 @@ namespace VeterinaryClinicDatabaseImplement.Implements public MedicationViewModel? Update(MedicationBindingModel model) { - using var context = new Database(); + using var context = new VeterinaryClinicDatabase(); var Medication = context.Medications.FirstOrDefault(x => x.Id == model.Id); if (Medication == null) diff --git a/VeterinaryClinicDatabaseImplement/Migrations/20230407123105_InitialCreate.Designer.cs b/VeterinaryClinicDatabaseImplement/Migrations/20230407123105_InitialCreate.Designer.cs new file mode 100644 index 0000000..8046bb1 --- /dev/null +++ b/VeterinaryClinicDatabaseImplement/Migrations/20230407123105_InitialCreate.Designer.cs @@ -0,0 +1,214 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using VeterinaryClinicDatabaseImplement; + +#nullable disable + +namespace VeterinaryClinicDatabaseImplement.Migrations +{ + [DbContext(typeof(VeterinaryClinicDatabase))] + [Migration("20230407123105_InitialCreate")] + partial class InitialCreate + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.4") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("text"); + + b.Property("Email") + .IsRequired() + .HasColumnType("text"); + + b.Property("Password") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Cost") + .HasColumnType("double precision"); + + b.Property("MedicationName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Medications"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medicine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("MedicineName") + .IsRequired() + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.ToTable("Medicines"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.MedicineMedication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("MedicationId") + .HasColumnType("integer"); + + b.Property("MedicineId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("MedicationId"); + + b.HasIndex("MedicineId"); + + b.ToTable("MedicineMedications"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("DateCreate") + .HasColumnType("timestamp with time zone"); + + b.Property("DateImplement") + .HasColumnType("timestamp with time zone"); + + b.Property("MedicineId") + .HasColumnType("integer"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("Sum") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("MedicineId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.MedicineMedication", b => + { + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Medication", "Medication") + .WithMany("MedicineMedications") + .HasForeignKey("MedicationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Medicine", "Medicine") + .WithMany("Medications") + .HasForeignKey("MedicineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Medication"); + + b.Navigation("Medicine"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Order", b => + { + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Medicine", "Medicine") + .WithMany("Orders") + .HasForeignKey("MedicineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Medicine"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Client", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medication", b => + { + b.Navigation("MedicineMedications"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medicine", b => + { + b.Navigation("Medications"); + + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/VeterinaryClinicDatabaseImplement/Migrations/20230407123105_InitialCreate.cs b/VeterinaryClinicDatabaseImplement/Migrations/20230407123105_InitialCreate.cs new file mode 100644 index 0000000..cec3181 --- /dev/null +++ b/VeterinaryClinicDatabaseImplement/Migrations/20230407123105_InitialCreate.cs @@ -0,0 +1,156 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace VeterinaryClinicDatabaseImplement.Migrations +{ + /// + public partial class InitialCreate : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Clients", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + ClientFIO = table.Column(type: "text", nullable: false), + Email = table.Column(type: "text", nullable: false), + Password = table.Column(type: "text", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Clients", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Medications", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + MedicationName = table.Column(type: "text", nullable: false), + Cost = table.Column(type: "double precision", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Medications", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Medicines", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + MedicineName = table.Column(type: "text", nullable: false), + Price = table.Column(type: "double precision", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Medicines", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "MedicineMedications", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + MedicineId = table.Column(type: "integer", nullable: false), + MedicationId = table.Column(type: "integer", nullable: false), + Count = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_MedicineMedications", x => x.Id); + table.ForeignKey( + name: "FK_MedicineMedications_Medications_MedicationId", + column: x => x.MedicationId, + principalTable: "Medications", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_MedicineMedications_Medicines_MedicineId", + column: x => x.MedicineId, + principalTable: "Medicines", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Orders", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + MedicineId = table.Column(type: "integer", nullable: false), + ClientId = table.Column(type: "integer", nullable: false), + Count = table.Column(type: "integer", nullable: false), + Sum = table.Column(type: "double precision", nullable: false), + Status = table.Column(type: "integer", nullable: false), + DateCreate = table.Column(type: "timestamp with time zone", nullable: false), + DateImplement = table.Column(type: "timestamp with time zone", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Orders", x => x.Id); + table.ForeignKey( + name: "FK_Orders_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Orders_Medicines_MedicineId", + column: x => x.MedicineId, + principalTable: "Medicines", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_MedicineMedications_MedicationId", + table: "MedicineMedications", + column: "MedicationId"); + + migrationBuilder.CreateIndex( + name: "IX_MedicineMedications_MedicineId", + table: "MedicineMedications", + column: "MedicineId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ClientId", + table: "Orders", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_MedicineId", + table: "Orders", + column: "MedicineId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "MedicineMedications"); + + migrationBuilder.DropTable( + name: "Orders"); + + migrationBuilder.DropTable( + name: "Medications"); + + migrationBuilder.DropTable( + name: "Clients"); + + migrationBuilder.DropTable( + name: "Medicines"); + } + } +} diff --git a/VeterinaryClinicDatabaseImplement/Migrations/VeterinaryClinicDatabaseModelSnapshot.cs b/VeterinaryClinicDatabaseImplement/Migrations/VeterinaryClinicDatabaseModelSnapshot.cs new file mode 100644 index 0000000..6e2c860 --- /dev/null +++ b/VeterinaryClinicDatabaseImplement/Migrations/VeterinaryClinicDatabaseModelSnapshot.cs @@ -0,0 +1,211 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using VeterinaryClinicDatabaseImplement; + +#nullable disable + +namespace VeterinaryClinicDatabaseImplement.Migrations +{ + [DbContext(typeof(VeterinaryClinicDatabase))] + partial class VeterinaryClinicDatabaseModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.4") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("text"); + + b.Property("Email") + .IsRequired() + .HasColumnType("text"); + + b.Property("Password") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Cost") + .HasColumnType("double precision"); + + b.Property("MedicationName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Medications"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medicine", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("MedicineName") + .IsRequired() + .HasColumnType("text"); + + b.Property("Price") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.ToTable("Medicines"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.MedicineMedication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("MedicationId") + .HasColumnType("integer"); + + b.Property("MedicineId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("MedicationId"); + + b.HasIndex("MedicineId"); + + b.ToTable("MedicineMedications"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClientId") + .HasColumnType("integer"); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("DateCreate") + .HasColumnType("timestamp with time zone"); + + b.Property("DateImplement") + .HasColumnType("timestamp with time zone"); + + b.Property("MedicineId") + .HasColumnType("integer"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("Sum") + .HasColumnType("double precision"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.HasIndex("MedicineId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.MedicineMedication", b => + { + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Medication", "Medication") + .WithMany("MedicineMedications") + .HasForeignKey("MedicationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Medicine", "Medicine") + .WithMany("Medications") + .HasForeignKey("MedicineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Medication"); + + b.Navigation("Medicine"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Order", b => + { + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("VeterinaryClinicDatabaseImplement.Models.Medicine", "Medicine") + .WithMany("Orders") + .HasForeignKey("MedicineId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Client"); + + b.Navigation("Medicine"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Client", b => + { + b.Navigation("Orders"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medication", b => + { + b.Navigation("MedicineMedications"); + }); + + modelBuilder.Entity("VeterinaryClinicDatabaseImplement.Models.Medicine", b => + { + b.Navigation("Medications"); + + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/VeterinaryClinicDatabaseImplement/Models/Client.cs b/VeterinaryClinicDatabaseImplement/Models/Client.cs index d1027ef..a9f6887 100644 --- a/VeterinaryClinicDatabaseImplement/Models/Client.cs +++ b/VeterinaryClinicDatabaseImplement/Models/Client.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; -using System.MedicationModel.DataAnnotations; -using System.MedicationModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; using VeterinaryClinicContracts.BindingModels; -using VeterinaryClinicContracts.BusinessLogicsContracts; using VeterinaryClinicContracts.ViewModels; using VeterinaryClinicDataModels.Models; diff --git a/VeterinaryClinicDatabaseImplement/Models/Medication.cs b/VeterinaryClinicDatabaseImplement/Models/Medication.cs index a7176ad..1331707 100644 --- a/VeterinaryClinicDatabaseImplement/Models/Medication.cs +++ b/VeterinaryClinicDatabaseImplement/Models/Medication.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.MedicationModel.DataAnnotations; -using System.MedicationModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/VeterinaryClinicDatabaseImplement/Models/Medicine.cs b/VeterinaryClinicDatabaseImplement/Models/Medicine.cs index 1ec644f..0843a56 100644 --- a/VeterinaryClinicDatabaseImplement/Models/Medicine.cs +++ b/VeterinaryClinicDatabaseImplement/Models/Medicine.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.MedicationModel.DataAnnotations; -using System.MedicationModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/VeterinaryClinicDatabaseImplement/Models/MedicineMedication.cs b/VeterinaryClinicDatabaseImplement/Models/MedicineMedication.cs index 2ead705..4961701 100644 --- a/VeterinaryClinicDatabaseImplement/Models/MedicineMedication.cs +++ b/VeterinaryClinicDatabaseImplement/Models/MedicineMedication.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.MedicationModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/VeterinaryClinicDatabaseImplement/Models/Order.cs b/VeterinaryClinicDatabaseImplement/Models/Order.cs index f52ed14..7405c25 100644 --- a/VeterinaryClinicDatabaseImplement/Models/Order.cs +++ b/VeterinaryClinicDatabaseImplement/Models/Order.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.MedicationModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; using System.Text; diff --git a/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabase.cs b/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabase.cs index f3caa86..ecc06a5 100644 --- a/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabase.cs +++ b/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabase.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; -using System.MedicationModel; using System.Linq; using System.Reflection; using System.Text; @@ -16,7 +15,7 @@ namespace VeterinaryClinicDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-H1JDV6E5\MSSQLSERVER01;Initial Catalog=VeterinaryClinicDatabase;Integrated Security=True;MultipleActiveResultSets=True;TrustServerCertificate=True"); + optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=VeterinaryClinicDatabaseFull;Username=postgres;Password=1953"); } base.OnConfiguring(optionsBuilder); } diff --git a/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabaseImplement.csproj b/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabaseImplement.csproj index b1a078c..de7aacf 100644 --- a/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabaseImplement.csproj +++ b/VeterinaryClinicDatabaseImplement/VeterinaryClinicDatabaseImplement.csproj @@ -12,6 +12,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive +