Revert "DB leaderboards (#66)" (#67)

This reverts commit a965fbf.
Simyon264 · Nov 11, 2024 · bce888c · bce888c
1 parent a965fbf
commit bce888c
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 1,177 deletions.
diff --git a/ReplayBrowser/Data/Migrations/20241111013501_DbLeaderboards.Designer.cs b/ReplayBrowser/Data/Migrations/20241111013501_DbLeaderboards.Designer.cs
diff --git a/ReplayBrowser/Data/Migrations/20241111013501_DbLeaderboards.cs b/ReplayBrowser/Data/Migrations/20241111013501_DbLeaderboards.cs
diff --git a/ReplayBrowser/Data/Migrations/ReplayDbContextModelSnapshot.cs b/ReplayBrowser/Data/Migrations/ReplayDbContextModelSnapshot.cs
@@ -301,63 +301,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("JobDepartments");
                 });
 
-            modelBuilder.Entity("ReplayBrowser.Data.Models.LeaderboardDefinition", b =>
-                {
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("ExtraInfo")
-                        .HasColumnType("text");
-
-                    b.Property<string>("NameColumn")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("TrackedData")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Name");
-
-                    b.ToTable("LeaderboardDefinitions");
-                });
-
-            modelBuilder.Entity("ReplayBrowser.Data.Models.LeaderboardPosition", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("LeaderboardDefinitionName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<Guid?>("PlayerGuid")
-                        .HasColumnType("uuid");
-
-                    b.Property<int>("Position")
-                        .HasColumnType("integer");
-
-                    b.Property<List<string>>("Servers")
-                        .IsRequired()
-                        .HasColumnType("text[]");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("LeaderboardDefinitionName");
-
-                    b.ToTable("Leaderboards");
-                });
-
             modelBuilder.Entity("ReplayBrowser.Data.Models.Notice", b =>
                 {
                     b.Property<int?>("Id")
@@ -642,17 +585,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasForeignKey("CollectedPlayerDataPlayerGuid");
                 });
 
-            modelBuilder.Entity("ReplayBrowser.Data.Models.LeaderboardPosition", b =>
-                {
-                    b.HasOne("ReplayBrowser.Data.Models.LeaderboardDefinition", "LeaderboardDefinition")
-                        .WithMany()
-                        .HasForeignKey("LeaderboardDefinitionName")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("LeaderboardDefinition");
-                });
-
             modelBuilder.Entity("ReplayBrowser.Data.Models.Player", b =>
                 {
                     b.HasOne("ReplayBrowser.Data.Models.JobDepartment", "EffectiveJob")

diff --git a/ReplayBrowser/Data/Models/LeaderboardDefinition.cs b/ReplayBrowser/Data/Models/LeaderboardDefinition.cs
diff --git a/ReplayBrowser/Data/Models/LeaderboardPosition.cs b/ReplayBrowser/Data/Models/LeaderboardPosition.cs
diff --git a/ReplayBrowser/Data/ReplayDbContext.cs b/ReplayBrowser/Data/ReplayDbContext.cs
@@ -49,7 +49,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
     public DbSet<ReplayParticipant> ReplayParticipants { get; set; }
 
     public DbSet<ServerToken> ServerTokens { get; set; }
-
-    public DbSet<LeaderboardPosition> Leaderboards { get; set; }
-    public DbSet<LeaderboardDefinition> LeaderboardDefinitions { get; set; }
 }
diff --git a/ReplayBrowser/Models/LeaderboardData.cs b/ReplayBrowser/Models/LeaderboardData.cs
@@ -3,6 +3,13 @@
 
 namespace ReplayBrowser.Models;
 
+public class LeaderboardData
+{
+    public bool IsCache { get; set; } = false;
+
+    public List<Leaderboard> Leaderboards { get; set; } = null!;
+}
+
 public class PlayerCount
 {
     public PlayerData? Player { get; set; }

diff --git a/ReplayBrowser/Pages/Leaderboard.razor b/ReplayBrowser/Pages/Leaderboard.razor
@@ -1,5 +1,4 @@
 @page "/leaderboard"
-@using Humanizer
 @using Microsoft.AspNetCore.Components.Authorization
 @using ReplayBrowser.Models
 @using ReplayBrowser.Services
@@ -21,14 +20,6 @@
 
 <PageTitle>Leaderboard</PageTitle>
 <h4>Leaderboards</h4>
-<em>Leaderboards update every 24 hours.</em>
-@if(LeaderboardService.IsUpdating) {
-    <div class="alert alert-warning" role="alert">
-        <p>The leaderboards are currently updating. This may take a while. Please be patient.</p>
-        <em>Update started: @LeaderboardService.UpdateStarted.Humanize(utcDate: true). Current progress: @LeaderboardService.UpdateProgress / @LeaderboardService.UpdateTotal</em>
-    </div>
-}
-
 @if(RequestedPrivate)
 {
     <div class="alert alert-danger" role="alert">
@@ -114,14 +105,7 @@ else
 
     <hr/>
 
-    @if(LeaderboardData.Length == 0)
-    {
-        <div class="alert alert-warning" role="alert">
-            <p>No data was found for the selected servers and time range. Data is probably still collected and calculated. Please try again later. This will take a long time.</p>
-        </div>
-    }
-
-    @foreach (var leaderboard in LeaderboardData)
+    @foreach (var leaderboard in LeaderboardData.Leaderboards)
     {
         <h4>@leaderboard.Name</h4>
         if (leaderboard.ExtraInfo != null)
@@ -249,7 +233,7 @@ else
 
 @code{
     private bool IsLoading { get; set; } = true;
-    private Models.Leaderboard[]? LeaderboardData { get; set; } = null;
+    private LeaderboardData? LeaderboardData { get; set; } = null;
     private bool RequestedPrivate { get; set; } = false;
 
     protected override async Task OnInitializedAsync()
@@ -283,7 +267,7 @@ else
             }
         }
 
-        Models.Leaderboard[]? leaderboard = null;
+        LeaderboardData? leaderboard = null;
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
         try
         {
@@ -295,7 +279,7 @@ else
             }
 
             var selectedServersArray = selectedServers.Split(',');
-            leaderboard = await LeaderboardService.GetLeaderboards(timeRangeEnum, username, selectedServersArray, authState, entries);
+            leaderboard = await LeaderboardService.GetLeaderboard(timeRangeEnum, username, selectedServersArray, authState, entries);
         }
         catch (UnauthorizedAccessException)
         {