From 0ba96aa4b8dd83b12401143dbd5648be187b2ade Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 18 Dec 2018 23:24:22 +0900 Subject: [PATCH] Fix export tests --- BTCPayServer.Tests/UnitTest1.cs | 14 ++++---------- .../Services/Invoices/Export/InvoiceExport.cs | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index f6b131c10..3ee609276 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -1620,10 +1620,9 @@ donation: var jsonResultPaid = user.GetController().Export("json").GetAwaiter().GetResult(); var paidresult = Assert.IsType(jsonResultPaid); Assert.Equal("application/json", paidresult.ContentType); - Assert.Contains("\"ItemDesc\": \"Some \\\", description\"", paidresult.Content); - Assert.Contains("\"FiatPrice\": 500.0", paidresult.Content); + Assert.Contains("\"InvoiceItemDesc\": \"Some \\\", description\"", paidresult.Content); + Assert.Contains("\"InvoicePrice\": 500.0", paidresult.Content); Assert.Contains("\"ConversionRate\": 5000.0", paidresult.Content); - Assert.Contains("\"PaymentDue\": \"0.10020000 BTC\"", paidresult.Content); Assert.Contains($"\"InvoiceId\": \"{invoice.Id}\",", paidresult.Content); }); @@ -1688,14 +1687,9 @@ donation: var paidresult = Assert.IsType(exportResultPaid); Assert.Equal("application/csv", paidresult.ContentType); Assert.Contains($",\"orderId\",\"{invoice.Id}\",", paidresult.Content); - Assert.Contains($",\"OnChain\",\"0.10020000 BTC\",\"0.10009990 BTC\",\"0.00000000 BTC\",\"5000.0\",\"500.0\"", paidresult.Content); - Assert.Contains($",\"USD\",\"\",\"Some ``, description\",\"new\"", paidresult.Content); + Assert.Contains($",\"OnChain\",\"0.1000999\",\"BTC\",\"5000.0\",\"500.0\"", paidresult.Content); + Assert.Contains($",\"USD\",\"\",\"Some ``, description\",\"new (paidPartial)\"", paidresult.Content); }); - - /* -ReceivedDate,StoreId,OrderId,InvoiceId,CreatedDate,ExpirationDate,MonitoringDate,PaymentId,CryptoCode,Destination,PaymentType,PaymentDue,PaymentPaid,PaymentOverpaid,ConversionRate,FiatPrice,FiatCurrency,ItemCode,ItemDesc,Status -"11/30/2018 10:28:42 AM","7AagXzWdWhLLR3Zar25YLiw2uHAJDzVT4oXGKC9bBCis","orderId","GxtJsWbgxxAXXoCurqyeK6","11/30/2018 10:28:40 AM","11/30/2018 10:43:40 AM","11/30/2018 11:43:40 AM","ec0341537f565d213bc64caa352fbbf9e0deb31cab1f91bccf89db0dd1604457-0","BTC","mqWghCp9RVw8fNgQMLjawyKStxpGfWBk1L","OnChain","0.10020000 BTC","0.10009990 BTC","0.00000000 BTC","5000.0","500.0","USD","","Some ``, description","new" - */ } } diff --git a/BTCPayServer/Services/Invoices/Export/InvoiceExport.cs b/BTCPayServer/Services/Invoices/Export/InvoiceExport.cs index 779cb6aa1..543759ee3 100644 --- a/BTCPayServer/Services/Invoices/Export/InvoiceExport.cs +++ b/BTCPayServer/Services/Invoices/Export/InvoiceExport.cs @@ -80,7 +80,7 @@ namespace BTCPayServer.Services.Invoices.Export InvoiceExpirationDate = invoice.ExpirationTime.UtcDateTime, InvoiceMonitoringDate = invoice.MonitoringExpiration.UtcDateTime, #pragma warning disable CS0618 // Type or member is obsolete - InvoiceFullStatus = invoice.Status.ToString(), + InvoiceFullStatus = invoice.GetInvoiceState().ToString(), InvoiceStatus = invoice.StatusString, InvoiceExceptionStatus = invoice.ExceptionStatusString, #pragma warning restore CS0618 // Type or member is obsolete