mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-01-18 21:32:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimize load time of StoreRoles related pages/routes (#6245)

Browse Source
This commit is contained in:
Nicolas Dorier 2024-09-25 23:10:13 +09:00 committed by GitHub
parent 336f2d88e9
commit 056f850268
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/GreenField/GreenfieldServerRolesController.cs
View File

@ -28,7 +28,7 @@ public class GreenfieldServerRolesController : ControllerBase
[HttpGet("~/api/v1/server/roles")]
public async Task<IActionResult> GetServerRoles()
{
return Ok(FromModel(await _storeRepository.GetStoreRoles(null, false, false)));
return Ok(FromModel(await _storeRepository.GetStoreRoles(null, false)));
}
private List<RoleData> FromModel(StoreRepository.StoreRole[] data)
{

2
BTCPayServer/Controllers/GreenField/GreenfieldStoreRolesController.cs
View File

@ -31,7 +31,7 @@ namespace BTCPayServer.Controllers.Greenfield
var store = HttpContext.GetStoreData();
return store == null
? StoreNotFound()
: Ok(FromModel(await _storeRepository.GetStoreRoles(storeId, false, false)));
: Ok(FromModel(await _storeRepository.GetStoreRoles(storeId, false)));
}
private List<RoleData> FromModel(StoreRepository.StoreRole[] data)

2
BTCPayServer/Controllers/UIServerController.Roles.cs
View File

@ -19,7 +19,7 @@ namespace BTCPayServer.Controllers
string sortOrder = null
)
{
var roles = await _StoreRepository.GetStoreRoles(null, true);
var roles = await _StoreRepository.GetStoreRoles(null);
var defaultRole = (await _StoreRepository.GetDefaultRole()).Role;
model ??= new RolesViewModel();
model.DefaultRole = defaultRole;

2
BTCPayServer/Controllers/UIStoresController.Roles.cs
View File

@ -21,7 +21,7 @@ public partial class UIStoresController
string sortOrder = null
)
{
var roles = await storeRepository.GetStoreRoles(storeId, true);
var roles = await storeRepository.GetStoreRoles(storeId);
var defaultRole = (await storeRepository.GetDefaultRole()).Role;
model ??= new RolesViewModel();
model.DefaultRole = defaultRole;

21
BTCPayServer/Services/Stores/StoreRepository.cs
View File

@ -14,6 +14,7 @@ using Microsoft.EntityFrameworkCore;
using NBitcoin;
using NBitcoin.DataEncoders;
using Newtonsoft.Json;
using static BTCPayServer.Services.Stores.StoreRepository;
namespace BTCPayServer.Services.Stores
{
@ -81,14 +82,20 @@ namespace BTCPayServer.Services.Stores
public bool? IsUsed { get; set; }
}
#nullable enable
public async Task<StoreRole[]> GetStoreRoles(string? storeId, bool includeUsers = false, bool storeOnly = false)
public async Task<StoreRole[]> GetStoreRoles(string? storeId, bool storeOnly = false)
{
await using var ctx = _ContextFactory.CreateContext();
var query = ctx.StoreRoles.Where(u => (storeOnly && u.StoreDataId == storeId) || (!storeOnly && (u.StoreDataId == null || u.StoreDataId == storeId)));
if (includeUsers)
{
query = query.Include(u => u.Users);
}
var query = ctx.StoreRoles
.Where(u => (storeOnly && u.StoreDataId == storeId) || (!storeOnly && (u.StoreDataId == null || u.StoreDataId == storeId)))
// Not calling ToStoreRole here because we don't want to load users in the DB query
.Select(u => new StoreRole()
{
Id = u.Id,
Role = u.Role,
Permissions = u.Permissions,
IsServerRole = u.StoreDataId == null,
IsUsed = u.Users.Any()
});
var roles = await query.ToArrayAsync();
// return ordered: default role comes first, then server-wide roles in specified order, followed by store roles
@ -99,7 +106,7 @@ namespace BTCPayServer.Services.Stores
if (role.Role == defaultRole.Role) return -1;
int index = Array.IndexOf(defaultOrder, role.Role);
return index == -1 ? int.MaxValue : index;
}).Select(ToStoreRole).ToArray();
}).ToArray();
}
public async Task<StoreRoleId> GetDefaultRole()