Update nuget, db

OpenShock · Jun 14, 2024 · 7c10067 · 7c10067
1 parent c8f3f27
commit 7c10067
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 22 deletions.
diff --git a/DiscordBot/DiscordBot.csproj b/DiscordBot/DiscordBot.csproj
@@ -17,15 +17,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Discord.Addons.Hosting" Version="6.0.0" />
-        <PackageReference Include="Discord.Net" Version="3.14.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
+        <PackageReference Include="Discord.Addons.Hosting" Version="6.1.0" />
+        <PackageReference Include="Discord.Net" Version="3.15.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
-        <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.4">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
+        <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="8.0.6">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -34,13 +34,13 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
-        <PackageReference Include="OneOf" Version="3.0.263" />
-        <PackageReference Include="Serilog" Version="3.1.1" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+        <PackageReference Include="OneOf" Version="3.0.271" />
+        <PackageReference Include="Serilog" Version="4.0.0" />
         <PackageReference Include="Serilog.Extensions.Autofac.DependencyInjection" Version="5.0.0" />
         <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
         <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
     </ItemGroup>
 

diff --git a/DiscordBot/OpenShockDiscordDb/GuildActiveShocker.cs b/DiscordBot/OpenShockDiscordDb/GuildActiveShocker.cs
@@ -13,11 +13,11 @@ public partial class GuildActiveShocker
 
     public bool Paused { get; set; }
 
-    public bool? PermSound { get; set; }
+    public bool PermSound { get; set; }
 
-    public bool? PermVibrate { get; set; }
+    public bool PermVibrate { get; set; }
 
-    public bool? PermShock { get; set; }
+    public bool PermShock { get; set; }
 
     public int? LimitDuration { get; set; }
 

diff --git a/DiscordBot/OpenShockDiscordDb/OpenShockDiscordContext.cs b/DiscordBot/OpenShockDiscordDb/OpenShockDiscordContext.cs
@@ -19,6 +19,8 @@ public OpenShockDiscordContext(DbContextOptions<OpenShockDiscordContext> options
 
     public virtual DbSet<User> Users { get; set; }
 
+    public virtual DbSet<UsersFriendwhitelist> UsersFriendwhitelists { get; set; }
+
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.Entity<GuildActiveShocker>(entity =>
@@ -32,18 +34,17 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.ShockerId).HasColumnName("shocker_id");
             entity.Property(e => e.LimitDuration).HasColumnName("limit_duration");
             entity.Property(e => e.LimitIntensity).HasColumnName("limit_intensity");
-            entity.Property(e => e.Paused).HasColumnName("paused");
+            entity.Property(e => e.Paused)
+                .HasDefaultValue(false)
+                .HasColumnName("paused");
             entity.Property(e => e.PermShock)
-                .IsRequired()
-                .HasDefaultValueSql("true")
+                .HasDefaultValue(true)
                 .HasColumnName("perm_shock");
             entity.Property(e => e.PermSound)
-                .IsRequired()
-                .HasDefaultValueSql("true")
+                .HasDefaultValue(true)
                 .HasColumnName("perm_sound");
             entity.Property(e => e.PermVibrate)
-                .IsRequired()
-                .HasDefaultValueSql("true")
+                .HasDefaultValue(true)
                 .HasColumnName("perm_vibrate");
 
             entity.HasOne(d => d.Discord).WithMany(p => p.GuildActiveShockers)
@@ -57,7 +58,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             entity.ToTable("users");
 
-            entity.HasIndex(e => e.OpenshockId, "users_openshock_id").IsUnique();
+            entity.HasIndex(e => e.OpenshockId, "users_openshock_id")
+                .IsUnique()
+                .HasAnnotation("Npgsql:StorageParameter:deduplicate_items", "true");
 
             entity.Property(e => e.DiscordId).HasColumnName("discord_id");
             entity.Property(e => e.ApiKey)
@@ -72,6 +75,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.OpenshockId).HasColumnName("openshock_id");
         });
 
+        modelBuilder.Entity<UsersFriendwhitelist>(entity =>
+        {
+            entity.HasKey(e => new { e.User, e.WhitelistedFriend }).HasName("users_friendwhitelist_pkey");
+
+            entity.ToTable("users_friendwhitelist");
+
+            entity.Property(e => e.User).HasColumnName("user");
+            entity.Property(e => e.WhitelistedFriend).HasColumnName("whitelisted_friend");
+            entity.Property(e => e.CreatedOn)
+                .HasDefaultValueSql("CURRENT_TIMESTAMP")
+                .HasColumnName("created_on");
+        });
+
         OnModelCreatingPartial(modelBuilder);
     }
 

diff --git a/DiscordBot/OpenShockDiscordDb/UsersFriendwhitelist.cs b/DiscordBot/OpenShockDiscordDb/UsersFriendwhitelist.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace OpenShock.DiscordBot.OpenShockDiscordDb;
+
+public partial class UsersFriendwhitelist
+{
+    public decimal User { get; set; }
+
+    public decimal WhitelistedFriend { get; set; }
+
+    public DateTime CreatedOn { get; set; }
+}
diff --git a/DiscordBot/Scripts/ReScaffold.ps1 b/DiscordBot/Scripts/ReScaffold.ps1
@@ -0,0 +1 @@
+dotnet ef dbcontext scaffold "Host=docker-node;Port=1337;Database=discord-bot;Username=root;Password=root" Npgsql.EntityFrameworkCore.PostgreSQL -c OpenShockDiscordContext -o OpenShockDiscordDb -f
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		dotnet ef dbcontext scaffold "Host=docker-node;Port=1337;Database=discord-bot;Username=root;Password=root" Npgsql.EntityFrameworkCore.PostgreSQL -c OpenShockDiscordContext -o OpenShockDiscordDb -f