postgres

Sentaur.Leaderboard.Api/LeaderboardContext.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Sentaur.Leaderboard.Api;
 
@@ -8,7 +9,7 @@ public class LeaderboardContext : DbContext
 
     private string _dbPath;
 
-    public LeaderboardContext()
+    public LeaderboardContext(DbContextOptions<LeaderboardContext> options) : base(options)
     {
         var folder = Environment.SpecialFolder.LocalApplicationData;
         var path = Environment.GetFolderPath(folder);
@@ -19,11 +20,30 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder
             .Entity<ScoreEntry>(
-                eb => eb.HasKey(nameof(ScoreEntry.Key)));
+                eb =>
+                {
+                    eb.HasKey(nameof(ScoreEntry.Key));
+                    // https://stackoverflow.com/questions/72147210/cant-cast-database-type-character-to-guid
+                    // eb.Property(p => p.Key).HasColumnType("CHAR(36)");
+                });
         base.OnModelCreating(modelBuilder);
     }
 
     protected override void OnConfiguring(DbContextOptionsBuilder options)
-        => options.UseInMemoryDatabase("InMemoryDb");
-    // => options.UseSqlite($"Data Source={_dbPath}");
+#if !DEBUG
+        => options.UseInMemoryDatabase("Leaderboard");
+#else
+        => options.UseNpgsql();
+#endif
+
+    protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
+    {
+        configurationBuilder
+            .Properties<DateTimeOffset>()
+            .HaveConversion<DateTimeOffsetConverter>();
+    }
 }
+
+public class DateTimeOffsetConverter()
+    : ValueConverter<DateTimeOffset, DateTimeOffset>(d => d.ToUniversalTime(),
+    d => d.ToUniversalTime());

Sentaur.Leaderboard.Api/Migrations/20240301161657_InitialCreate.cs → Sentaur.Leaderboard.Api/Migrations/20240314033003_Init.cs

@@ -6,7 +6,7 @@
 namespace Sentaur.Leaderboard.Api.Migrations
 {
     /// <inheritdoc />
-    public partial class InitialCreate : Migration
+    public partial class Init : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -15,14 +15,16 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "ScoreEntries",
                 columns: table => new
                 {
-                    Name = table.Column<string>(type: "TEXT", nullable: false),
-                    Email = table.Column<string>(type: "TEXT", nullable: false),
-                    Duration = table.Column<TimeSpan>(type: "TEXT", nullable: false),
-                    Score = table.Column<int>(type: "INTEGER", nullable: false),
-                    Timestamp = table.Column<DateTimeOffset>(type: "TEXT", nullable: false)
+                    Key = table.Column<Guid>(type: "uuid", nullable: false),
+                    Name = table.Column<string>(type: "text", nullable: false),
+                    Email = table.Column<string>(type: "text", nullable: false),
+                    Duration = table.Column<TimeSpan>(type: "interval", nullable: false),
+                    Score = table.Column<int>(type: "integer", nullable: false),
+                    Timestamp = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false)
                 },
                 constraints: table =>
                 {
+                    table.PrimaryKey("PK_ScoreEntries", x => x.Key);
                 });
         }
 

Sentaur.Leaderboard.Api/Migrations/LeaderboardContextModelSnapshot.cs

@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using Sentaur.Leaderboard.Api;
 
 #nullable disable
@@ -15,30 +16,34 @@ partial class LeaderboardContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.2");
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
             modelBuilder.Entity("Sentaur.Leaderboard.ScoreEntry", b =>
                 {
                     b.Property<Guid>("Key")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
+                        .HasColumnType("uuid");
 
                     b.Property<TimeSpan>("Duration")
-                        .HasColumnType("TEXT");
+                        .HasColumnType("interval");
 
                     b.Property<string>("Email")
                         .IsRequired()
-                        .HasColumnType("TEXT");
+                        .HasColumnType("text");
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("TEXT");
+                        .HasColumnType("text");
 
                     b.Property<int>("Score")
-                        .HasColumnType("INTEGER");
+                        .HasColumnType("integer");
 
                     b.Property<DateTimeOffset>("Timestamp")
-                        .HasColumnType("TEXT");
+                        .HasColumnType("timestamp with time zone");
 
                     b.HasKey("Key");
 

Sentaur.Leaderboard.Api/Program.cs

@@ -56,11 +56,16 @@
         });
 });
 
-builder.Services.AddDbContextFactory<LeaderboardContext>(
+builder.Services.AddDbContext<LeaderboardContext>(
     options =>
-        options.UseInMemoryDatabase("InMemoryDb")
-        // options.UseSqlite()
-            );
+    {
+#if !DEBUG
+        options.UseInMemoryDatabase("Leaderboard");
+#else
+        options.UseNpgsql(builder.Configuration.GetConnectionString("Leaderboard"));
+#endif
+
+    });
 
 builder.Services.AddAuthentication(o =>
 {
@@ -127,7 +132,7 @@
 
 app.MapPost("/token", [AllowAnonymous](User user) =>
 {
-    if (user.Username.Equals(builder.Configuration["User:Username"]) && user.Password.Equals(builder.Configuration["User:Password"]))
+    if (user.Username?.Equals(builder.Configuration["User:Username"]) is true && user.Password?.Equals(builder.Configuration["User:Password"]) is true)
     {
         return Results.Ok(tokenHolder.Token);
     }

Sentaur.Leaderboard.Api/Sentaur.Leaderboard.Api.csproj

@@ -15,7 +15,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
-<!--    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />-->
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     <PackageReference Include="Sentry.AspNetCore" Version="4.2.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
@@ -30,4 +30,8 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Migrations\" />
+  </ItemGroup>
+
 </Project>

Sentaur.Leaderboard.Api/appsettings.Development.json

@@ -4,5 +4,12 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "User": {
+    "Username": "test",
+    "Password": "password"
+  },
+  "ConnectionStrings": {
+    "Leaderboard": "Host=localhost;Database=leaderboard;Username=postgres;Password=leaderboard;Include Error Detail=true;"
   }
 }