Some rework on the ServiceViewer (which will be repurposed for live multi-GTFS serving)

1 files changed, 257 insertions, 108 deletions

diff --git a/src/Costasdev.Busurbano.ServiceViewer/Data/Migrations/AppDbContextModelSnapshot.cs b/src/Costasdev.Busurbano.ServiceViewer/Data/Migrations/AppDbContextModelSnapshot.cs
index a77ecf5..feb3813 100644
--- a/src/Costasdev.Busurbano.ServiceViewer/Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/src/Costasdev.Busurbano.ServiceViewer/Data/Migrations/AppDbContextModelSnapshot.cs
@@ -1,15 +1,15 @@
 // <auto-generated />
 using System;
-using Costasdev.Busurbano.Database;
-using Costasdev.ServiceViewer;
 using Costasdev.ServiceViewer.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NetTopologySuite.Geometries;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 #nullable disable
 
-namespace Costasdev.Busurbano.Database.Migrations
+namespace Data.Migrations
 {
     [DbContext(typeof(AppDbContext))]
     partial class AppDbContextModelSnapshot : ModelSnapshot
@@ -18,81 +18,130 @@ namespace Costasdev.Busurbano.Database.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.8")
-                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+                .HasAnnotation("ProductVersion", "10.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Agency", b =>
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "postgis");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.Feed", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("DownloadUrl")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("Etag")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<DateTime>("InsertedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("LongName")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ShortName")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("feeds");
+                });
+
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsAgency", b =>
                 {
                     b.Property<string>("Id")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("agency_id");
 
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
                     b.Property<string>("Email")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("agency_email");
 
                     b.Property<string>("FareUrl")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("agency_fare_url");
 
                     b.Property<string>("Language")
                         .IsRequired()
                         .HasMaxLength(5)
-                        .HasColumnType("varchar(5)")
+                        .HasColumnType("character varying(5)")
                         .HasColumnName("agency_lang");
 
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("agency_name");
 
                     b.Property<string>("Phone")
                         .HasMaxLength(30)
-                        .HasColumnType("varchar(30)")
+                        .HasColumnType("character varying(30)")
                         .HasColumnName("agency_phone");
 
                     b.Property<string>("Timezone")
                         .IsRequired()
                         .HasMaxLength(50)
-                        .HasColumnType("varchar(50)")
+                        .HasColumnType("character varying(50)")
                         .HasColumnName("agency_timezone");
 
                     b.Property<string>("Url")
                         .IsRequired()
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("agency_url");
 
-                    b.HasKey("Id");
+                    b.HasKey("Id", "FeedId");
+
+                    b.HasIndex("FeedId");
 
-                    b.ToTable("agencies");
+                    b.ToTable("gtfs_agencies");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Calendar", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsCalendar", b =>
                 {
                     b.Property<string>("ServiceId")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("service_id");
 
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
                     b.Property<DateOnly>("EndDate")
                         .HasColumnType("date")
                         .HasColumnName("end_date");
 
                     b.Property<bool>("Friday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("friday");
 
                     b.Property<bool>("Monday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("monday");
 
                     b.Property<bool>("Saturday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("saturday");
 
                     b.Property<DateOnly>("StartDate")
@@ -100,294 +149,394 @@ namespace Costasdev.Busurbano.Database.Migrations
                         .HasColumnName("start_date");
 
                     b.Property<bool>("Sunday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("sunday");
 
                     b.Property<bool>("Thursday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("thursday");
 
                     b.Property<bool>("Tuesday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("tuesday");
 
                     b.Property<bool>("Wednesday")
-                        .HasColumnType("tinyint(1)")
+                        .HasColumnType("boolean")
                         .HasColumnName("wednesday");
 
-                    b.HasKey("ServiceId");
+                    b.HasKey("ServiceId", "FeedId");
+
+                    b.HasIndex("FeedId");
 
-                    b.ToTable("calendar");
+                    b.ToTable("gtfs_calendar");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.CalendarDate", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsCalendarDate", b =>
                 {
                     b.Property<string>("ServiceId")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("service_id");
 
-                    b.Property<DateOnly>("Date")
-                        .HasColumnType("date")
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
                         .HasColumnName("date");
 
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
                     b.Property<int>("ExceptionType")
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasColumnName("exception_type");
 
-                    b.HasKey("ServiceId", "Date");
+                    b.HasKey("ServiceId", "Date", "FeedId");
+
+                    b.HasIndex("FeedId");
 
-                    b.ToTable("calendar_dates");
+                    b.ToTable("gtfs_calendar_dates");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Route", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsRoute", b =>
                 {
                     b.Property<string>("Id")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("route_id");
 
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
                     b.Property<string>("AgencyId")
                         .IsRequired()
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("agency_id");
 
                     b.Property<string>("Color")
                         .HasMaxLength(7)
-                        .HasColumnType("varchar(7)")
+                        .HasColumnType("character varying(7)")
                         .HasColumnName("route_color");
 
                     b.Property<string>("Description")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("route_desc");
 
                     b.Property<string>("LongName")
                         .IsRequired()
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("route_long_name");
 
                     b.Property<string>("ShortName")
                         .IsRequired()
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("route_short_name");
 
                     b.Property<int>("SortOrder")
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasColumnName("route_sort_order");
 
                     b.Property<string>("TextColor")
                         .HasMaxLength(7)
-                        .HasColumnType("varchar(7)")
+                        .HasColumnType("character varying(7)")
                         .HasColumnName("route_text_color");
 
                     b.Property<int>("Type")
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasColumnName("route_type");
 
                     b.Property<string>("Url")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("route_url");
 
-                    b.HasKey("Id");
+                    b.HasKey("Id", "FeedId");
+
+                    b.HasIndex("FeedId");
 
-                    b.HasIndex("AgencyId");
+                    b.HasIndex("AgencyId", "FeedId");
 
-                    b.ToTable("routes");
+                    b.ToTable("gtfs_routes");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Stop", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsStop", b =>
                 {
                     b.Property<string>("Id")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("stop_id");
 
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
                     b.Property<string>("Code")
                         .IsRequired()
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("stop_code");
 
                     b.Property<string>("Description")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("stop_desc");
 
-                    b.Property<double>("Latitude")
-                        .HasColumnType("double")
-                        .HasColumnName("stop_lat");
-
-                    b.Property<double>("Longitude")
-                        .HasColumnType("double")
-                        .HasColumnName("stop_lon");
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("stop_name");
 
+                    b.Property<Point>("Position")
+                        .HasColumnType("geometry")
+                        .HasColumnName("stop_pos");
+
                     b.Property<string>("Timezone")
                         .HasMaxLength(50)
-                        .HasColumnType("varchar(50)")
+                        .HasColumnType("character varying(50)")
                         .HasColumnName("stop_timezone");
 
                     b.Property<string>("Url")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("stop_url");
 
                     b.Property<int>("WheelchairBoarding")
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasColumnName("wheelchair_boarding");
 
-                    b.HasKey("Id");
+                    b.HasKey("Id", "FeedId");
+
+                    b.HasIndex("FeedId");
 
-                    b.ToTable("stops");
+                    b.ToTable("gtfs_stops");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.StopTime", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsStopTime", b =>
                 {
                     b.Property<string>("TripId")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("trip_id");
 
                     b.Property<int>("StopSequence")
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasColumnName("stop_sequence");
 
-                    b.Property<TimeOnly>("ArrivalTime")
-                        .HasMaxLength(8)
-                        .HasColumnType("varchar(8)")
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
+                    b.Property<string>("Arrival")
+                        .IsRequired()
+                        .HasColumnType("text")
                         .HasColumnName("arrival_time");
 
-                    b.Property<TimeOnly>("DepartureTime")
-                        .HasMaxLength(8)
-                        .HasColumnType("varchar(8)")
+                    b.Property<string>("Departure")
+                        .IsRequired()
+                        .HasColumnType("text")
                         .HasColumnName("departure_time");
 
                     b.Property<double?>("ShapeDistTraveled")
-                        .HasColumnType("double")
+                        .HasColumnType("double precision")
                         .HasColumnName("shape_dist_traveled");
 
                     b.Property<string>("StopId")
                         .IsRequired()
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("stop_id");
 
-                    b.HasKey("TripId", "StopSequence");
+                    b.HasKey("TripId", "StopSequence", "FeedId");
+
+                    b.HasIndex("FeedId");
 
-                    b.HasIndex("StopId");
+                    b.HasIndex("StopId", "FeedId");
 
-                    b.ToTable("stop_times");
+                    b.HasIndex("TripId", "FeedId");
+
+                    b.ToTable("gtfs_stop_times");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Trip", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsTrip", b =>
                 {
-                    b.Property<string>("TripId")
+                    b.Property<string>("Id")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("trip_id");
 
+                    b.Property<int>("FeedId")
+                        .HasColumnType("integer")
+                        .HasColumnName("feed_id");
+
                     b.Property<string>("BlockId")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("block_id");
 
                     b.Property<int>("DirectionId")
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasColumnName("direction_id");
 
                     b.Property<string>("RouteId")
                         .IsRequired()
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("route_id");
 
                     b.Property<string>("ServiceId")
                         .IsRequired()
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("service_id");
 
                     b.Property<string>("ShapeId")
                         .HasMaxLength(32)
-                        .HasColumnType("varchar(32)")
+                        .HasColumnType("character varying(32)")
                         .HasColumnName("shape_id");
 
                     b.Property<int>("TripBikesAllowed")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasDefaultValue(0)
                         .HasColumnName("trip_bikes_allowed");
 
                     b.Property<string>("TripHeadsign")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("trip_headsign");
 
                     b.Property<string>("TripShortName")
                         .HasMaxLength(255)
-                        .HasColumnType("varchar(255)")
+                        .HasColumnType("character varying(255)")
                         .HasColumnName("trip_short_name");
 
                     b.Property<int>("TripWheelchairAccessible")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("int")
+                        .HasColumnType("integer")
                         .HasDefaultValue(0)
                         .HasColumnName("trip_wheelchair_accessible");
 
-                    b.HasKey("TripId");
+                    b.HasKey("Id", "FeedId");
+
+                    b.HasIndex("FeedId");
+
+                    b.HasIndex("RouteId", "FeedId");
+
+                    b.ToTable("gtfs_trips");
+                });
+
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsAgency", b =>
+                {
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
+                        .WithMany()
+                        .HasForeignKey("FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feed");
+                });
+
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsCalendar", b =>
+                {
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
+                        .WithMany()
+                        .HasForeignKey("FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.HasIndex("RouteId");
+                    b.Navigation("Feed");
+                });
+
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsCalendarDate", b =>
+                {
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
+                        .WithMany()
+                        .HasForeignKey("FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.ToTable("trips");
+                    b.Navigation("Feed");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Route", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsRoute", b =>
                 {
-                    b.HasOne("Costasdev.Busurbano.Database.Gtfs.Agency", "Agency")
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
                         .WithMany()
-                        .HasForeignKey("AgencyId")
+                        .HasForeignKey("FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.GtfsAgency", "Agency")
+                        .WithMany()
+                        .HasForeignKey("AgencyId", "FeedId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
                     b.Navigation("Agency");
+
+                    b.Navigation("Feed");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.StopTime", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsStop", b =>
                 {
-                    b.HasOne("Costasdev.Busurbano.Database.Gtfs.Stop", "Stop")
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
                         .WithMany()
-                        .HasForeignKey("StopId")
+                        .HasForeignKey("FeedId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("Costasdev.Busurbano.Database.Gtfs.Trip", "Trip")
+                    b.Navigation("Feed");
+                });
+
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsStopTime", b =>
+                {
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
                         .WithMany()
-                        .HasForeignKey("TripId")
+                        .HasForeignKey("FeedId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.Navigation("Stop");
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.GtfsStop", "GtfsStop")
+                        .WithMany()
+                        .HasForeignKey("StopId", "FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
-                    b.Navigation("Trip");
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.GtfsTrip", "GtfsTrip")
+                        .WithMany()
+                        .HasForeignKey("TripId", "FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feed");
+
+                    b.Navigation("GtfsStop");
+
+                    b.Navigation("GtfsTrip");
                 });
 
-            modelBuilder.Entity("Costasdev.Busurbano.Database.Gtfs.Trip", b =>
+            modelBuilder.Entity("Costasdev.ServiceViewer.Data.Gtfs.GtfsTrip", b =>
                 {
-                    b.HasOne("Costasdev.Busurbano.Database.Gtfs.Route", null)
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.Feed", "Feed")
                         .WithMany()
-                        .HasForeignKey("RouteId")
+                        .HasForeignKey("FeedId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
+
+                    b.HasOne("Costasdev.ServiceViewer.Data.Gtfs.GtfsRoute", "Route")
+                        .WithMany()
+                        .HasForeignKey("RouteId", "FeedId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feed");
+
+                    b.Navigation("Route");
                 });
 #pragma warning restore 612, 618
         }