henry
/
AccessQueueService
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix #2 - RequestsAhead not recalculating correctly' (#3) from requests-ahead-bug into main 

Reviewed-on: https://git.hobbs.zone/henry/AccessQueueService/pulls/3
This commit is contained in:
henry 2025-05-12 22:22:41 +00:00
parent c04a603d56 7d4c6ab16c
commit 036168359b
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AccessQueueService/Data/DictionaryAccessQueueRepo.cs
View File

@ -12,7 +12,7 @@ namespace AccessQueueService.Data
public int GetActiveTicketsCount(DateTime activeCutoff) => _accessTickets
.Count(t => t.Value.ExpiresOn > DateTime.UtcNow && t.Value.LastActive >activeCutoff);
public int GetQueueCount() => _accessQueue.Count;
public int IndexOfTicket(Guid userId)
public int GetRequestsAhead(Guid userId)
{
var index = 0;
foreach (var ticket in _accessQueue)

2
AccessQueueService/Data/IAccessQueueRepo.cs
View File

@ -10,7 +10,7 @@ namespace AccessQueueService.Data
public int GetQueueCount();
public AccessTicket? GetTicket(Guid userId);
public void UpsertTicket(AccessTicket ticket);
public int IndexOfTicket(Guid userId);
public int GetRequestsAhead(Guid userId);
public void Enqueue(AccessTicket ticket);
public int DeleteExpiredTickets();
public bool RemoveUser(Guid userId);

7
AccessQueueService/Services/AccessService.cs
View File

@ -68,9 +68,8 @@ namespace AccessQueueService.Services
}
else
{
var indexOfTicket = _accessQueueRepo.IndexOfTicket(userId);
var requestsAhead = _accessQueueRepo.GetQueueCount() - indexOfTicket - 1;
if (indexOfTicket == -1)
var requestsAhead = _accessQueueRepo.GetRequestsAhead(userId);
if (requestsAhead == -1)
{
_accessQueueRepo.Enqueue(new AccessTicket
{
@ -82,7 +81,7 @@ namespace AccessQueueService.Services
return new AccessResponse
{
ExpiresOn = null,
RequestsAhead = requestsAhead
RequestsAhead = _accessQueueRepo.GetQueueCount() - 1
};
}
}

13
AccessQueueServiceTests/AccessServiceTests.cs
View File

@ -245,6 +245,19 @@ namespace AccessQueueServiceTests
Assert.Equal(0, response.RequestsAhead);
}
[Fact]
public async Task RequestAccess_ShouldShowCorrectRequestsAhead_WhenAccessRerequested()
{
for (int i = 0; i < CAP_LIMIT + 3; i++)
{
await _accessService.RequestAccess(Guid.NewGuid());
}
var id = Guid.NewGuid();
var response = await _accessService.RequestAccess(id);
Assert.Equal(3, response.RequestsAhead);
response = await _accessService.RequestAccess(id);
Assert.Equal(3, response?.RequestsAhead);
}
}
}
}