. (#81)

Swetugg · Sep 17, 2024 · d556229 · d556229
1 parent 5718aed
commit d556229
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/ConferenceService.cs b/ConferenceService.cs
@@ -39,7 +39,7 @@ public ConferenceService(SwetuggContext context, IMemoryCache cache)
 
     public CurrentConferenceMeta? GetCurrentConferenceMeta() =>
         ReadThroughCache("conference-current", () => _context.Conferences
-            .Where(c => c.End > DateTime.UtcNow)
+            .Where(c => c.HighlightDate <= DateTime.UtcNow.Date)
             .OrderBy(c => c.End)
             .Select(c => new CurrentConferenceMeta { Name = c.Name, Slug = c.Slug })
             .FirstOrDefault()

diff --git a/DbModels/Conference.cs b/DbModels/Conference.cs
@@ -16,7 +16,9 @@ public partial class Conference
     public DateTime? Start { get; set; }
 
     public DateTime? End { get; set; }
-
+
+    public DateTime? HighlightDate { get; set; }
+
     public int MinNumberOfSpeakers { get; set; }
 
     public virtual ICollection<ImageType> ImageTypes { get; } = new List<ImageType>();

diff --git a/DbModels/SwetuggContext.cs b/DbModels/SwetuggContext.cs
@@ -55,6 +55,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.Name).HasMaxLength(250);
             entity.Property(e => e.Slug).HasMaxLength(250);
             entity.Property(e => e.Start).HasColumnType("datetime");
+            entity.Property(e => e.HighlightDate).HasColumnType("datetime");
         });
 
         modelBuilder.Entity<ImageType>(entity =>

diff --git a/Pages/gbg-2023/_Layout.cshtml b/Pages/gbg-2023/_Layout.cshtml
@@ -9,7 +9,7 @@
     if (conference == null)
         throw new Exception("Conference not found in database");
 
-    var currentConferenceMeta = conference.End < DateTime.UtcNow ? conferenceService.GetCurrentConferenceMeta() : null;
+    var currentConferenceMeta = conferenceService.GetCurrentConferenceMeta();
 }
 <!DOCTYPE html>
 <html lang="en">

diff --git a/Pages/gbg-2024/_Layout.cshtml b/Pages/gbg-2024/_Layout.cshtml
@@ -9,7 +9,7 @@
     if (conference == null)
         throw new Exception("Conference not found in database");
 
-    var currentConferenceMeta = conference.End < DateTime.UtcNow ? conferenceService.GetCurrentConferenceMeta() : null;
+    var currentConferenceMeta = conferenceService.GetCurrentConferenceMeta();
 }
 <!DOCTYPE html>
 <html lang="en">

diff --git a/Pages/sthlm-2024/_Layout.cshtml b/Pages/sthlm-2024/_Layout.cshtml
@@ -9,7 +9,7 @@
     if (conference == null)
         throw new Exception("Conference not found in database");
 
-    var currentConferenceMeta = conference.End < DateTime.UtcNow ? conferenceService.GetCurrentConferenceMeta() : null;
+    var currentConferenceMeta = conferenceService.GetCurrentConferenceMeta();
 }
 <!DOCTYPE html>
 <html lang="en">