From 2f8980db0f2c2cd5a46420604f2d76d7a9621301 Mon Sep 17 00:00:00 2001
From: Carsten Otto <git@c-otto.de>
Date: Thu, 11 Nov 2021 20:31:33 +0100
Subject: [PATCH] fiq jq issue, use string instead of long

---
 .../de/cotto/lndmanagej/controller/NodeControllerIT.java     | 4 ++--
 .../java/de/cotto/lndmanagej/controller/NodeController.java  | 4 ++--
 .../de/cotto/lndmanagej/controller/NodeControllerTest.java   | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java b/application/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java
index 1d670c82..b80fe57d 100644
--- a/application/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java
+++ b/application/src/integrationTest/java/de/cotto/lndmanagej/controller/NodeControllerIT.java
@@ -43,7 +43,7 @@ class NodeControllerIT {
     void getOpenChannelIds() throws Exception {
         when(nodeService.getOpenChannelIds(PUBKEY)).thenReturn(List.of(CHANNEL_ID, CHANNEL_ID_3));
         mockMvc.perform(get("/api/node/" + PUBKEY + "/open-channels"))
-                .andExpect(jsonPath("$[0]", is(CHANNEL_ID.shortChannelId())))
-                .andExpect(jsonPath("$[1]", is(CHANNEL_ID_3.shortChannelId())));
+                .andExpect(jsonPath("$[0]", is(CHANNEL_ID.toString())))
+                .andExpect(jsonPath("$[1]", is(CHANNEL_ID_3.toString())));
     }
 }
\ No newline at end of file
diff --git a/application/src/main/java/de/cotto/lndmanagej/controller/NodeController.java b/application/src/main/java/de/cotto/lndmanagej/controller/NodeController.java
index 8eb83379..8bc717e7 100644
--- a/application/src/main/java/de/cotto/lndmanagej/controller/NodeController.java
+++ b/application/src/main/java/de/cotto/lndmanagej/controller/NodeController.java
@@ -26,9 +26,9 @@ public class NodeController {
     }
 
     @GetMapping("/open-channels")
-    public List<Long> getOpenChannelIds(@PathVariable Pubkey pubkey) {
+    public List<String> getOpenChannelIds(@PathVariable Pubkey pubkey) {
         return nodeService.getOpenChannelIds(pubkey).stream()
-                .map(ChannelId::shortChannelId)
+                .map(ChannelId::toString)
                 .collect(Collectors.toList());
     }
 }
diff --git a/application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java b/application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java
index a43b464d..98ca849a 100644
--- a/application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java
+++ b/application/src/test/java/de/cotto/lndmanagej/controller/NodeControllerTest.java
@@ -32,10 +32,11 @@ class NodeControllerTest {
 
     @Test
     void getOpenChannelIds() {
+        // jq is confused by large numbers, return string instead
         when(nodeService.getOpenChannelIds(PUBKEY)).thenReturn(List.of(CHANNEL_ID, CHANNEL_ID_3));
         assertThat(nodeController.getOpenChannelIds(PUBKEY)).containsExactly(
-                CHANNEL_ID.shortChannelId(),
-                CHANNEL_ID_3.shortChannelId()
+                CHANNEL_ID.toString(),
+                CHANNEL_ID_3.toString()
         );
     }
 }
\ No newline at end of file