From 44a3628489ce6a34398e4caaee52423897ff3a1b Mon Sep 17 00:00:00 2001 From: henry Date: Sun, 11 May 2025 20:38:02 -0400 Subject: [PATCH 1/3] wip - adding demo front-end to play with access service --- .../AccessQueuePlayground.csproj | 17 +++++ AccessQueuePlayground/Components/App.razor | 23 +++++++ .../Components/Layout/MainLayout.razor | 9 +++ .../Components/Layout/MainLayout.razor.css | 18 +++++ .../Components/Pages/Error.razor | 36 ++++++++++ .../Components/Pages/Home.razor | 51 ++++++++++++++ AccessQueuePlayground/Components/Routes.razor | 6 ++ .../Components/_Imports.razor | 10 +++ .../Models/AccessQueueStatus.cs | 12 ++++ AccessQueuePlayground/Models/User.cs | 11 +++ AccessQueuePlayground/Program.cs | 34 ++++++++++ .../Properties/launchSettings.json | 38 +++++++++++ .../Services/AccessQueueBackgroundService.cs | 25 +++++++ .../Services/AccessQueueManager.cs | 67 +++++++++++++++++++ .../Services/IAccessQueueManager.cs | 14 ++++ .../appsettings.Development.json | 8 +++ AccessQueuePlayground/appsettings.json | 15 +++++ AccessQueuePlayground/wwwroot/app.css | 29 ++++++++ AccessQueueService.sln | 6 ++ 19 files changed, 429 insertions(+) create mode 100644 AccessQueuePlayground/AccessQueuePlayground.csproj create mode 100644 AccessQueuePlayground/Components/App.razor create mode 100644 AccessQueuePlayground/Components/Layout/MainLayout.razor create mode 100644 AccessQueuePlayground/Components/Layout/MainLayout.razor.css create mode 100644 AccessQueuePlayground/Components/Pages/Error.razor create mode 100644 AccessQueuePlayground/Components/Pages/Home.razor create mode 100644 AccessQueuePlayground/Components/Routes.razor create mode 100644 AccessQueuePlayground/Components/_Imports.razor create mode 100644 AccessQueuePlayground/Models/AccessQueueStatus.cs create mode 100644 AccessQueuePlayground/Models/User.cs create mode 100644 AccessQueuePlayground/Program.cs create mode 100644 AccessQueuePlayground/Properties/launchSettings.json create mode 100644 AccessQueuePlayground/Services/AccessQueueBackgroundService.cs create mode 100644 AccessQueuePlayground/Services/AccessQueueManager.cs create mode 100644 AccessQueuePlayground/Services/IAccessQueueManager.cs create mode 100644 AccessQueuePlayground/appsettings.Development.json create mode 100644 AccessQueuePlayground/appsettings.json create mode 100644 AccessQueuePlayground/wwwroot/app.css diff --git a/AccessQueuePlayground/AccessQueuePlayground.csproj b/AccessQueuePlayground/AccessQueuePlayground.csproj new file mode 100644 index 0000000..4a7df85 --- /dev/null +++ b/AccessQueuePlayground/AccessQueuePlayground.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + diff --git a/AccessQueuePlayground/Components/App.razor b/AccessQueuePlayground/Components/App.razor new file mode 100644 index 0000000..58fede0 --- /dev/null +++ b/AccessQueuePlayground/Components/App.razor @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AccessQueuePlayground/Components/Layout/MainLayout.razor b/AccessQueuePlayground/Components/Layout/MainLayout.razor new file mode 100644 index 0000000..0fd1b20 --- /dev/null +++ b/AccessQueuePlayground/Components/Layout/MainLayout.razor @@ -0,0 +1,9 @@ +@inherits LayoutComponentBase + +@Body + +
+ An unhandled error has occurred. + Reload + 🗙 +
diff --git a/AccessQueuePlayground/Components/Layout/MainLayout.razor.css b/AccessQueuePlayground/Components/Layout/MainLayout.razor.css new file mode 100644 index 0000000..df8c10f --- /dev/null +++ b/AccessQueuePlayground/Components/Layout/MainLayout.razor.css @@ -0,0 +1,18 @@ +#blazor-error-ui { + background: lightyellow; + bottom: 0; + box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + display: none; + left: 0; + padding: 0.6rem 1.25rem 0.7rem 1.25rem; + position: fixed; + width: 100%; + z-index: 1000; +} + + #blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; + } diff --git a/AccessQueuePlayground/Components/Pages/Error.razor b/AccessQueuePlayground/Components/Pages/Error.razor new file mode 100644 index 0000000..576cc2d --- /dev/null +++ b/AccessQueuePlayground/Components/Pages/Error.razor @@ -0,0 +1,36 @@ +@page "/Error" +@using System.Diagnostics + +Error + +

Error.

+

An error occurred while processing your request.

+ +@if (ShowRequestId) +{ +

+ Request ID: @RequestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

+ +@code{ + [CascadingParameter] + private HttpContext? HttpContext { get; set; } + + private string? RequestId { get; set; } + private bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + + protected override void OnInitialized() => + RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier; +} diff --git a/AccessQueuePlayground/Components/Pages/Home.razor b/AccessQueuePlayground/Components/Pages/Home.razor new file mode 100644 index 0000000..eb3d92e --- /dev/null +++ b/AccessQueuePlayground/Components/Pages/Home.razor @@ -0,0 +1,51 @@ +@page "/" +@using AccessQueuePlayground.Models +@using AccessQueuePlayground.Services +@using BlazorBootstrap + +@inject IAccessQueueManager Manager + +AccessQueue Playground + + + + +@if(Status != null) +{ + @foreach(var user in Status.Users) + { +
+

@user.Id @user.LatestResponse?.HasAccess @user.LatestResponse?.ExpiresOn

+
+ } +} + +@code { + public AccessQueueStatus? Status; + + protected override void OnInitialized() + { + Manager.StatusUpdated += OnStatusUpdated; + Status = Manager.GetStatus(); + } + + private void OnStatusUpdated() + { + InvokeAsync(() => + { + Status = Manager.GetStatus(); + StateHasChanged(); + }); + } + + public void Refresh() + { + Status = Manager.GetStatus(); + } + + public void AddUser() + { + Manager.AddUser(); + Status = Manager.GetStatus(); + } +} \ No newline at end of file diff --git a/AccessQueuePlayground/Components/Routes.razor b/AccessQueuePlayground/Components/Routes.razor new file mode 100644 index 0000000..f756e19 --- /dev/null +++ b/AccessQueuePlayground/Components/Routes.razor @@ -0,0 +1,6 @@ + + + + + + diff --git a/AccessQueuePlayground/Components/_Imports.razor b/AccessQueuePlayground/Components/_Imports.razor new file mode 100644 index 0000000..4559e04 --- /dev/null +++ b/AccessQueuePlayground/Components/_Imports.razor @@ -0,0 +1,10 @@ +@using System.Net.Http +@using System.Net.Http.Json +@using Microsoft.AspNetCore.Components.Forms +@using Microsoft.AspNetCore.Components.Routing +@using Microsoft.AspNetCore.Components.Web +@using static Microsoft.AspNetCore.Components.Web.RenderMode +@using Microsoft.AspNetCore.Components.Web.Virtualization +@using Microsoft.JSInterop +@using AccessQueuePlayground +@using AccessQueuePlayground.Components diff --git a/AccessQueuePlayground/Models/AccessQueueStatus.cs b/AccessQueuePlayground/Models/AccessQueueStatus.cs new file mode 100644 index 0000000..9b36ca8 --- /dev/null +++ b/AccessQueuePlayground/Models/AccessQueueStatus.cs @@ -0,0 +1,12 @@ +using AccessQueueService.Models; + +namespace AccessQueuePlayground.Models +{ + public class AccessQueueStatus + { + public List Users { get; set; } = []; + public int QueueSize { get; set; } + public int ActiveTickets { get; set; } + public int UnexpiredTickets { get; set; } + } +} diff --git a/AccessQueuePlayground/Models/User.cs b/AccessQueuePlayground/Models/User.cs new file mode 100644 index 0000000..e005ed9 --- /dev/null +++ b/AccessQueuePlayground/Models/User.cs @@ -0,0 +1,11 @@ +using AccessQueueService.Models; + +namespace AccessQueuePlayground.Models +{ + public class User + { + public Guid Id { get; set; } + public bool Active { get; set; } + public AccessResponse? LatestResponse { get; set; } + } +} diff --git a/AccessQueuePlayground/Program.cs b/AccessQueuePlayground/Program.cs new file mode 100644 index 0000000..f6cb0b6 --- /dev/null +++ b/AccessQueuePlayground/Program.cs @@ -0,0 +1,34 @@ +using AccessQueuePlayground.Components; +using AccessQueuePlayground.Services; +using AccessQueueService.Data; +using AccessQueueService.Services; + +var builder = WebApplication.CreateBuilder(args); + +// Add services to the container. +builder.Services.AddRazorComponents() + .AddInteractiveServerComponents(); +builder.Services.AddSingleton(); +builder.Services.AddSingleton(); +builder.Services.AddSingleton(); +builder.Services.AddHostedService(); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (!app.Environment.IsDevelopment()) +{ + app.UseExceptionHandler("/Error", createScopeForErrors: true); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); +} + +app.UseHttpsRedirection(); + +app.UseStaticFiles(); +app.UseAntiforgery(); + +app.MapRazorComponents() + .AddInteractiveServerRenderMode(); + +app.Run(); diff --git a/AccessQueuePlayground/Properties/launchSettings.json b/AccessQueuePlayground/Properties/launchSettings.json new file mode 100644 index 0000000..f310682 --- /dev/null +++ b/AccessQueuePlayground/Properties/launchSettings.json @@ -0,0 +1,38 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:25310", + "sslPort": 44353 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5108", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7211;http://localhost:5108", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } + } diff --git a/AccessQueuePlayground/Services/AccessQueueBackgroundService.cs b/AccessQueuePlayground/Services/AccessQueueBackgroundService.cs new file mode 100644 index 0000000..77765ce --- /dev/null +++ b/AccessQueuePlayground/Services/AccessQueueBackgroundService.cs @@ -0,0 +1,25 @@ +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; + +namespace AccessQueuePlayground.Services +{ + public class AccessQueueBackgroundService : BackgroundService + { + private readonly IAccessQueueManager _accessQueueManager; + + public AccessQueueBackgroundService(IAccessQueueManager accessQueueManager) + { + _accessQueueManager = accessQueueManager; + } + + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + while (!stoppingToken.IsCancellationRequested) + { + await _accessQueueManager.RecalculateStatus(); + await Task.Delay(1000, stoppingToken); // Run every second + } + } + } +} diff --git a/AccessQueuePlayground/Services/AccessQueueManager.cs b/AccessQueuePlayground/Services/AccessQueueManager.cs new file mode 100644 index 0000000..8490d51 --- /dev/null +++ b/AccessQueuePlayground/Services/AccessQueueManager.cs @@ -0,0 +1,67 @@ +using System.Collections.Concurrent; +using AccessQueuePlayground.Models; +using AccessQueueService.Models; +using AccessQueueService.Services; + +namespace AccessQueuePlayground.Services +{ + public class AccessQueueManager : IAccessQueueManager + { + private readonly IAccessService _accessService; + private readonly ConcurrentDictionary _users; + private AccessQueueStatus _status; + public event Action? StatusUpdated; + + private void NotifyStatusUpdated() + { + StatusUpdated?.Invoke(); + } + + public AccessQueueManager(IAccessService accessService) + { + _accessService = accessService; + _users = new ConcurrentDictionary(); + _status = new AccessQueueStatus(); + } + + public AccessQueueStatus GetStatus() => _status; + + public Guid AddUser() + { + var id = Guid.NewGuid(); + _users[id] = new User + { + Id = id, + Active = true, + }; + return id; + } + + public void ToggleUserActivity(Guid userId) + { + var user = _users[userId]; + if (user != null) + { + user.Active = !user.Active; + } + } + + public async Task RecalculateStatus() + { + var userList = _users.Values.ToList(); + var newStatus = new AccessQueueStatus(); + foreach (var user in userList) + { + AccessResponse? response = user.LatestResponse; + if (user.Active) + { + response = await _accessService.RequestAccess(user.Id); + user.LatestResponse = response; + } + newStatus.Users.Add(user); + } + _status = newStatus; + NotifyStatusUpdated(); + } + } +} diff --git a/AccessQueuePlayground/Services/IAccessQueueManager.cs b/AccessQueuePlayground/Services/IAccessQueueManager.cs new file mode 100644 index 0000000..29f6b3f --- /dev/null +++ b/AccessQueuePlayground/Services/IAccessQueueManager.cs @@ -0,0 +1,14 @@ +using AccessQueuePlayground.Models; + +namespace AccessQueuePlayground.Services +{ + public interface IAccessQueueManager + { + public event Action? StatusUpdated; + public Task RecalculateStatus(); + public AccessQueueStatus GetStatus(); + public Guid AddUser(); + public void ToggleUserActivity(Guid userId); + + } +} diff --git a/AccessQueuePlayground/appsettings.Development.json b/AccessQueuePlayground/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/AccessQueuePlayground/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/AccessQueuePlayground/appsettings.json b/AccessQueuePlayground/appsettings.json new file mode 100644 index 0000000..79dbb33 --- /dev/null +++ b/AccessQueuePlayground/appsettings.json @@ -0,0 +1,15 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AccessQueue": { + "CapacityLimit": 10, // Maximum number of active users + "ActivitySeconds": 5, // Time since last access before a user is considered inactive + "ExpirationSeconds": 30, // 12 hours - Time before a user access is revoked + "RollingExpiration": true // Whether to extend expiration time on access + }, + "AllowedHosts": "*" +} diff --git a/AccessQueuePlayground/wwwroot/app.css b/AccessQueuePlayground/wwwroot/app.css new file mode 100644 index 0000000..e398853 --- /dev/null +++ b/AccessQueuePlayground/wwwroot/app.css @@ -0,0 +1,29 @@ +h1:focus { + outline: none; +} + +.valid.modified:not([type=checkbox]) { + outline: 1px solid #26b050; +} + +.invalid { + outline: 1px solid #e50000; +} + +.validation-message { + color: #e50000; +} + +.blazor-error-boundary { + background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; + padding: 1rem 1rem 1rem 3.7rem; + color: white; +} + + .blazor-error-boundary::after { + content: "An error has occurred." + } + +.darker-border-checkbox.form-check-input { + border-color: #929292; +} diff --git a/AccessQueueService.sln b/AccessQueueService.sln index a3ecab9..82ba322 100644 --- a/AccessQueueService.sln +++ b/AccessQueueService.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccessQueueService", "Acces EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccessQueueServiceTests", "AccessQueueServiceTests\AccessQueueServiceTests.csproj", "{1DF48A19-A2B3-4B0C-B726-E65B8E023760}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccessQueuePlayground", "AccessQueuePlayground\AccessQueuePlayground.csproj", "{65D5E841-7B02-4A55-89C6-12082FA1BCAF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {1DF48A19-A2B3-4B0C-B726-E65B8E023760}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DF48A19-A2B3-4B0C-B726-E65B8E023760}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DF48A19-A2B3-4B0C-B726-E65B8E023760}.Release|Any CPU.Build.0 = Release|Any CPU + {65D5E841-7B02-4A55-89C6-12082FA1BCAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65D5E841-7B02-4A55-89C6-12082FA1BCAF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65D5E841-7B02-4A55-89C6-12082FA1BCAF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65D5E841-7B02-4A55-89C6-12082FA1BCAF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- 2.40.1 From d6aa832f6137a93dc1c0c12936cf7b315762c9cd Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 12 May 2025 01:26:31 -0400 Subject: [PATCH 2/3] Split users into separate grids --- .../Components/Pages/Home.razor | 58 ++++++++++++++++--- .../Models/AccessQueueStatus.cs | 7 +-- .../Services/AccessQueueManager.cs | 24 ++++++-- AccessQueuePlayground/appsettings.json | 6 +- 4 files changed, 77 insertions(+), 18 deletions(-) diff --git a/AccessQueuePlayground/Components/Pages/Home.razor b/AccessQueuePlayground/Components/Pages/Home.razor index eb3d92e..a3d4328 100644 --- a/AccessQueuePlayground/Components/Pages/Home.razor +++ b/AccessQueuePlayground/Components/Pages/Home.razor @@ -10,14 +10,53 @@ -@if(Status != null) +@if (Status != null) { - @foreach(var user in Status.Users) - { -
-

@user.Id @user.LatestResponse?.HasAccess @user.LatestResponse?.ExpiresOn

-
- } +

Users with access

+ + + + @context.Id + + + @context.LatestResponse?.ExpiresOn + + + + + + + + +

Users in queue

+ + + + @context.Id + + + @(context.LatestResponse?.RequestsAhead ?? 0 + 1) + + + + + + + + +

Inactive users

+ + + + @context.Id + + + + + + + + } @code { @@ -48,4 +87,9 @@ Manager.AddUser(); Status = Manager.GetStatus(); } + + public void ToggleUserActive(Guid userId) + { + Manager.ToggleUserActivity(userId); + } } \ No newline at end of file diff --git a/AccessQueuePlayground/Models/AccessQueueStatus.cs b/AccessQueuePlayground/Models/AccessQueueStatus.cs index 9b36ca8..c773658 100644 --- a/AccessQueuePlayground/Models/AccessQueueStatus.cs +++ b/AccessQueuePlayground/Models/AccessQueueStatus.cs @@ -4,9 +4,8 @@ namespace AccessQueuePlayground.Models { public class AccessQueueStatus { - public List Users { get; set; } = []; - public int QueueSize { get; set; } - public int ActiveTickets { get; set; } - public int UnexpiredTickets { get; set; } + public List AccessUsers { get; set; } = []; + public List QueuedUsers { get; set; } = []; + public List InactiveUsers { get; set; } = []; } } diff --git a/AccessQueuePlayground/Services/AccessQueueManager.cs b/AccessQueuePlayground/Services/AccessQueueManager.cs index 8490d51..69846b3 100644 --- a/AccessQueuePlayground/Services/AccessQueueManager.cs +++ b/AccessQueuePlayground/Services/AccessQueueManager.cs @@ -52,13 +52,29 @@ namespace AccessQueuePlayground.Services var newStatus = new AccessQueueStatus(); foreach (var user in userList) { - AccessResponse? response = user.LatestResponse; if (user.Active) { - response = await _accessService.RequestAccess(user.Id); - user.LatestResponse = response; + user.LatestResponse = await _accessService.RequestAccess(user.Id); + if (user.LatestResponse?.HasAccess ?? false) + { + newStatus.AccessUsers.Add(user); + } + else + { + newStatus.QueuedUsers.Add(user); + } + } + else + { + if(user.LatestResponse?.ExpiresOn != null && user.LatestResponse.ExpiresOn > DateTime.UtcNow) + { + newStatus.AccessUsers.Add(user); + } + else + { + newStatus.InactiveUsers.Add(user); + } } - newStatus.Users.Add(user); } _status = newStatus; NotifyStatusUpdated(); diff --git a/AccessQueuePlayground/appsettings.json b/AccessQueuePlayground/appsettings.json index 79dbb33..fcc9c4b 100644 --- a/AccessQueuePlayground/appsettings.json +++ b/AccessQueuePlayground/appsettings.json @@ -6,9 +6,9 @@ } }, "AccessQueue": { - "CapacityLimit": 10, // Maximum number of active users - "ActivitySeconds": 5, // Time since last access before a user is considered inactive - "ExpirationSeconds": 30, // 12 hours - Time before a user access is revoked + "CapacityLimit": 3, // Maximum number of active users + "ActivitySeconds": 2, // Time since last access before a user is considered inactive + "ExpirationSeconds": 10, // 12 hours - Time before a user access is revoked "RollingExpiration": true // Whether to extend expiration time on access }, "AllowedHosts": "*" -- 2.40.1 From 42f97fadd3ead18c3971146dda8982654b543f4b Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 12 May 2025 23:37:14 -0400 Subject: [PATCH 3/3] Add sorting for queue and use takeOne implemantation --- AccessQueuePlayground/Components/Pages/Home.razor | 2 +- AccessQueuePlayground/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AccessQueuePlayground/Components/Pages/Home.razor b/AccessQueuePlayground/Components/Pages/Home.razor index a3d4328..33cd1d9 100644 --- a/AccessQueuePlayground/Components/Pages/Home.razor +++ b/AccessQueuePlayground/Components/Pages/Home.razor @@ -34,7 +34,7 @@ @context.Id - + @(context.LatestResponse?.RequestsAhead ?? 0 + 1) diff --git a/AccessQueuePlayground/Program.cs b/AccessQueuePlayground/Program.cs index f6cb0b6..9ad2124 100644 --- a/AccessQueuePlayground/Program.cs +++ b/AccessQueuePlayground/Program.cs @@ -9,7 +9,7 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); builder.Services.AddSingleton(); -builder.Services.AddSingleton(); +builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddHostedService(); -- 2.40.1