diff --git a/model/src/main/java/de/cotto/lndmanagej/model/Rating.java b/model/src/main/java/de/cotto/lndmanagej/model/Rating.java index 94d91576..54ad090c 100644 --- a/model/src/main/java/de/cotto/lndmanagej/model/Rating.java +++ b/model/src/main/java/de/cotto/lndmanagej/model/Rating.java @@ -26,6 +26,6 @@ public record Rating(Optional rating) { } public long getRating() { - return rating.orElse(0L); + return rating.orElse(-1L); } } diff --git a/model/src/test/java/de/cotto/lndmanagej/model/RatingTest.java b/model/src/test/java/de/cotto/lndmanagej/model/RatingTest.java index ca03ca6d..1aba0e8a 100644 --- a/model/src/test/java/de/cotto/lndmanagej/model/RatingTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/RatingTest.java @@ -20,7 +20,7 @@ class RatingTest { @Test void getRating() { - assertThat(Rating.EMPTY.getRating()).isEqualTo(0); + assertThat(Rating.EMPTY.getRating()).isEqualTo(-1); assertThat(new Rating(1).getRating()).isEqualTo(1); } diff --git a/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java b/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java index 063de905..7e199fc3 100644 --- a/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java +++ b/ui/src/testFixtures/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoFixture.java @@ -30,6 +30,6 @@ public class NodeDetailsDtoFixture { FlowReportDto.createFromModel(FLOW_REPORT), RebalanceReportDto.createFromModel(REBALANCE_REPORT), CHANNEL_WARNINGS.descriptions(), - RatingFixtures.RATING.getRating() + RatingDto.fromModel(RatingFixtures.RATING) ); } diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java index f7ba22b7..cf54671d 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java @@ -124,7 +124,8 @@ class NodeControllerIT { .andExpect(jsonPath("$.onlineReport.changes", is(5))) .andExpect(jsonPath("$.onlineReport.daysForChanges", is(7))) .andExpect(jsonPath("$.onlineReport.since", is("2021-12-23T01:02:03Z"))) - .andExpect(jsonPath("$.rating", is(123))); + .andExpect(jsonPath("$.rating.rating", is(123))) + .andExpect(jsonPath("$.rating.message", is(""))); } @Test @@ -172,4 +173,4 @@ class NodeControllerIT { .andExpect(jsonPath("$.earnedMilliSat", is("1234"))) .andExpect(jsonPath("$.sourcedMilliSat", is("567"))); } -} \ No newline at end of file +} diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/RatingControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/RatingControllerIT.java index f872ba54..5f842d6c 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/RatingControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/RatingControllerIT.java @@ -44,7 +44,7 @@ class RatingControllerIT { void getRatingForPeer_no_rating() throws Exception { when(ratingService.getRatingForPeer(PUBKEY)).thenReturn(Rating.EMPTY); mockMvc.perform(get(PREFIX + "/peer/" + PUBKEY + RATING)) - .andExpect(content().json("{\"rating\": 0, \"message\": \"Unable to compute rating\"}")); + .andExpect(content().json("{\"rating\": -1, \"message\": \"Unable to compute rating\"}")); } @Test @@ -64,6 +64,6 @@ class RatingControllerIT { void getRatingForChannel_empty() throws Exception { when(ratingService.getRatingForChannel(CHANNEL_ID)).thenReturn(Optional.of(Rating.EMPTY)); mockMvc.perform(get(PREFIX + "/channel/" + CHANNEL_ID + RATING)) - .andExpect(content().json("{\"rating\": 0, \"message\": \"Unable to compute rating\"}")); + .andExpect(content().json("{\"rating\": -1, \"message\": \"Unable to compute rating\"}")); } } diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java index cc95b506..31eec3f2 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDto.java @@ -21,7 +21,7 @@ public record NodeDetailsDto( FlowReportDto flowReport, RebalanceReportDto rebalanceReport, Set warnings, - long rating + RatingDto rating ) { public static NodeDetailsDto createFromModel(NodeDetails nodeDetails) { return new NodeDetailsDto( @@ -38,7 +38,7 @@ public record NodeDetailsDto( FlowReportDto.createFromModel(nodeDetails.flowReport()), RebalanceReportDto.createFromModel(nodeDetails.rebalanceReport()), nodeDetails.warnings().descriptions(), - nodeDetails.rating().getRating() + RatingDto.fromModel(nodeDetails.rating()) ); } } diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoTest.java index b545d6b4..0e6b5b4e 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/NodeDetailsDtoTest.java @@ -38,8 +38,8 @@ class NodeDetailsDtoTest { FlowReportDto.createFromModel(FLOW_REPORT), RebalanceReportDto.createFromModel(REBALANCE_REPORT), NODE_WARNINGS.descriptions(), - RatingFixtures.RATING.getRating() + RatingDto.fromModel(RatingFixtures.RATING) ); assertThat(NodeDetailsDto.createFromModel(NODE_DETAILS)).isEqualTo(expected); } -} \ No newline at end of file +} diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/RatingDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/RatingDtoTest.java index 3bc7b1e2..f58bc9af 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/RatingDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/RatingDtoTest.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; class RatingDtoTest { @Test void fromModel_empty() { - assertThat(RatingDto.fromModel(Rating.EMPTY)).isEqualTo(new RatingDto(0, "Unable to compute rating")); + assertThat(RatingDto.fromModel(Rating.EMPTY)).isEqualTo(new RatingDto(-1, "Unable to compute rating")); } @Test