diff --git a/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java index 7bb8d963..27dc85f3 100644 --- a/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java +++ b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModel.java @@ -29,4 +29,12 @@ public record BalanceInformationModel( long routableCapacity = outbound + remoteBalanceSat(); return (1.0 * outbound / routableCapacity) * 100; } + + public long getRoutableCapacity() { + return remoteBalanceSat() + localBalanceSat(); + } + + public double getInboundPercentage() { + return 100 - getOutboundPercentage(); + } } diff --git a/ui/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java index 87053040..5890885b 100644 --- a/ui/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java +++ b/ui/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java @@ -28,17 +28,4 @@ public record ChannelDetailsDto( Set warnings ) { - public long getRoutableCapacity() { - return balanceInformation.remoteBalanceSat() + balanceInformation.localBalanceSat(); - } - - public double getInboundPercentage() { - return 100 - getOutboundPercentage(); - } - - public double getOutboundPercentage() { - long outbound = balanceInformation.localBalanceSat(); - return (1.0 * outbound / getRoutableCapacity()) * 100; - } - } diff --git a/ui/src/main/resources/templates/channel-details.html b/ui/src/main/resources/templates/channel-details.html index 99180ce5..7becc31f 100644 --- a/ui/src/main/resources/templates/channel-details.html +++ b/ui/src/main/resources/templates/channel-details.html @@ -10,7 +10,7 @@
-
+
diff --git a/ui/src/main/resources/templates/fragments/tiles.html b/ui/src/main/resources/templates/fragments/tiles.html index 7e584573..10df13d5 100644 --- a/ui/src/main/resources/templates/fragments/tiles.html +++ b/ui/src/main/resources/templates/fragments/tiles.html @@ -149,9 +149,8 @@
- -
+
@@ -162,12 +161,15 @@
-
-
diff --git a/ui/src/main/resources/templates/node-details.html b/ui/src/main/resources/templates/node-details.html index a945fc34..a69da9c7 100644 --- a/ui/src/main/resources/templates/node-details.html +++ b/ui/src/main/resources/templates/node-details.html @@ -10,7 +10,7 @@
-
+
diff --git a/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java new file mode 100644 index 00000000..5d6771c1 --- /dev/null +++ b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/BalanceInformationModelTest.java @@ -0,0 +1,24 @@ +package de.cotto.lndmanagej.ui.dto; + +import org.junit.jupiter.api.Test; + +import static de.cotto.lndmanagej.ui.dto.BalanceInformationModelFixture.BALANCE_INFORMATION_MODEL; +import static org.assertj.core.api.Assertions.assertThat; + +class BalanceInformationModelTest { + + @Test + void routableCapacity() { + assertThat(BALANCE_INFORMATION_MODEL.getRoutableCapacity()).isEqualTo(1123L); + } + + @Test + void inboundPercentage() { + assertThat(BALANCE_INFORMATION_MODEL.getInboundPercentage()).isEqualTo(10.952_804_986_642_917); + } + + @Test + void outboundPercentage() { + assertThat(BALANCE_INFORMATION_MODEL.getOutboundPercentage()).isEqualTo(100 - 10.952_804_986_642_917); + } +} \ No newline at end of file diff --git a/ui/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java index ab6536b9..8948ff07 100644 --- a/ui/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java +++ b/ui/src/test/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDtoTest.java @@ -48,21 +48,6 @@ class ChannelDetailsDtoTest { .isEqualTo(BalanceInformationModel.createFromModel(BALANCE_INFORMATION)); } - @Test - void routableCapacity() { - assertThat(CHANNEL_DETAILS_DTO.getRoutableCapacity()).isEqualTo(1123L); - } - - @Test - void inboundPercentage() { - assertThat(CHANNEL_DETAILS_DTO.getInboundPercentage()).isEqualTo(10.952_804_986_642_917); - } - - @Test - void outboundPercentage() { - assertThat(CHANNEL_DETAILS_DTO.getOutboundPercentage()).isEqualTo(100 - 10.952_804_986_642_917); - } - @Test void capacitySat() { assertThat(CHANNEL_DETAILS_DTO.capacitySat()).isEqualTo(21_000_000);