diff --git a/RentACar/Data/Data.csproj b/RentACar/Data/Data.csproj index ddabf93..19b3578 100644 --- a/RentACar/Data/Data.csproj +++ b/RentACar/Data/Data.csproj @@ -5,6 +5,8 @@ + + diff --git a/RentACar/Data/Entities/User.cs b/RentACar/Data/Entities/User.cs index 5cbab1b..3c72153 100644 --- a/RentACar/Data/Entities/User.cs +++ b/RentACar/Data/Entities/User.cs @@ -25,7 +25,7 @@ namespace Data.Entities public string LastName { get; set; } - public int PersonalNumber { get; set; } + public string PersonalNumber { get; set; } public override string PhoneNumber { get; set; } diff --git a/RentACar/Data/RentACarDbContext.cs b/RentACar/Data/RentACarDbContext.cs index 57caa0a..70a8e38 100644 --- a/RentACar/Data/RentACarDbContext.cs +++ b/RentACar/Data/RentACarDbContext.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore; namespace Data { - public class RentACarDbContext : IdentityDbContext + public class RentACarDbContext : DbContext { public virtual DbSet Users { get; set; } public virtual DbSet Cars { get; set; } @@ -39,7 +39,7 @@ namespace Data Password = "user", FirstName = "User", LastName = "User", - PersonalNumber = 0987654321, + PersonalNumber = "0987654321", PhoneNumber = "0882750588", Email = "user@gmail.org", Role = User.RoleEnum.User @@ -52,12 +52,17 @@ namespace Data Password = "manager", FirstName = "Manager", LastName = "Manager", - PersonalNumber = 0987654321, + PersonalNumber = "0987654321", PhoneNumber = "0882750588", Email = "manager@gmail.org", Role = User.RoleEnum.Manager } ); + modelBuilder.Entity() + .HasIndex(user => new { user.Username, user.Password }) + .IsUnique(true); + modelBuilder.Entity().HasOne(u => u.User).WithMany().HasForeignKey(p => p.User); + modelBuilder.Entity().HasOne(c => c.Car).WithMany().HasForeignKey(c => c.Car); } } diff --git a/RentACar/WebApp/WebApp.csproj b/RentACar/WebApp/WebApp.csproj index ad00adc..c9c8900 100644 --- a/RentACar/WebApp/WebApp.csproj +++ b/RentACar/WebApp/WebApp.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/RentACar/WebApp/bin/Debug/net5.0/Newtonsoft.Json.dll b/RentACar/WebApp/bin/Debug/net5.0/Newtonsoft.Json.dll index d6e3d9d..e2118f9 100644 Binary files a/RentACar/WebApp/bin/Debug/net5.0/Newtonsoft.Json.dll and b/RentACar/WebApp/bin/Debug/net5.0/Newtonsoft.Json.dll differ