diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index deee8883..62c3d27a 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -41,7 +41,7 @@ namespace AsbCloudDb.Model public virtual DbSet DrillFlowChart { get; set; } public virtual DbSet RelationUserUserRoles { get; set; } public virtual DbSet Permissions { get; set; } - public virtual DbSet PermissionInfos { get; set; } + public virtual DbSet RelationUserRolePermissions { get; set; } //var options = new DbContextOptionsBuilder() // .UseNpgsql("Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True") @@ -217,12 +217,6 @@ namespace AsbCloudDb.Model modelBuilder.Entity(entity => { - // entity.HasOne(d => d.Well) - // .WithOne(p => p.) - // .HasForeignKey(d => d.IdTelemetry) - // .OnDelete(DeleteBehavior.SetNull) - // .HasConstraintName("t_well_t_telemetry_id_fk"); - entity.HasOne(r => r.WellSectionType) .WithMany(w => w.DrillParamsCollection) .HasForeignKey(r => r.IdWellSectionType) @@ -257,6 +251,14 @@ namespace AsbCloudDb.Model modelBuilder.Entity(entity => { entity.HasKey(e => new { e.IdUserRole, e.IdPermission }); + + entity.HasOne(r => r.Permission) + .WithMany(p => p.RelationUserRolePermissions) + .IsRequired(); + + entity.HasOne(r => r.UserRole) + .WithMany(r => r.RelationUserRolePermissions) + .IsRequired(); }); FillData(modelBuilder); diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index d1eb565e..2fbebbbe 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -38,7 +38,7 @@ namespace AsbCloudDb.Model DbSet DrillFlowChart { get; set; } DbSet RelationUserUserRoles { get; set; } DbSet Permissions { get; set; } - DbSet PermissionInfos { get; set; } + DbSet RelationUserRolePermissions { get; set; } DatabaseFacade Database { get; }