fix: event display logic

Author: glitchedmob

SgfDevs.Tests/EventDisplayServiceTests.cs

@@ -1,5 +1,6 @@
 using System;
 using SgfDevs.Dev;
+using SgfDevs.Dev.EventSync;
 using Xunit;
 
 namespace SgfDevs.Tests;
@@ -60,4 +61,14 @@ public void GetCurrentAndUpcomingEvents_ReturnsOnlyVisibleWindow()
             [new DateTime(2026, 5, 6, 18, 30, 0), new DateTime(2026, 6, 3, 18, 30, 0)],
             result);
     }
+
+    [Fact]
+    public void GetCurrentTime_UsesConfiguredEventTimeZone()
+    {
+        var service = new EventDisplayService(EventSyncTimeZoneResolver.Resolve("America/Chicago"));
+
+        var result = service.GetCurrentTime(new DateTimeOffset(2026, 5, 6, 20, 46, 0, TimeSpan.Zero));
+
+        Assert.Equal(new DateTime(2026, 5, 6, 15, 46, 0), result);
+    }
 }

SgfDevs/Dev/EventDisplayService.cs

@@ -7,6 +7,22 @@ namespace SgfDevs.Dev;
 
 public class EventDisplayService
 {
+    private readonly TimeZoneInfo _eventTimeZone;
+
+    public EventDisplayService()
+        : this(TimeZoneInfo.Local)
+    {
+    }
+
+    public EventDisplayService(TimeZoneInfo eventTimeZone)
+    {
+        _eventTimeZone = eventTimeZone;
+    }
+
+    public DateTime GetCurrentTime() => GetCurrentTime(DateTimeOffset.UtcNow);
+
+    public DateTime GetCurrentTime(DateTimeOffset currentTime) => TimeZoneInfo.ConvertTime(currentTime, _eventTimeZone).DateTime;
+
     public bool IsCurrentOrUpcoming(DateTime eventDate, DateTime now) => eventDate.AddHours(1) > now;
 
     public T? GetCurrentOrNextEvent<T>(IEnumerable<T> events, Func<T, DateTime> getDate, DateTime now)

SgfDevs/Program.cs

@@ -49,7 +49,7 @@
 builder.Services.AddScoped<MemberConverter>();
 builder.Services.AddScoped<MemberTagDisplayService>();
 builder.Services.AddScoped<PresentationPresenterDisplayService>();
-builder.Services.AddScoped<EventDisplayService>();
+builder.Services.AddScoped(_ => new EventDisplayService(EventSyncTimeZoneResolver.Resolve(builder.Configuration["SGFDevs:EventTimeZoneId"])));
 builder.Services.AddScoped<DirectoryHelper>();
 builder.Services.AddScoped<NewsletterHelper>();
 builder.Services.AddScoped<EventSyncImportFilter>();

SgfDevs/Views/Group.cshtml

@@ -7,12 +7,13 @@
 @inject PresentationPresenterDisplayService _presentationPresenterDisplayService;
 @inject EventDisplayService _eventDisplayService;
 @{
+    var now = _eventDisplayService.GetCurrentTime();
     var upcomingPresentations = Umbraco.ContentAtRoot().First().Descendants<Presentation>()
         .Where(p => p.Group?.Id == Model.Id)
         .Where(p =>
         {
             var parentEvent = p.Parent<Event>();
-            return parentEvent != null && _eventDisplayService.IsCurrentOrUpcoming(parentEvent.Date, DateTime.Now);
+            return parentEvent != null && _eventDisplayService.IsCurrentOrUpcoming(parentEvent.Date, now);
         })
         .OrderBy(p => p.Parent<Event>()!.Date);
     var leaders = (Model.Leaders ?? []).ToArray();

SgfDevs/Views/Home.cshtml

@@ -14,11 +14,12 @@
 
 @{
     Layout = "_Layout";
+    var now = _eventDisplayService.GetCurrentTime();
     //var mapper = AutoMapperConfig.Configure();
-    var visibleDevNights = _eventDisplayService.GetCurrentAndUpcomingEvents(Model.Descendants<Event>(), d => d.Date, DateTime.Now);
+    var visibleDevNights = _eventDisplayService.GetCurrentAndUpcomingEvents(Model.Descendants<Event>(), d => d.Date, now);
     var nextDevNight = visibleDevNights.FirstOrDefault();
     var upcomingDevNights = visibleDevNights.Skip(1).ToList();
-    var communityEvents = Model.Descendants<CommunityEvent>().Where(d => d.StartTime > DateTime.Today).OrderBy(d => d.StartTime).ToList();
+    var communityEvents = Model.Descendants<CommunityEvent>().Where(d => d.StartTime > now.Date).OrderBy(d => d.StartTime).ToList();
     var allUpcomingEvents = new List<Event>();
 
     var allMembers = _directoryHelper.GetAllMembers().ToList();