AccessQueuePlayground/Components/Pages/Home.razor

@@ -7,11 +7,9 @@
 
 <PageTitle>AccessQueue Playground</PageTitle>
 
-<p>
+<Button Color="ButtonColor.Success" @onclick="AddUser">Add User</Button>
-	<Button Color="ButtonColor.Success" @onclick="AddUser">Add User</Button>
+<Button Color="ButtonColor.Primary" @onclick="Refresh">Refresh</Button>
-	<Button Color="ButtonColor.Danger" @onclick="RevokeAllAccess">Revoke All</Button>
+
-	<Button Color="ButtonColor.Warning" @onclick="Reset">Reset Data</Button>
-</p>
 @if (Status != null)
 {
 	<h2>Users with access</h2>
@@ -25,33 +23,23 @@
 			</GridColumn>
 			<GridColumn TItem="User" HeaderText="Active">
 				<ChildContent>
-					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(value) => SetUserActive(context.Id, value)" />
+					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(_) => ToggleUserActive(context.Id)" />
-				</ChildContent>
-			</GridColumn>
-			<GridColumn TItem="User" HeaderText="Revoke">
-				<ChildContent>
-					<Button Color="ButtonColor.Danger" @onclick="() => RevokeAccess(context.Id)">Revoke Access</Button>
 				</ChildContent>
 			</GridColumn>
 		</GridColumns>
 	</Grid>
 	<h2>Users in queue</h2>
-	<Grid TItem="User" Data="Status.QueuedUsers" Class="table table-bordered mt-3">
+	<Grid TItem="User" Data="Status.QueuedUsers" Class="table table-bordered mt-3" AllowSorting>
 		<GridColumns>
-			<GridColumn TItem="User" HeaderText="Id" PropertyName="Id">
+			<GridColumn TItem="User" HeaderText="Id" PropertyName="Id" SortKeySelector="item => item.Id">
 				@context.Id
 			</GridColumn>
-			<GridColumn TItem="User" HeaderText="Queue Postition" PropertyName="LatestResponse?.RequestsAhead">
+			<GridColumn TItem="User" HeaderText="Queue Postition" PropertyName="LatestResponse?.RequestsAhead" SortKeySelector="item => item.LatestResponse.RequestsAhead">
 				@(context.LatestResponse?.RequestsAhead ?? 0 + 1)
 			</GridColumn>
 			<GridColumn TItem="User" HeaderText="Active">
 				<ChildContent>
-					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(value) => SetUserActive(context.Id, value)" />
+					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(_) => ToggleUserActive(context.Id)" />
-				</ChildContent>
-			</GridColumn>
-			<GridColumn TItem="User" HeaderText="Revoke">
-				<ChildContent>
-					<Button Color="ButtonColor.Danger" @onclick="() => RevokeAccess(context.Id)">Revoke Access</Button>
 				</ChildContent>
 			</GridColumn>
 		</GridColumns>
@@ -64,7 +52,7 @@
 			</GridColumn>
 			<GridColumn TItem="User" HeaderText="Active">
 				<ChildContent>
-					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(value) => SetUserActive(context.Id, value)" />
+					<Switch Value="context.Active" ValueExpression="() => context.Active" ValueChanged="(_) => ToggleUserActive(context.Id)" />
 				</ChildContent>
 			</GridColumn>
 		</GridColumns>
@@ -89,29 +77,19 @@
 		});
 	}
 
+	public void Refresh()
+	{
+		Status = Manager.GetStatus();
+	}
+
 	public void AddUser()
 	{
 		Manager.AddUser();
 		Status = Manager.GetStatus();
 	}
 
-	public void SetUserActive(Guid userId, bool isActive)
+	public void ToggleUserActive(Guid userId)
 	{
-		Manager.SetUserActive(userId, isActive);
+		Manager.ToggleUserActivity(userId);
-	}
-
-	public void RevokeAccess(Guid userId)
-	{
-		Manager.RevokeAccess(userId);
-	}
-
-	public void RevokeAllAccess()
-	{
-		Manager.RevokeAllAccess();
-	}
-
-	public void Reset()
-	{
-		Manager.Reset();
 	}
 }

AccessQueuePlayground/Services/AccessQueueBackgroundService.cs

@@ -17,17 +17,9 @@ namespace AccessQueuePlayground.Services
         {
             while (!stoppingToken.IsCancellationRequested)
             {
-                try
+                await _accessQueueManager.RecalculateStatus();
-                {
+                await Task.Delay(1000, stoppingToken); // Run every second
-                    await _accessQueueManager.RecalculateStatus();
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine(ex);
-                }
-                await Task.Delay(100, stoppingToken); // Run every second
             }
-            Console.WriteLine("Stopping now because who tf knows why");
         }
     }
 }

AccessQueuePlayground/Services/AccessQueueManager.cs

@@ -8,7 +8,7 @@ namespace AccessQueuePlayground.Services
     public class AccessQueueManager : IAccessQueueManager
     {
         private readonly IAccessService _accessService;
-        private ConcurrentDictionary<Guid, User> _users;
+        private readonly ConcurrentDictionary<Guid, User> _users;
         private AccessQueueStatus _status;
         public event Action? StatusUpdated;
 
@@ -32,16 +32,17 @@ namespace AccessQueuePlayground.Services
             _users[id] = new User
             {
                 Id = id,
-                Active = false,
+                Active = true,
             };
             return id;
         }
 
-        public void SetUserActive(Guid userId, bool isActive)
+        public void ToggleUserActivity(Guid userId)
         {
-            if (_users.TryGetValue(userId, out var user))
+            var user = _users[userId];
+            if (user != null)
             {
-                user.Active = isActive;
+                user.Active = !user.Active;
             }
         }
 
@@ -75,31 +76,8 @@ namespace AccessQueuePlayground.Services
                     }
                 }
             }
-            newStatus.QueuedUsers.Sort((user1, user2) => user1.LatestResponse!.RequestsAhead - user2.LatestResponse!.RequestsAhead);
             _status = newStatus;
             NotifyStatusUpdated();
         }
-
-        public void RevokeAccess(Guid userId)
-        {
-            var user = _users[userId];
-            user.Active = false;
-            user.LatestResponse = null;
-            _accessService.RevokeAccess(userId);
-        }
-
-        public void RevokeAllAccess()
-        {
-            foreach (var user in _users.Values)
-            {
-                RevokeAccess(user.Id);
-            }
-        }
-
-        public void Reset()
-        {
-            RevokeAllAccess();
-            _users = [];
-        }
     }
 }

AccessQueuePlayground/Services/IAccessQueueManager.cs

@@ -8,10 +8,7 @@ namespace AccessQueuePlayground.Services
         public Task RecalculateStatus();
         public AccessQueueStatus GetStatus();
         public Guid AddUser();
-        public void SetUserActive(Guid userId, bool isActive);
+        public void ToggleUserActivity(Guid userId);
-        public void RevokeAccess(Guid userId);
-        public void RevokeAllAccess();
-        public void Reset();
 
     }
 }

AccessQueueService/Data/TakeANumberAccessQueueRepo.cs

@@ -68,10 +68,11 @@ namespace AccessQueueService.Data
             int filledSpots = 0;
             while (filledSpots < openSpots && _nowServing < _nextUnusedTicket)
             {
-                if (_accessQueue.TryGetValue(_nowServing++, out var nextUser))
+                if (_accessQueue.TryGetValue(_nowServing, out var nextUser))
                 {
                     _accessQueue.Remove(_nowServing);
                     _queueNumbers.Remove(nextUser.UserId);
+                    _nowServing++;
                     if (nextUser.LastActive < activeCutoff)
                     {
                         // User is inactive, throw away their ticket

AccessQueueService/Services/AccessService.cs

@@ -8,6 +8,8 @@ namespace AccessQueueService.Services
         private readonly IConfiguration _configuration;
         private readonly IAccessQueueRepo _accessQueueRepo;
 
+        //private readonly Dictionary<Guid, AccessTicket> _accessTickets = new();
+        //private readonly Queue<AccessTicket> _accessQueue = new();
         private readonly SemaphoreSlim _queueLock = new(1, 1);
         private readonly int EXP_SECONDS;
         private readonly int ACT_SECONDS;