Index: Farmatiko/Startup.cs =================================================================== --- Farmatiko/Startup.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ Farmatiko/Startup.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.AspNetCore.SpaServices.AngularCli; using Microsoft.Extensions.Configuration; @@ -29,8 +30,5 @@ }); var connectionString = Configuration.GetSection("ConnectionStrings").GetValue("FarmatikoConnection"); - - services.AddEntityFrameworkNpgsql().AddDbContext(opt => { - opt.UseNpgsql(connectionString); - }); + services.AddEntityFrameworkNpgsql().AddDbContext(opt => opt.UseNpgsql(connectionString)); } Index: Farmatiko/appsettings.json =================================================================== --- Farmatiko/appsettings.json (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ Farmatiko/appsettings.json (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "FarmatikoConnection": "Host=localhost;User ID=postgres;Password=@@Postgres@@.;database=FarmatikoDb;Integrated Security=true; Pooling=true;" + "FarmatikoConnection": "User ID=postgres;Password=@@Farmatiko@@.;database=FarmatikoDb;Integrated Security=true; Pooling=true;" }, "Logging": { Index: rmatikoData/Base/BaseEntity.cs =================================================================== --- FarmatikoData/Base/BaseEntity.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ (revision ) @@ -1,13 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace FarmatikoData.Base -{ - public class BaseEntity - { - public int Id { get; set; } - public DateTime CreatedOn { get; set; } - public DateTime DeletedOn { get; set; } - } -} Index: rmatikoData/Migrations/20200720165322_Initial Migration.Designer.cs =================================================================== --- FarmatikoData/Migrations/20200720165322_Initial Migration.Designer.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ (revision ) @@ -1,337 +1,0 @@ -// -using System; -using FarmatikoData; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -namespace FarmatikoData.Migrations -{ - [DbContext(typeof(FarmatikoDataContext))] - [Migration("20200720165322_Initial Migration")] - partial class InitialMigration - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) - .HasAnnotation("ProductVersion", "3.1.6") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - modelBuilder.Entity("FarmatikoData.Models.HealthFacilities", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("Address") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Email") - .HasColumnType("text"); - - b.Property("Municipality") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Phone") - .HasColumnType("text"); - - b.Property("Type") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("HealthFacilities"); - }); - - modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("Branch") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("FacilityId") - .HasColumnType("integer"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Title") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("FacilityId"); - - b.ToTable("HealthcareWorkers"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Medicine", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Form") - .HasColumnType("text"); - - b.Property("Manufacturer") - .HasColumnType("text"); - - b.Property("MedicineListId") - .HasColumnType("integer"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Packaging") - .HasColumnType("text"); - - b.Property("Price") - .HasColumnType("real"); - - b.Property("Strength") - .HasColumnType("text"); - - b.Property("WayOfIssuing") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("MedicineListId"); - - b.ToTable("Medicines"); - }); - - modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("HasMedicine") - .HasColumnType("boolean"); - - b.Property("MedicineId") - .HasColumnType("integer"); - - b.Property("PharmacyHeadId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("MedicineId"); - - b.HasIndex("PharmacyHeadId"); - - b.ToTable("MedicineLists"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Pandemic", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("ActiveGlobal") - .HasColumnType("integer"); - - b.Property("ActiveMK") - .HasColumnType("integer"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeathsGlobal") - .HasColumnType("integer"); - - b.Property("DeathsMK") - .HasColumnType("integer"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("NewMK") - .HasColumnType("integer"); - - b.Property("TotalGlobal") - .HasColumnType("integer"); - - b.Property("TotalMK") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.ToTable("Pandemics"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("Address") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Location") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("PharmacyHeadId") - .HasColumnType("integer"); - - b.Property("WorkAllTime") - .HasColumnType("boolean"); - - b.HasKey("Id"); - - b.HasIndex("PharmacyHeadId"); - - b.ToTable("Pharmacies"); - }); - - modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Email") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Password") - .HasColumnType("text"); - - b.Property("PharmacyId") - .HasColumnType("integer"); - - b.Property("PharmacyMedicinesId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("PharmacyId"); - - b.HasIndex("PharmacyMedicinesId"); - - b.ToTable("PharmacyHeads"); - }); - - modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b => - { - b.HasOne("FarmatikoData.Models.HealthFacilities", "Facility") - .WithMany() - .HasForeignKey("FacilityId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("FarmatikoData.Models.Medicine", b => - { - b.HasOne("FarmatikoData.Models.MedicineList", null) - .WithMany("MedicinesList") - .HasForeignKey("MedicineListId"); - }); - - modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => - { - b.HasOne("FarmatikoData.Models.Medicine", "Medicine") - .WithMany() - .HasForeignKey("MedicineId"); - - b.HasOne("FarmatikoData.Models.PharmacyHead", null) - .WithMany("MedicineLists") - .HasForeignKey("PharmacyHeadId"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b => - { - b.HasOne("FarmatikoData.Models.PharmacyHead", null) - .WithMany("PharmaciesList") - .HasForeignKey("PharmacyHeadId"); - }); - - modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b => - { - b.HasOne("FarmatikoData.Models.Pharmacy", "Pharmacy") - .WithMany() - .HasForeignKey("PharmacyId"); - - b.HasOne("FarmatikoData.Models.MedicineList", "PharmacyMedicines") - .WithMany() - .HasForeignKey("PharmacyMedicinesId"); - }); -#pragma warning restore 612, 618 - } - } -} Index: rmatikoData/Migrations/20200720165322_Initial Migration.cs =================================================================== --- FarmatikoData/Migrations/20200720165322_Initial Migration.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ (revision ) @@ -1,268 +1,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -namespace FarmatikoData.Migrations -{ - public partial class InitialMigration : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "HealthFacilities", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - Name = table.Column(nullable: false), - Municipality = table.Column(nullable: false), - Address = table.Column(nullable: false), - Type = table.Column(nullable: false), - Email = table.Column(nullable: true), - Phone = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_HealthFacilities", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Pandemics", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - Name = table.Column(nullable: true), - TotalMK = table.Column(nullable: false), - ActiveMK = table.Column(nullable: false), - DeathsMK = table.Column(nullable: false), - NewMK = table.Column(nullable: false), - TotalGlobal = table.Column(nullable: false), - DeathsGlobal = table.Column(nullable: false), - ActiveGlobal = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Pandemics", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "HealthcareWorkers", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - Name = table.Column(nullable: false), - Branch = table.Column(nullable: false), - FacilityId = table.Column(nullable: false), - Title = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_HealthcareWorkers", x => x.Id); - table.ForeignKey( - name: "FK_HealthcareWorkers_HealthFacilities_FacilityId", - column: x => x.FacilityId, - principalTable: "HealthFacilities", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Medicines", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - Name = table.Column(nullable: true), - Strength = table.Column(nullable: true), - Form = table.Column(nullable: true), - WayOfIssuing = table.Column(nullable: true), - Manufacturer = table.Column(nullable: true), - Price = table.Column(nullable: false), - Packaging = table.Column(nullable: true), - MedicineListId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Medicines", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "PharmacyHeads", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - PharmacyMedicinesId = table.Column(nullable: true), - PharmacyId = table.Column(nullable: true), - Email = table.Column(nullable: true), - Name = table.Column(nullable: true), - Password = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_PharmacyHeads", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "MedicineLists", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - MedicineId = table.Column(nullable: true), - HasMedicine = table.Column(nullable: false), - PharmacyHeadId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_MedicineLists", x => x.Id); - table.ForeignKey( - name: "FK_MedicineLists_Medicines_MedicineId", - column: x => x.MedicineId, - principalTable: "Medicines", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - table.ForeignKey( - name: "FK_MedicineLists_PharmacyHeads_PharmacyHeadId", - column: x => x.PharmacyHeadId, - principalTable: "PharmacyHeads", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateTable( - name: "Pharmacies", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - CreatedOn = table.Column(nullable: false), - DeletedOn = table.Column(nullable: false), - Name = table.Column(nullable: false), - Location = table.Column(nullable: false), - Address = table.Column(nullable: false), - WorkAllTime = table.Column(nullable: false), - PharmacyHeadId = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Pharmacies", x => x.Id); - table.ForeignKey( - name: "FK_Pharmacies_PharmacyHeads_PharmacyHeadId", - column: x => x.PharmacyHeadId, - principalTable: "PharmacyHeads", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - }); - - migrationBuilder.CreateIndex( - name: "IX_HealthcareWorkers_FacilityId", - table: "HealthcareWorkers", - column: "FacilityId"); - - migrationBuilder.CreateIndex( - name: "IX_MedicineLists_MedicineId", - table: "MedicineLists", - column: "MedicineId"); - - migrationBuilder.CreateIndex( - name: "IX_MedicineLists_PharmacyHeadId", - table: "MedicineLists", - column: "PharmacyHeadId"); - - migrationBuilder.CreateIndex( - name: "IX_Medicines_MedicineListId", - table: "Medicines", - column: "MedicineListId"); - - migrationBuilder.CreateIndex( - name: "IX_Pharmacies_PharmacyHeadId", - table: "Pharmacies", - column: "PharmacyHeadId"); - - migrationBuilder.CreateIndex( - name: "IX_PharmacyHeads_PharmacyId", - table: "PharmacyHeads", - column: "PharmacyId"); - - migrationBuilder.CreateIndex( - name: "IX_PharmacyHeads_PharmacyMedicinesId", - table: "PharmacyHeads", - column: "PharmacyMedicinesId"); - - migrationBuilder.AddForeignKey( - name: "FK_Medicines_MedicineLists_MedicineListId", - table: "Medicines", - column: "MedicineListId", - principalTable: "MedicineLists", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_PharmacyHeads_MedicineLists_PharmacyMedicinesId", - table: "PharmacyHeads", - column: "PharmacyMedicinesId", - principalTable: "MedicineLists", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - - migrationBuilder.AddForeignKey( - name: "FK_PharmacyHeads_Pharmacies_PharmacyId", - table: "PharmacyHeads", - column: "PharmacyId", - principalTable: "Pharmacies", - principalColumn: "Id", - onDelete: ReferentialAction.Restrict); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_MedicineLists_Medicines_MedicineId", - table: "MedicineLists"); - - migrationBuilder.DropForeignKey( - name: "FK_MedicineLists_PharmacyHeads_PharmacyHeadId", - table: "MedicineLists"); - - migrationBuilder.DropForeignKey( - name: "FK_Pharmacies_PharmacyHeads_PharmacyHeadId", - table: "Pharmacies"); - - migrationBuilder.DropTable( - name: "HealthcareWorkers"); - - migrationBuilder.DropTable( - name: "Pandemics"); - - migrationBuilder.DropTable( - name: "HealthFacilities"); - - migrationBuilder.DropTable( - name: "Medicines"); - - migrationBuilder.DropTable( - name: "PharmacyHeads"); - - migrationBuilder.DropTable( - name: "Pharmacies"); - - migrationBuilder.DropTable( - name: "MedicineLists"); - } - } -} Index: rmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs =================================================================== --- FarmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ (revision ) @@ -1,335 +1,0 @@ -// -using System; -using FarmatikoData; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -namespace FarmatikoData.Migrations -{ - [DbContext(typeof(FarmatikoDataContext))] - partial class FarmatikoDataContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) - .HasAnnotation("ProductVersion", "3.1.6") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - modelBuilder.Entity("FarmatikoData.Models.HealthFacilities", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("Address") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Email") - .HasColumnType("text"); - - b.Property("Municipality") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Phone") - .HasColumnType("text"); - - b.Property("Type") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("HealthFacilities"); - }); - - modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("Branch") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("FacilityId") - .HasColumnType("integer"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Title") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("FacilityId"); - - b.ToTable("HealthcareWorkers"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Medicine", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Form") - .HasColumnType("text"); - - b.Property("Manufacturer") - .HasColumnType("text"); - - b.Property("MedicineListId") - .HasColumnType("integer"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Packaging") - .HasColumnType("text"); - - b.Property("Price") - .HasColumnType("real"); - - b.Property("Strength") - .HasColumnType("text"); - - b.Property("WayOfIssuing") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("MedicineListId"); - - b.ToTable("Medicines"); - }); - - modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("HasMedicine") - .HasColumnType("boolean"); - - b.Property("MedicineId") - .HasColumnType("integer"); - - b.Property("PharmacyHeadId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("MedicineId"); - - b.HasIndex("PharmacyHeadId"); - - b.ToTable("MedicineLists"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Pandemic", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("ActiveGlobal") - .HasColumnType("integer"); - - b.Property("ActiveMK") - .HasColumnType("integer"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeathsGlobal") - .HasColumnType("integer"); - - b.Property("DeathsMK") - .HasColumnType("integer"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("NewMK") - .HasColumnType("integer"); - - b.Property("TotalGlobal") - .HasColumnType("integer"); - - b.Property("TotalMK") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.ToTable("Pandemics"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("Address") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Location") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("PharmacyHeadId") - .HasColumnType("integer"); - - b.Property("WorkAllTime") - .HasColumnType("boolean"); - - b.HasKey("Id"); - - b.HasIndex("PharmacyHeadId"); - - b.ToTable("Pharmacies"); - }); - - modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer") - .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - - b.Property("CreatedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("DeletedOn") - .HasColumnType("timestamp without time zone"); - - b.Property("Email") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Password") - .HasColumnType("text"); - - b.Property("PharmacyId") - .HasColumnType("integer"); - - b.Property("PharmacyMedicinesId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("PharmacyId"); - - b.HasIndex("PharmacyMedicinesId"); - - b.ToTable("PharmacyHeads"); - }); - - modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b => - { - b.HasOne("FarmatikoData.Models.HealthFacilities", "Facility") - .WithMany() - .HasForeignKey("FacilityId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("FarmatikoData.Models.Medicine", b => - { - b.HasOne("FarmatikoData.Models.MedicineList", null) - .WithMany("MedicinesList") - .HasForeignKey("MedicineListId"); - }); - - modelBuilder.Entity("FarmatikoData.Models.MedicineList", b => - { - b.HasOne("FarmatikoData.Models.Medicine", "Medicine") - .WithMany() - .HasForeignKey("MedicineId"); - - b.HasOne("FarmatikoData.Models.PharmacyHead", null) - .WithMany("MedicineLists") - .HasForeignKey("PharmacyHeadId"); - }); - - modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b => - { - b.HasOne("FarmatikoData.Models.PharmacyHead", null) - .WithMany("PharmaciesList") - .HasForeignKey("PharmacyHeadId"); - }); - - modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b => - { - b.HasOne("FarmatikoData.Models.Pharmacy", "Pharmacy") - .WithMany() - .HasForeignKey("PharmacyId"); - - b.HasOne("FarmatikoData.Models.MedicineList", "PharmacyMedicines") - .WithMany() - .HasForeignKey("PharmacyMedicinesId"); - }); -#pragma warning restore 612, 618 - } - } -} Index: FarmatikoData/Models/HealthFacilities.cs =================================================================== --- FarmatikoData/Models/HealthFacilities.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/HealthFacilities.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -3,10 +3,9 @@ using System.ComponentModel.DataAnnotations; using System.Text; -using FarmatikoData.Base; using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models { - public class HealthFacilities : BaseEntity + public class HealthFacilities { public HealthFacilities() { } Index: FarmatikoData/Models/HealthcareWorkers.cs =================================================================== --- FarmatikoData/Models/HealthcareWorkers.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/HealthcareWorkers.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -3,10 +3,9 @@ using System.ComponentModel.DataAnnotations; using System.Text; -using FarmatikoData.Base; using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models { - public class HealthcareWorkers : BaseEntity + public class HealthcareWorkers { public HealthcareWorkers() { } Index: FarmatikoData/Models/Medicine.cs =================================================================== --- FarmatikoData/Models/Medicine.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/Medicine.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Text; -using FarmatikoData.Base; using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models { - public class Medicine : BaseEntity + public class Medicine { public Medicine() { } Index: FarmatikoData/Models/MedicineList.cs =================================================================== --- FarmatikoData/Models/MedicineList.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/MedicineList.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -1,4 +1,3 @@ using System.Collections.Generic; -using FarmatikoData.Base; using FarmatikoData.Models; using Microsoft.EntityFrameworkCore; @@ -6,7 +5,7 @@ namespace FarmatikoData.Models { - public class MedicineList : BaseEntity + public class MedicineList { - public Medicine Medicine { get; set; } + public Medicine Medicines { get; set; } public bool HasMedicine { get; set; } public ICollection MedicinesList { get; set; } Index: FarmatikoData/Models/Pandemic.cs =================================================================== --- FarmatikoData/Models/Pandemic.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/Pandemic.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Text; -using FarmatikoData.Base; using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models { - public class Pandemic : BaseEntity + public class Pandemic { public Pandemic() { } Index: FarmatikoData/Models/Pharmacy.cs =================================================================== --- FarmatikoData/Models/Pharmacy.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/Pharmacy.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -1,19 +1,14 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using System.Text; -using FarmatikoData.Base; using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models { - public class Pharmacy : BaseEntity + public class Pharmacy { public Pharmacy() { } - [Required] public string Name { get; set; } - [Required] public string Location { get; set; } - [Required] public string Address { get; set; } public bool WorkAllTime { get; set; } Index: FarmatikoData/Models/PharmacyHead.cs =================================================================== --- FarmatikoData/Models/PharmacyHead.cs (revision 0c48bbb15c709978f24de20eba18e85b11b413f0) +++ FarmatikoData/Models/PharmacyHead.cs (revision 92a1f414076288b31a650f1874ee627ded338094) @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Text; -using FarmatikoData.Base; using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models { - public class PharmacyHead : BaseEntity + public class PharmacyHead { public MedicineList PharmacyMedicines { get; set; }