diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerTest.java similarity index 80% rename from web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java rename to web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerTest.java index c62017e5..917e8cfe 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChannelDetailsControllerTest.java @@ -1,7 +1,7 @@ package de.cotto.lndmanagej.ui; import de.cotto.lndmanagej.model.ChannelIdResolver; -import de.cotto.lndmanagej.ui.controller.ChanDetailsController; +import de.cotto.lndmanagej.ui.controller.ChannelDetailsController; import de.cotto.lndmanagej.ui.page.PageService; import de.cotto.lndmanagej.ui.page.channel.ChannelDetailsPage; import org.junit.jupiter.api.Test; @@ -11,14 +11,14 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.web.servlet.MockMvc; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; -import static de.cotto.lndmanagej.ui.model.ChanDetailsDtoFixture.CHAN_DETAILS_DTO; +import static de.cotto.lndmanagej.ui.model.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(controllers = ChanDetailsController.class) -class ChanDetailsControllerTest { +@WebMvcTest(controllers = ChannelDetailsController.class) +class ChannelDetailsControllerTest { @Autowired private MockMvc mockMvc; @@ -32,7 +32,7 @@ class ChanDetailsControllerTest { @Test void testNodeDetailsPage() throws Exception { - given(pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO)); + given(pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO)); mockMvc.perform(get("/channel/" + CHANNEL_ID)) .andExpect(status().isOk()); } diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java index e234a599..c269a33a 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/SearchControllerTest.java @@ -2,7 +2,7 @@ package de.cotto.lndmanagej.ui; import de.cotto.lndmanagej.controller.ChannelIdConverter; import de.cotto.lndmanagej.ui.controller.SearchController; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.page.PageService; @@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import java.util.List; -import static de.cotto.lndmanagej.ui.model.ChanDetailsDtoFixture.CHAN_DETAILS_DTO; +import static de.cotto.lndmanagej.ui.model.ChannelDetailsDtoFixture.CHANNEL_DETAILS_DTO; import static de.cotto.lndmanagej.ui.model.NodeDetailsDtoFixture.NODE_DETAILS_DTO; import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.OPEN_CHANNEL_DTO; import static de.cotto.lndmanagej.ui.model.OpenChannelDtoFixture.WOS; @@ -68,12 +68,12 @@ class SearchControllerTest { private void searchForChannelId(String query) throws Exception { given(this.dataService.getOpenChannels()).willReturn( - List.of(create(CHAN_DETAILS_DTO)) + List.of(create(CHANNEL_DETAILS_DTO)) ); - given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO)); + given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHANNEL_DETAILS_DTO)); mockMvc.perform(MockMvcRequestBuilders.get("/search?q=" + query)) .andExpect(status().isOk()) - .andExpect(model().attribute("id", is(CHAN_DETAILS_DTO.channelId()))) + .andExpect(model().attribute("id", is(CHANNEL_DETAILS_DTO.channelId()))) .andExpect(view().name("channel-details")); } @@ -111,7 +111,7 @@ class SearchControllerTest { return new NodesPage(List.of(create(channel1), create(channel2))); } - public static OpenChannelDto create(ChanDetailsDto channelDetails) { + public static OpenChannelDto create(ChannelDetailsDto channelDetails) { return new OpenChannelDto( channelDetails.channelId(), channelDetails.remoteAlias(), diff --git a/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java b/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java index 7f006a92..19ed1841 100644 --- a/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java +++ b/web/src/main/java/de/cotto/lndmanagej/UiDataServiceImpl.java @@ -6,7 +6,6 @@ import de.cotto.lndmanagej.controller.NotFoundException; import de.cotto.lndmanagej.controller.StatusController; import de.cotto.lndmanagej.controller.WarningsController; import de.cotto.lndmanagej.controller.dto.BalanceInformationDto; -import de.cotto.lndmanagej.controller.dto.ChannelDetailsDto; import de.cotto.lndmanagej.controller.dto.ChannelsDto; import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; import de.cotto.lndmanagej.controller.dto.PoliciesDto; @@ -17,7 +16,7 @@ import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.service.ChannelService; import de.cotto.lndmanagej.service.NodeService; import de.cotto.lndmanagej.ui.UiDataService; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.dto.StatusModel; @@ -76,9 +75,9 @@ public class UiDataServiceImpl extends UiDataService { } @Override - public ChanDetailsDto getChannelDetails(ChannelId channelId) throws NotFoundException { - ChannelDetailsDto details = channelController.getDetails(channelId); - return new ChanDetailsDto( + public ChannelDetailsDto getChannelDetails(ChannelId channelId) throws NotFoundException { + de.cotto.lndmanagej.controller.dto.ChannelDetailsDto details = channelController.getDetails(channelId); + return new ChannelDetailsDto( channelId, details.remotePubkey(), details.remoteAlias(), diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java b/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java index 24ddb751..cf903835 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/UiDataService.java @@ -4,7 +4,7 @@ import de.cotto.lndmanagej.controller.NotFoundException; import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.dto.StatusModel; @@ -24,7 +24,7 @@ public abstract class UiDataService { public abstract List getOpenChannels(); - public abstract ChanDetailsDto getChannelDetails(ChannelId channelId) throws NotFoundException; + public abstract ChannelDetailsDto getChannelDetails(ChannelId channelId) throws NotFoundException; public abstract NodeDto getNode(Pubkey pubkey); diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java b/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java similarity index 88% rename from web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java rename to web/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java index 8b1ccfea..47d65b3e 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChannelDetailsController.java @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @Controller -public class ChanDetailsController { +public class ChannelDetailsController { private final PageService page; - public ChanDetailsController(PageService pageService) { + public ChannelDetailsController(PageService pageService) { this.page = pageService; } diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java b/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java similarity index 96% rename from web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java rename to web/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java index b2d574c5..89b32d46 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChanDetailsDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/dto/ChannelDetailsDto.java @@ -12,7 +12,7 @@ import de.cotto.lndmanagej.model.Pubkey; import java.util.Set; -public record ChanDetailsDto( +public record ChannelDetailsDto( ChannelId channelId, Pubkey remotePubkey, String remoteAlias, diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java b/web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java index 6cfc800d..b12fba50 100644 --- a/web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java +++ b/web/src/main/java/de/cotto/lndmanagej/ui/page/channel/ChannelDetailsPage.java @@ -1,11 +1,11 @@ package de.cotto.lndmanagej.ui.page.channel; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.page.general.ThymeleafPage; public class ChannelDetailsPage extends ThymeleafPage { - public ChannelDetailsPage(ChanDetailsDto channel) { + public ChannelDetailsPage(ChannelDetailsDto channel) { super(); add("id", channel.channelId()); add("channel", channel); diff --git a/web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java b/web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java index 0afab226..0deb2d55 100644 --- a/web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java +++ b/web/src/test/java/de/cotto/lndmanagej/demo/DemoDataService.java @@ -4,7 +4,7 @@ import de.cotto.lndmanagej.controller.dto.NodeDetailsDto; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.Pubkey; import de.cotto.lndmanagej.ui.UiDataService; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.NodeDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import de.cotto.lndmanagej.ui.dto.StatusModel; @@ -39,7 +39,7 @@ public class DemoDataService extends UiDataService { } @Override - public ChanDetailsDto getChannelDetails(ChannelId channelId) { + public ChannelDetailsDto getChannelDetails(ChannelId channelId) { OpenChannelDto localOpenChannel = getOpenChannels().stream() .filter(c -> c.channelId().equals(channelId)) .findFirst() diff --git a/web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java b/web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java index 8c2489c4..3a2b2a01 100644 --- a/web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java +++ b/web/src/test/java/de/cotto/lndmanagej/demo/utils/ChannelDetailsUtil.java @@ -8,7 +8,7 @@ import de.cotto.lndmanagej.model.FeeReportFixtures; import de.cotto.lndmanagej.model.FlowReportFixtures; import de.cotto.lndmanagej.model.OpenInitiator; import de.cotto.lndmanagej.model.RebalanceReportFixtures; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import de.cotto.lndmanagej.ui.dto.OpenChannelDto; import java.util.Set; @@ -21,8 +21,8 @@ public final class ChannelDetailsUtil { // util class } - public static ChanDetailsDto createChannelDetails(OpenChannelDto channel) { - return new ChanDetailsDto( + public static ChannelDetailsDto createChannelDetails(OpenChannelDto channel) { + return new ChannelDetailsDto( channel.channelId(), channel.remotePubkey(), channel.remoteAlias(), diff --git a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java similarity index 90% rename from web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java rename to web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java index 2280065f..ed283377 100644 --- a/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChanDetailsDtoFixture.java +++ b/web/src/testFixtures/java/de/cotto/lndmanagej/ui/model/ChannelDetailsDtoFixture.java @@ -11,7 +11,7 @@ import de.cotto.lndmanagej.model.FlowReportFixtures; import de.cotto.lndmanagej.model.OpenInitiator; import de.cotto.lndmanagej.model.RebalanceReportFixtures; import de.cotto.lndmanagej.model.warnings.ChannelWarningsFixtures; -import de.cotto.lndmanagej.ui.dto.ChanDetailsDto; +import de.cotto.lndmanagej.ui.dto.ChannelDetailsDto; import static de.cotto.lndmanagej.model.BalanceInformationFixtures.BALANCE_INFORMATION; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; @@ -19,9 +19,9 @@ import static de.cotto.lndmanagej.model.OnChainCostsFixtures.ON_CHAIN_COSTS; import static de.cotto.lndmanagej.model.PolicyFixtures.POLICIES_FOR_LOCAL_CHANNEL; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; -public class ChanDetailsDtoFixture { +public class ChannelDetailsDtoFixture { - public static final ChanDetailsDto CHAN_DETAILS_DTO = new ChanDetailsDto( + public static final ChannelDetailsDto CHANNEL_DETAILS_DTO = new ChannelDetailsDto( CHANNEL_ID, PUBKEY, "Albert",