From 2f88da67e8847fcd4388d276db8a03867ce5cdeb Mon Sep 17 00:00:00 2001 From: d11n Date: Wed, 1 Mar 2023 02:32:48 +0100 Subject: [PATCH] Fix build warnings and indentation (#4720) --- BTCPayServer.Tests/FastTests.cs | 2 +- .../Controllers/UIWalletsController.cs | 35 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/BTCPayServer.Tests/FastTests.cs b/BTCPayServer.Tests/FastTests.cs index 5d0645eaa..aae0681f1 100644 --- a/BTCPayServer.Tests/FastTests.cs +++ b/BTCPayServer.Tests/FastTests.cs @@ -1860,7 +1860,7 @@ namespace BTCPayServer.Tests }) .ToHashSet(); #pragma warning restore CS0618 // Type or member is obsolete - Assert.Equal(1, formats.Count); + Assert.Single(formats); } [Fact] diff --git a/BTCPayServer/Controllers/UIWalletsController.cs b/BTCPayServer/Controllers/UIWalletsController.cs index 4b88795c2..5b344b69c 100644 --- a/BTCPayServer/Controllers/UIWalletsController.cs +++ b/BTCPayServer/Controllers/UIWalletsController.cs @@ -1324,32 +1324,31 @@ namespace BTCPayServer.Controllers public class UpdateLabelsRequest { - public string Address { get; set; } + public string? Address { get; set; } public string[]? Labels { get; set; } } [HttpPost("{walletId}/update-labels")] [IgnoreAntiforgeryToken] - public async Task UpdateLabels( [ModelBinder(typeof(WalletIdModelBinder))] WalletId walletId, [FromBody] UpdateLabelsRequest request) + public async Task UpdateLabels([ModelBinder(typeof(WalletIdModelBinder))] WalletId walletId, [FromBody] UpdateLabelsRequest request) { - if (request.Address is null || request.Labels is null) + if (string.IsNullOrEmpty(request.Address) || request.Labels is null) return BadRequest(); - + var objid = new WalletObjectId(walletId, WalletObjectData.Types.Address, request.Address); - var obj = await WalletRepository.GetWalletObject(objid); - if (obj is null) - { - await WalletRepository.EnsureWalletObject(objid); - } - else - { - var currentLabels = obj.GetNeighbours().Where(data => data.Type == WalletObjectData.Types.Label).ToArray(); - var toRemove = currentLabels.Where(data => !request.Labels.Contains(data.Id)).Select(data => data.Id).ToArray(); - await WalletRepository.RemoveWalletObjectLabels(objid, toRemove); - } - await - WalletRepository.AddWalletObjectLabels(objid, request.Labels); - return Ok(); + var obj = await WalletRepository.GetWalletObject(objid); + if (obj is null) + { + await WalletRepository.EnsureWalletObject(objid); + } + else + { + var currentLabels = obj.GetNeighbours().Where(data => data.Type == WalletObjectData.Types.Label).ToArray(); + var toRemove = currentLabels.Where(data => !request.Labels.Contains(data.Id)).Select(data => data.Id).ToArray(); + await WalletRepository.RemoveWalletObjectLabels(objid, toRemove); + } + await WalletRepository.AddWalletObjectLabels(objid, request.Labels); + return Ok(); } [HttpGet("{walletId}/labels")]