diff --git a/src/MapsDb/Models/Region.cs b/src/MapsDb/Models/Region.cs index 0dbc9b0..8e9f121 100644 --- a/src/MapsDb/Models/Region.cs +++ b/src/MapsDb/Models/Region.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace MapsDb.Models { - public partial class Region + public partial class Region { public Region() { @@ -13,6 +13,7 @@ namespace MapsDb.Models RoadPassport = new HashSet(); RoadService = new HashSet(); RoadSurface = new HashSet(); + RoadToCategory = new HashSet(); RoadWidth = new HashSet(); ServiceObject = new HashSet(); SettlementAddressLink = new HashSet(); @@ -28,6 +29,7 @@ namespace MapsDb.Models public virtual ICollection RoadPassport { get; set; } public virtual ICollection RoadService { get; set; } public virtual ICollection RoadSurface { get; set; } + public virtual ICollection RoadToCategory { get; set; } public virtual ICollection RoadWidth { get; set; } public virtual ICollection ServiceObject { get; set; } public virtual ICollection SettlementAddressLink { get; set; } diff --git a/src/MapsDb/Models/Road.cs b/src/MapsDb/Models/Road.cs index ec71a82..a37b481 100644 --- a/src/MapsDb/Models/Road.cs +++ b/src/MapsDb/Models/Road.cs @@ -13,6 +13,7 @@ namespace MapsDb.Models RoadPassport = new HashSet(); RoadService = new HashSet(); RoadSurface = new HashSet(); + RoadToCategory = new HashSet(); RoadWidth = new HashSet(); ServiceObject = new HashSet(); SettlementAddressLink = new HashSet(); @@ -37,6 +38,7 @@ namespace MapsDb.Models public virtual ICollection RoadPassport { get; set; } public virtual ICollection RoadService { get; set; } public virtual ICollection RoadSurface { get; set; } + public virtual ICollection RoadToCategory { get; set; } public virtual ICollection RoadWidth { get; set; } public virtual ICollection ServiceObject { get; set; } public virtual ICollection SettlementAddressLink { get; set; } diff --git a/src/MapsDb/Models/RoadCategory.cs b/src/MapsDb/Models/RoadCategory.cs index 6219103..0ae9e71 100644 --- a/src/MapsDb/Models/RoadCategory.cs +++ b/src/MapsDb/Models/RoadCategory.cs @@ -5,7 +5,14 @@ namespace MapsDb.Models { public partial class RoadCategory { + public RoadCategory() + { + RoadToCategory = new HashSet(); + } + public int RoadCategoryId { get; set; } public string Value { get; set; } + + public virtual ICollection RoadToCategory { get; set; } } } diff --git a/src/MapsDb/Models/RoadToCategory.cs b/src/MapsDb/Models/RoadToCategory.cs new file mode 100644 index 0000000..0eb3d7d --- /dev/null +++ b/src/MapsDb/Models/RoadToCategory.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; + +namespace MapsDb.Models +{ + public partial class RoadToCategory + { + public int Id { get; set; } + public int? RegionId { get; set; } + public int? RoadId { get; set; } + public double? Begin { get; set; } + public double? End { get; set; } + public double? Distance { get; set; } + public int? RoadCategoryId { get; set; } + + public virtual Region Region { get; set; } + public virtual RoadCategory RoadCategory { get; set; } + public virtual Road Road { get; set; } + } +} diff --git a/src/MapsDb/PostgresDbContext.cs b/src/MapsDb/PostgresDbContext.cs index 4edb530..a280741 100644 --- a/src/MapsDb/PostgresDbContext.cs +++ b/src/MapsDb/PostgresDbContext.cs @@ -6,6 +6,30 @@ namespace MapsDb { public partial class PostgresDbContext : DbContext { + public virtual DbSet BusStop { get; set; } + public virtual DbSet CrossSection { get; set; } + public virtual DbSet DepartmentAffiliation { get; set; } + public virtual DbSet FlowIntensity { get; set; } + public virtual DbSet Organization { get; set; } + public virtual DbSet Region { get; set; } + public virtual DbSet Road { get; set; } + public virtual DbSet RoadCategory { get; set; } + public virtual DbSet RoadDirection { get; set; } + public virtual DbSet RoadPassport { get; set; } + public virtual DbSet RoadService { get; set; } + public virtual DbSet RoadSurface { get; set; } + public virtual DbSet RoadToCategory { get; set; } + public virtual DbSet RoadType { get; set; } + public virtual DbSet RoadWidth { get; set; } + public virtual DbSet ServiceObject { get; set; } + public virtual DbSet ServiceObjectType { get; set; } + public virtual DbSet Settlement { get; set; } + public virtual DbSet SettlementAddressLink { get; set; } + public virtual DbSet SettlementLocation { get; set; } + public virtual DbSet StateCommon { get; set; } + public virtual DbSet SurfaceTreatment { get; set; } + public virtual DbSet SurfaceType { get; set; } + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { #warning To protect potentially sensitive information in your connection string, you should move it out of source code. See http://go.microsoft.com/fwlink/?LinkId=723263 for guidance on storing connection strings. @@ -18,7 +42,9 @@ namespace MapsDb { entity.ToTable("bus_stop"); - entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Id) + .HasColumnName("id") + .HasDefaultValueSql("nextval('bus_stop_bus_stop_id_seq'::regclass)"); entity.Property(e => e.AreaLandAvailability).HasColumnName("area_land_availability"); @@ -99,7 +125,9 @@ namespace MapsDb { entity.ToTable("cross_section"); - entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Id) + .HasColumnName("id") + .HasDefaultValueSql("nextval('cross_section_cross_section_id_seq'::regclass)"); entity.Property(e => e.Angle).HasColumnName("angle"); @@ -436,7 +464,9 @@ namespace MapsDb { entity.ToTable("road_surface"); - entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Id) + .HasColumnName("id") + .HasDefaultValueSql("nextval('road_surface_road_surface_id_seq'::regclass)"); entity.Property(e => e.Begin).HasColumnName("begin"); @@ -504,6 +534,45 @@ namespace MapsDb .HasConstraintName("road_surface_surface_type_id_fkey"); }); + modelBuilder.Entity(entity => + { + entity.ToTable("road_to_category"); + + entity.Property(e => e.Id) + .HasColumnName("id") + .HasDefaultValueSql("nextval('road_to_category_road_to_category_id_seq'::regclass)"); + + entity.Property(e => e.Begin).HasColumnName("begin"); + + entity.Property(e => e.Distance).HasColumnName("distance"); + + entity.Property(e => e.End).HasColumnName("end"); + + entity.Property(e => e.RegionId).HasColumnName("region_id"); + + entity.Property(e => e.RoadCategoryId).HasColumnName("road_category_id"); + + entity.Property(e => e.RoadId).HasColumnName("road_id"); + + entity.HasOne(d => d.Region) + .WithMany(p => p.RoadToCategory) + .HasForeignKey(d => d.RegionId) + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("road_to_category_region_id_fkey"); + + entity.HasOne(d => d.RoadCategory) + .WithMany(p => p.RoadToCategory) + .HasForeignKey(d => d.RoadCategoryId) + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("road_to_category_road_category_id_fkey"); + + entity.HasOne(d => d.Road) + .WithMany(p => p.RoadToCategory) + .HasForeignKey(d => d.RoadId) + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("road_to_category_road_id_fkey"); + }); + modelBuilder.Entity(entity => { entity.ToTable("road_type"); @@ -525,7 +594,9 @@ namespace MapsDb { entity.ToTable("road_width"); - entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Id) + .HasColumnName("id") + .HasDefaultValueSql("nextval('road_width_road_width_id_seq'::regclass)"); entity.Property(e => e.Begin).HasColumnName("begin"); @@ -566,7 +637,9 @@ namespace MapsDb { entity.ToTable("service_object"); - entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Id) + .HasColumnName("id") + .HasDefaultValueSql("nextval('service_object_service_object_id_seq'::regclass)"); entity.Property(e => e.ArrangementElements).HasColumnName("arrangement_elements"); @@ -744,29 +817,18 @@ namespace MapsDb .HasColumnType("varchar") .HasMaxLength(255); }); - } - public virtual DbSet BusStop { get; set; } - public virtual DbSet CrossSection { get; set; } - public virtual DbSet DepartmentAffiliation { get; set; } - public virtual DbSet FlowIntensity { get; set; } - public virtual DbSet Organization { get; set; } - public virtual DbSet Region { get; set; } - public virtual DbSet Road { get; set; } - public virtual DbSet RoadCategory { get; set; } - public virtual DbSet RoadDirection { get; set; } - public virtual DbSet RoadPassport { get; set; } - public virtual DbSet RoadService { get; set; } - public virtual DbSet RoadSurface { get; set; } - public virtual DbSet RoadType { get; set; } - public virtual DbSet RoadWidth { get; set; } - public virtual DbSet ServiceObject { get; set; } - public virtual DbSet ServiceObjectType { get; set; } - public virtual DbSet Settlement { get; set; } - public virtual DbSet SettlementAddressLink { get; set; } - public virtual DbSet SettlementLocation { get; set; } - public virtual DbSet StateCommon { get; set; } - public virtual DbSet SurfaceTreatment { get; set; } - public virtual DbSet SurfaceType { get; set; } + modelBuilder.HasSequence("bus_stop_bus_stop_id_seq"); + + modelBuilder.HasSequence("cross_section_cross_section_id_seq"); + + modelBuilder.HasSequence("road_surface_road_surface_id_seq"); + + modelBuilder.HasSequence("road_to_category_road_to_category_id_seq"); + + modelBuilder.HasSequence("road_width_road_width_id_seq"); + + modelBuilder.HasSequence("service_object_service_object_id_seq"); + } } } \ No newline at end of file diff --git a/src/MapsModels/DsModels/PaginationDsM.cs b/src/MapsModels/DsModels/PaginationDsM.cs index 894db43..0e7a51c 100644 --- a/src/MapsModels/DsModels/PaginationDsM.cs +++ b/src/MapsModels/DsModels/PaginationDsM.cs @@ -7,6 +7,7 @@ namespace MapsModels.DsModels public int from { get; set; } public int per_page; public string sort { get; set; } + public string filter {get; set;} public int perPage{ get{ if(per_page == 0){ -- libgit2 0.21.4