aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-21 07:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

unwrap rates in api/rates

Browse Source
This commit is contained in:
nicolas.dorier
2018-01-20 12:11:24 +09:00
parent db2a2a2b6c
commit ade3eff75c
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/BTCPayServer.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.0.1.15</Version> <Version>1.0.1.16</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Build\dockerfiles\**" /> <Compile Remove="Build\dockerfiles\**" />

28
BTCPayServer/Controllers/RateController.cs
View File

@@ -33,16 +33,27 @@ namespace BTCPayServer.Controllers
[HttpGet] [HttpGet]
[BitpayAPIConstraint] [BitpayAPIConstraint]
public async Task<IActionResult> GetRates(string cryptoCode = null, string storeId = null) public async Task<IActionResult> GetRates(string cryptoCode = null, string storeId = null)
{
var result = await GetRates2(cryptoCode, storeId);
var rates = (result as JsonResult)?.Value as NBitpayClient.Rate[];
if(rates == null)
return result;
return Json(new DataWrapper<NBitpayClient.Rate[]>(rates));
}
[Route("api/rates")]
[HttpGet]
public async Task<IActionResult> GetRates2(string cryptoCode = null, string storeId = null)
{ {
cryptoCode = cryptoCode ?? "BTC"; cryptoCode = cryptoCode ?? "BTC";
var network= _NetworkProvider.GetNetwork(cryptoCode); var network = _NetworkProvider.GetNetwork(cryptoCode);
if (network == null) if (network == null)
return NotFound(); return NotFound();
var rateProvider = _RateProviderFactory.GetRateProvider(network); var rateProvider = _RateProviderFactory.GetRateProvider(network);
if (rateProvider == null) if (rateProvider == null)
return NotFound(); return NotFound();
if(storeId != null) if (storeId != null)
{ {
var store = await _StoreRepo.FindStore(storeId); var store = await _StoreRepo.FindStore(storeId);
if (store == null) if (store == null)
@@ -51,22 +62,13 @@ namespace BTCPayServer.Controllers
} }
var allRates = (await rateProvider.GetRatesAsync()); var allRates = (await rateProvider.GetRatesAsync());
return Json(new DataWrapper<NBitpayClient.Rate[]> return Json(allRates.Select(r =>
(allRates.Select(r =>
new NBitpayClient.Rate() new NBitpayClient.Rate()
{ {
Code = r.Currency, Code = r.Currency,
Name = _CurrencyNameTable.GetCurrencyData(r.Currency)?.Name, Name = _CurrencyNameTable.GetCurrencyData(r.Currency)?.Name,
Value = r.Value Value = r.Value
}).Where(n => n.Name != null).ToArray())); }).Where(n => n.Name != null).ToArray());
}
[Route("api/rates")]
[HttpGet]
public Task<IActionResult> GetRates2(string cryptoCode = null, string storeId = null)
{
return GetRates(cryptoCode, storeId);
} }
} }
} }