Merge pull request #40 from zetroot/feature/toot-reports

+semver: breaking

Author: zetroot

src/NTorSpectator.Database/Configuration/ObservationEntityConfiguration.cs

@@ -15,4 +15,4 @@ public void Configure(EntityTypeBuilder<Observation> builder)
 
         builder.HasOne(x => x.Site).WithMany().HasForeignKey(x => x.SiteId).OnDelete(DeleteBehavior.Restrict);
     }
-}
+}

src/NTorSpectator.Database/Configuration/ObservationEventEntityConfiguration.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using NTorSpectator.Database.Models;
+
+namespace NTorSpectator.Database.Configuration;
+
+internal class ObservationEventEntityConfiguration : IEntityTypeConfiguration<SiteAvailabilityEvent>
+{
+    public void Configure(EntityTypeBuilder<SiteAvailabilityEvent> builder)
+    {
+        builder.ToTable("availability_events");
+        builder.HasKey(x => x.Id);
+        builder.HasIndex(x => x.OccuredAt);
+        builder.HasIndex(x => x.EventType);
+        builder.HasOne(x => x.Site).WithMany().HasForeignKey(x => x.SiteId).OnDelete(DeleteBehavior.Cascade);
+    }
+}

src/NTorSpectator.Database/Configuration/ObservationReportEntityConfiguration.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using NTorSpectator.Database.Models;
+
+namespace NTorSpectator.Database.Configuration;
+
+internal class ObservationReportEntityConfiguration : IEntityTypeConfiguration<ObservationReport>
+{
+    public void Configure(EntityTypeBuilder<ObservationReport> builder)
+    {
+        builder.ToTable("reports");
+        builder.HasKey(x => x.Id);
+        
+        builder.HasMany(x => x.Observations).WithOne().HasForeignKey(x => x.ReportId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasMany(x => x.Events).WithOne().HasForeignKey(x => x.ReportId).OnDelete(DeleteBehavior.Restrict);
+    }
+}

src/NTorSpectator.Database/DataContext.cs

@@ -3,20 +3,16 @@
 
 namespace NTorSpectator.Database;
 
-public class DataContext : DbContext
+internal class DataContext : DbContext
 {
-    public DataContext()
-    {
-        
-    }
+    public DataContext() { }
 
-    public DataContext(DbContextOptions<DataContext> options) : base(options)
-    {
-        
-    }
+    public DataContext(DbContextOptions<DataContext> options) : base(options) { }
 
     public DbSet<Site> Sites => Set<Site>();
     public DbSet<Observation> Observations => Set<Observation>();
+    public DbSet<SiteAvailabilityEvent> Events => Set<SiteAvailabilityEvent>();
+    public DbSet<ObservationReport> Reports => Set<ObservationReport>();
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

src/NTorSpectator.Database/DatabaseInjector.cs

@@ -6,14 +6,24 @@
 
 namespace NTorSpectator.Database;
 
+/// <summary>
+/// Injects data access services into DI
+/// </summary>
 public static class DatabaseInjector
 {
+    /// <summary>
+    /// Registers Datacontext and repositories implementations in DI-container
+    /// </summary>
+    /// <param name="services">DI-container</param>
+    /// <param name="configuration">Configuration to get database settings from</param>
+    /// <returns>Same di container to chain extension calls</returns>
     public static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddDbContextPool<DataContext>(opts => opts.UseNpgsql(configuration.GetConnectionString("SpectatorDatabase")));
         services
             .AddTransient<ISitesRepository, SitesRepository>()
-            .AddTransient<IObservesRepository, ObservesRepository>();
+            .AddTransient<IObservesRepository, ObservesRepository>()
+            .AddTransient<IReportsRepository, ReportsRepository>();
 
         return services;
     }

src/NTorSpectator.Database/Migrations/20230708103126_CombinedReports.Designer.cs

@@ -0,0 +1,117 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NTorSpectator.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class CombinedReports : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ReportId",
+                table: "observations",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "reports",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_reports", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "availability_events",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ReportId = table.Column<int>(type: "integer", nullable: false),
+                    SiteId = table.Column<int>(type: "integer", nullable: false),
+                    OccuredAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    EventType = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_availability_events", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_availability_events_reports_ReportId",
+                        column: x => x.ReportId,
+                        principalTable: "reports",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_availability_events_sites_SiteId",
+                        column: x => x.SiteId,
+                        principalTable: "sites",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_observations_ReportId",
+                table: "observations",
+                column: "ReportId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_availability_events_EventType",
+                table: "availability_events",
+                column: "EventType");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_availability_events_OccuredAt",
+                table: "availability_events",
+                column: "OccuredAt");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_availability_events_ReportId",
+                table: "availability_events",
+                column: "ReportId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_availability_events_SiteId",
+                table: "availability_events",
+                column: "SiteId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_observations_reports_ReportId",
+                table: "observations",
+                column: "ReportId",
+                principalTable: "reports",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_observations_reports_ReportId",
+                table: "observations");
+
+            migrationBuilder.DropTable(
+                name: "availability_events");
+
+            migrationBuilder.DropTable(
+                name: "reports");
+
+            migrationBuilder.DropIndex(
+                name: "IX_observations_ReportId",
+                table: "observations");
+
+            migrationBuilder.DropColumn(
+                name: "ReportId",
+                table: "observations");
+        }
+    }
+}