diff --git a/SpotiParty.Web/Components/Pages/EnqueuePage.razor.cs b/SpotiParty.Web/Components/Pages/EnqueuePage.razor.cs index c26440c..fd5bb99 100644 --- a/SpotiParty.Web/Components/Pages/EnqueuePage.razor.cs +++ b/SpotiParty.Web/Components/Pages/EnqueuePage.razor.cs @@ -6,7 +6,7 @@ using SpotiParty.Web.Services; namespace SpotiParty.Web.Components.Pages; -public partial class EnqueuePage(AuthorizationHandler authHandler, NavigationManager navigator, DatabaseContext context) : ComponentBase { +public partial class EnqueuePage(AuthorizationHandler authHandler, NavigationManager navigator, DatabaseContext context, DashboardAuthHandler authContext) : ComponentBase { [Parameter] public string EventId { get; set; } = string.Empty; @@ -42,8 +42,10 @@ public partial class EnqueuePage(AuthorizationHandler authHandler, NavigationMan StateHasChanged(); + var currentUser = await authContext.GetCurrentUser(); + var now = DateTime.Now; - if (_event.Start > now || _event.End < now) { + if ((_event.Start > now || _event.End < now) && currentUser?.UserId != _event.Host.UserId) { navigator.NavigateTo("/", forceLoad: true); return; } diff --git a/SpotiParty.Web/DatabaseContext.cs b/SpotiParty.Web/DatabaseContext.cs index 831b9a5..aef8346 100644 --- a/SpotiParty.Web/DatabaseContext.cs +++ b/SpotiParty.Web/DatabaseContext.cs @@ -8,5 +8,13 @@ public class DatabaseContext(DbContextOptions options) : DbCont public DbSet Users { get; set; } public DbSet Events { get; set; } - + + protected override void OnModelCreating(ModelBuilder modelBuilder) { + base.OnModelCreating(modelBuilder); + + modelBuilder.Entity() + .HasOne(e => e.Host) + .WithMany() + .OnDelete(DeleteBehavior.Cascade); + } } \ No newline at end of file diff --git a/SpotiParty.Web/Migrations/20260123185122_Delete_handling.cs b/SpotiParty.Web/Migrations/20260123185122_Delete_handling.cs new file mode 100644 index 0000000..7e0b6dc --- /dev/null +++ b/SpotiParty.Web/Migrations/20260123185122_Delete_handling.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SpotiParty.Web.Migrations +{ + /// + public partial class Delete_handling : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/SpotiParty.Web/Migrations/DatabaseContextModelSnapshot.cs b/SpotiParty.Web/Migrations/DatabaseContextModelSnapshot.cs index 27f4f56..7e9fbf3 100644 --- a/SpotiParty.Web/Migrations/DatabaseContextModelSnapshot.cs +++ b/SpotiParty.Web/Migrations/DatabaseContextModelSnapshot.cs @@ -46,7 +46,7 @@ namespace SpotiParty.Web.Migrations b.HasIndex("host"); - b.ToTable("Events", (string)null); + b.ToTable("Events"); }); modelBuilder.Entity("SpotiParty.Web.Models.User", b => @@ -75,7 +75,7 @@ namespace SpotiParty.Web.Migrations b.HasKey("UserId"); - b.ToTable("Users", (string)null); + b.ToTable("Users"); }); modelBuilder.Entity("SpotiParty.Web.Models.Event", b => diff --git a/SpotiParty.Web/Program.cs b/SpotiParty.Web/Program.cs index 3f5c901..2dff749 100644 --- a/SpotiParty.Web/Program.cs +++ b/SpotiParty.Web/Program.cs @@ -26,6 +26,7 @@ builder.Services.AddDbContextFactory(options => { options.UseNpgsql(builder.Configuration.GetConnectionString("SpotiParty")); }); builder.Services.AddScoped(); +builder.Services.AddHostedService(); builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -62,7 +63,19 @@ builder.Services.AddHopFrame(config => { table.Property(e => e.Host) .List(false) .SetEditable(false) - .SetCreatable(false); + .SetCreatable(false) + .SetDisplayedProperty(u => u.DisplayName); + + table.Property(e => e.Name) + .SetValidator((name, _) => { + if (string.IsNullOrWhiteSpace(name)) + return ["Name cannot be empty"]; + + return []; + }); + + var innerConf = table.Property(e => e.Name).InnerConfig; + innerConf.GetType().GetProperty(nameof(innerConf.IsRequired))!.SetValue(innerConf, true); table.ShowSearchSuggestions(false); }); diff --git a/SpotiParty.Web/Services/AdminDashboardPlugin.cs b/SpotiParty.Web/Services/AdminDashboardPlugin.cs index f750b52..ce998b8 100644 --- a/SpotiParty.Web/Services/AdminDashboardPlugin.cs +++ b/SpotiParty.Web/Services/AdminDashboardPlugin.cs @@ -1,4 +1,5 @@ using HopFrame.Core.Config; +using HopFrame.Web.Components.Pages; using HopFrame.Web.Plugins.Events; using Microsoft.AspNetCore.Components; using Microsoft.FluentUI.AspNetCore.Components; @@ -6,10 +7,12 @@ using SpotiParty.Web.Models; namespace SpotiParty.Web.Services; -public class AdminDashboardPlugin(NavigationManager navigator) { +public class AdminDashboardPlugin(NavigationManager navigator, DashboardAuthHandler auth, EventsDashboardRepo repo) { + + private HopFrameTablePage _page; [HopFrame.Web.Plugins.Annotations.EventHandler] - public void OnTableInitialized(TableInitializedEvent e) { + public async Task OnTableInitialized(TableInitializedEvent e) { if (e.Table.TableType != typeof(Event)) return; e.AddEntityButton(new IconInfo { @@ -17,11 +20,27 @@ public class AdminDashboardPlugin(NavigationManager navigator) { Size = IconSize.Size16, Name = "Open" }, OnButtonClicked); + + var user = await auth.GetCurrentUser(); + + if (user is not null && user.IsAdmin) { + e.AddPageButton("Show all", ToggleAllEvents); + } + + _page = e.Sender; } private void OnButtonClicked(object o, TableConfig config) { var entity = (Event)o; navigator.NavigateTo(navigator.BaseUri + $"enqueue/{entity.Id}"); } + + private async Task ToggleAllEvents() { + if (repo.ShowAllEvents) + return; + + repo.ShowAllEvents = true; + await _page.Reload(); + } } \ No newline at end of file diff --git a/SpotiParty.Web/Services/CleanupService.cs b/SpotiParty.Web/Services/CleanupService.cs new file mode 100644 index 0000000..f63051d --- /dev/null +++ b/SpotiParty.Web/Services/CleanupService.cs @@ -0,0 +1,27 @@ +using Microsoft.EntityFrameworkCore; + +namespace SpotiParty.Web.Services; + +public class CleanupService(IServiceProvider services, ILogger logger) : BackgroundService { + protected override async Task ExecuteAsync(CancellationToken stoppingToken) { + while (!stoppingToken.IsCancellationRequested) { + await using (var scope = services.CreateAsyncScope()) { + var context = scope.ServiceProvider.GetRequiredService(); + + var now = DateTime.Now; + var oldEvents = await context.Events + .Where(e => e.End < now) + .ToArrayAsync(stoppingToken); + + context.Events.RemoveRange(oldEvents); + await context.SaveChangesAsync(stoppingToken); + + if (oldEvents.Length > 0) + logger.LogInformation("Deleted {count} old events", oldEvents.Length); + } + + var nextRun = DateTime.Today.AddDays(1).AddHours(3) - DateTime.Now; + await Task.Delay(nextRun, stoppingToken); + } + } +} \ No newline at end of file diff --git a/SpotiParty.Web/Services/EventsDashboardRepo.cs b/SpotiParty.Web/Services/EventsDashboardRepo.cs index d667294..5327d49 100644 --- a/SpotiParty.Web/Services/EventsDashboardRepo.cs +++ b/SpotiParty.Web/Services/EventsDashboardRepo.cs @@ -6,22 +6,48 @@ namespace SpotiParty.Web.Services; public class EventsDashboardRepo(DatabaseContext context, DashboardAuthHandler handler, IDbContextFactory factory) : IHopFrameRepository { + public bool ShowAllEvents { get; set; } = false; + public async Task> LoadPage(int page, int perPage) { var user = await handler.GetCurrentUser(); if (user is null) return []; - return await context.Events + IQueryable baseQuery = context.Events .Include(e => e.Host) - .OrderBy(e => e.Id) - .Where(e => e.Host.UserId == user.UserId) + .OrderBy(e => e.Id); + + if (!ShowAllEvents) { + baseQuery = baseQuery.Where(e => e.Host.UserId == user.UserId); + } + + return await baseQuery .Skip(page * perPage) .Take(perPage) .ToListAsync(); } public async Task> Search(string searchTerm, int page, int perPage) { - var entries = await LoadPage(page, perPage); - return new(entries, await GetTotalPageCount(perPage)); + var user = await handler.GetCurrentUser(); + if (user is null) return new(Enumerable.Empty(), 0); + + IQueryable baseQuery = context.Events + .Include(e => e.Host) + .OrderBy(e => e.Id); + + if (!ShowAllEvents) { + baseQuery = baseQuery.Where(e => e.Host.UserId == user.UserId); + } + + baseQuery = baseQuery + .Where(e => e.Name.ToLower().Contains(searchTerm.ToLower())); + + var totalEntries = await baseQuery.CountAsync(); + var entries = await baseQuery + .Skip(page * perPage) + .Take(perPage) + .ToListAsync(); + + return new(entries, (int)Math.Ceiling(totalEntries / (double)perPage)); } public async Task GetTotalPageCount(int perPage) {