diff --git a/backend/src/main/java/heartbeat/client/JiraFeignClient.java b/backend/src/main/java/heartbeat/client/JiraFeignClient.java index 402f47008b..c2a0840a49 100644 --- a/backend/src/main/java/heartbeat/client/JiraFeignClient.java +++ b/backend/src/main/java/heartbeat/client/JiraFeignClient.java @@ -51,4 +51,6 @@ CardHistoryResponseDTO getJiraCardHistoryByCount(URI baseUrl, @PathVariable Stri @GetMapping(path = "rest/api/2/project/{projectIdOrKey}") JiraBoardProject getProject(URI baseUrl, @PathVariable String projectIdOrKey, @RequestHeader String authorization); + @GetMapping(path = "/") + void getDomain(URI baseUrl); } diff --git a/backend/src/main/java/heartbeat/service/board/jira/JiraService.java b/backend/src/main/java/heartbeat/service/board/jira/JiraService.java index 8f093f38e9..01bb0096ff 100644 --- a/backend/src/main/java/heartbeat/service/board/jira/JiraService.java +++ b/backend/src/main/java/heartbeat/service/board/jira/JiraService.java @@ -137,11 +137,25 @@ public String verify(BoardType boardType, BoardVerifyRequestParam boardVerifyReq verifyBoardTypeIsJira(boardType); try { + jiraFeignClient.getDomain(baseUrl); + } + catch (NotFoundException e) { + System.out.println(e); + } + + try { + System.out.println(boardVerifyRequestParam.getBoardId()); + System.out.println(boardVerifyRequestParam.getToken()); + JiraBoardVerifyDTO jiraBoardVerifyDTO = jiraFeignClient.getBoard(baseUrl, boardVerifyRequestParam.getBoardId(), boardVerifyRequestParam.getToken()); + + + return jiraBoardVerifyDTO.getLocation().getProjectKey(); } catch (NotFoundException e) { + System.out.println(e); log.error("Failed to call Jira to verify board url, url: {}", baseUrl); throw new NotFoundException("boardId is incorrect"); }