use maredbcontext from controller

This commit is contained in:
rootdarkarchon
2023-09-17 03:30:43 +02:00
committed by Loporrit
parent 3cfe6fbdee
commit b2e4b99b10
2 changed files with 13 additions and 12 deletions

View File

@@ -1,4 +1,5 @@
using MareSynchronos.API.Routes;
using MareSynchronosShared.Data;
using MareSynchronosStaticFilesServer.Services;
using Microsoft.AspNetCore.Mvc;
@@ -9,12 +10,14 @@ public class RequestController : ControllerBase
{
private readonly CachedFileProvider _cachedFileProvider;
private readonly RequestQueueService _requestQueue;
private readonly MareDbContext _mareDbContext;
private static readonly SemaphoreSlim _parallelRequestSemaphore = new(500);
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue) : base(logger)
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue, MareDbContext mareDbContext) : base(logger)
{
_cachedFileProvider = cachedFileProvider;
_requestQueue = requestQueue;
_mareDbContext = mareDbContext;
}
[HttpGet]
@@ -48,7 +51,7 @@ public class RequestController : ControllerBase
}
Guid g = Guid.NewGuid();
await _requestQueue.EnqueueUser(new(g, MareUser, files.ToList()));
await _requestQueue.EnqueueUser(new(g, MareUser, files.ToList()), _mareDbContext);
return Ok(g);
}
@@ -65,8 +68,8 @@ public class RequestController : ControllerBase
{
try
{
if (!await _requestQueue.StillEnqueued(requestId, MareUser))
await _requestQueue.EnqueueUser(new(requestId, MareUser, files.ToList()));
if (!await _requestQueue.StillEnqueued(requestId, MareUser, _mareDbContext))
await _requestQueue.EnqueueUser(new(requestId, MareUser, files.ToList()), _mareDbContext);
return Ok();
}
catch (OperationCanceledException) { return BadRequest(); }