From cf03cf259ef9051c7caa37cd9dfc1ab6c33524c5 Mon Sep 17 00:00:00 2001
From: Carsten Otto <git@c-otto.de>
Date: Tue, 10 May 2022 19:25:13 +0200
Subject: [PATCH] accept channel ID in all supported formats

---
 .../lndmanagej/ui/ChanDetailsControllerTest.java    | 13 +++++++------
 .../ui/controller/ChanDetailsController.java        |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java
index 35636ae8..c62017e5 100644
--- a/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java
+++ b/web/src/integrationTest/java/de/cotto/lndmanagej/ui/ChanDetailsControllerTest.java
@@ -1,6 +1,6 @@
 package de.cotto.lndmanagej.ui;
 
-import de.cotto.lndmanagej.controller.ChannelIdConverter;
+import de.cotto.lndmanagej.model.ChannelIdResolver;
 import de.cotto.lndmanagej.ui.controller.ChanDetailsController;
 import de.cotto.lndmanagej.ui.page.PageService;
 import de.cotto.lndmanagej.ui.page.channel.ChannelDetailsPage;
@@ -9,11 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
+import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID;
 import static de.cotto.lndmanagej.ui.model.ChanDetailsDtoFixture.CHAN_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)
@@ -25,14 +26,14 @@ class ChanDetailsControllerTest {
     @MockBean
     private PageService pageService;
 
-    @SuppressWarnings("unused")
     @MockBean
-    private ChannelIdConverter channelIdConverter;
+    @SuppressWarnings("unused")
+    private ChannelIdResolver channelIdResolver;
 
     @Test
     void testNodeDetailsPage() throws Exception {
-        given(this.pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
-        mockMvc.perform(MockMvcRequestBuilders.get("/channel/783231610496155649"))
+        given(pageService.channelDetails(any())).willReturn(new ChannelDetailsPage(CHAN_DETAILS_DTO));
+        mockMvc.perform(get("/channel/" + CHANNEL_ID))
                 .andExpect(status().isOk());
     }
 }
diff --git a/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java b/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java
index dcad8f7b..8b1ccfea 100644
--- a/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java
+++ b/web/src/main/java/de/cotto/lndmanagej/ui/controller/ChanDetailsController.java
@@ -17,13 +17,13 @@ public class ChanDetailsController {
         this.page = pageService;
     }
 
-    @GetMapping("/channel/{id}")
-    public String channelDetails(@PathVariable(name = "id") long channelId, Model model) {
+    @GetMapping("/channel/{channelId}")
+    public String channelDetails(@PathVariable ChannelId channelId, Model model) {
         try {
-            return page.channelDetails(ChannelId.fromShortChannelId(channelId)).create(model);
+            return page.channelDetails(channelId).create(model);
         } catch (NotFoundException e) {
             return page.error("Channel not found.").create(model);
         }
     }
 
-}
\ No newline at end of file
+}