aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cache resolved store items in HTTP context

Browse Source
This commit is contained in:
Dennis Reimann
2021-12-16 17:37:19 +01:00
committed by Andrew Camilleri
parent 38ff3e5e89
commit 3a59e2a5c4
13 changed files with 273 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
BTCPayServer/Controllers/PaymentRequestController.cs
View File

@@ -29,7 +29,6 @@ namespace BTCPayServer.Controllers
{
private readonly InvoiceController _InvoiceController;
private readonly UserManager<ApplicationUser> _UserManager;
private readonly StoreRepository _StoreRepository;
private readonly PaymentRequestRepository _PaymentRequestRepository;
private readonly PaymentRequestService _PaymentRequestService;
private readonly EventAggregator _EventAggregator;
@@ -40,7 +39,6 @@ namespace BTCPayServer.Controllers
public PaymentRequestController(
InvoiceController invoiceController,
UserManager<ApplicationUser> userManager,
StoreRepository storeRepository,
PaymentRequestRepository paymentRequestRepository,
PaymentRequestService paymentRequestService,
EventAggregator eventAggregator,
@@ -50,7 +48,6 @@ namespace BTCPayServer.Controllers
{
_InvoiceController = invoiceController;
_UserManager = userManager;
_StoreRepository = storeRepository;
_PaymentRequestRepository = paymentRequestRepository;
_PaymentRequestService = paymentRequestService;
_EventAggregator = eventAggregator;
@@ -81,15 +78,14 @@ namespace BTCPayServer.Controllers
}
[HttpGet("/stores/{storeId}/payment-requests/edit/{payReqId?}")]
public async Task<IActionResult> EditPaymentRequest(string storeId, string payReqId)
public IActionResult EditPaymentRequest(string storeId, string payReqId)
{
var data = await _PaymentRequestRepository.FindPaymentRequest(payReqId, GetUserId());
if (data == null && !string.IsNullOrEmpty(payReqId))
if (CurrentPaymentRequest == null && !string.IsNullOrEmpty(payReqId))
{
return NotFound();
}
return View(nameof(EditPaymentRequest), new UpdatePaymentRequestViewModel(data)
return View(nameof(EditPaymentRequest), new UpdatePaymentRequestViewModel(CurrentPaymentRequest)
{
StoreId = CurrentStore.Id
});
@@ -102,13 +98,12 @@ namespace BTCPayServer.Controllers
_Currencies.GetCurrencyData(viewModel.Currency, false) == null)
ModelState.AddModelError(nameof(viewModel.Currency), "Invalid currency");
var data = await _PaymentRequestRepository.FindPaymentRequest(payReqId, GetUserId());
if (data == null && !string.IsNullOrEmpty(payReqId))
if (CurrentPaymentRequest == null && !string.IsNullOrEmpty(payReqId))
{
return NotFound();
}
if (data?.Archived is true && viewModel.Archived is true)
if (CurrentPaymentRequest?.Archived is true && viewModel.Archived)
{
ModelState.AddModelError(string.Empty, "You cannot edit an archived payment request.");
}
@@ -118,15 +113,11 @@ namespace BTCPayServer.Controllers
return View(nameof(EditPaymentRequest), viewModel);
}
if (data == null)
{
data = new PaymentRequestData();
}
var data = CurrentPaymentRequest ?? new PaymentRequestData();
data.StoreDataId = viewModel.StoreId;
data.Archived = viewModel.Archived;
var blob = data.GetBlob();
blob.Title = viewModel.Title;
blob.Email = viewModel.Email;
blob.Description = viewModel.Description;
@@ -310,9 +301,9 @@ namespace BTCPayServer.Controllers
}
[HttpGet("{payReqId}/clone")]
public async Task<IActionResult> ClonePaymentRequest(string payReqId)
public IActionResult ClonePaymentRequest(string payReqId)
{
var result = await EditPaymentRequest(CurrentStore.Id, payReqId);
var result = EditPaymentRequest(CurrentStore.Id, payReqId);
if (result is ViewResult viewResult)
{
var model = (UpdatePaymentRequestViewModel)viewResult.Model;
@@ -329,7 +320,7 @@ namespace BTCPayServer.Controllers
[HttpGet("{payReqId}/archive")]
public async Task<IActionResult> TogglePaymentRequestArchival(string payReqId)
{
var result = await EditPaymentRequest(CurrentStore.Id, payReqId);
var result = EditPaymentRequest(CurrentStore.Id, payReqId);
if (result is ViewResult viewResult)
{
var model = (UpdatePaymentRequestViewModel)viewResult.Model;
@@ -353,5 +344,10 @@ namespace BTCPayServer.Controllers
{
get => HttpContext.GetStoreData();
}
private PaymentRequestData CurrentPaymentRequest
{
get => HttpContext.GetPaymentRequestData();
}
}
}