From 91ae1cafc14b3d7c0e75ac4081a7f3ffa5b120ed Mon Sep 17 00:00:00 2001 From: qogustj Date: Thu, 4 Jul 2024 10:33:40 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/Nunbody/domain/mail/service/MailManageService.java | 5 ++++- src/main/java/com/Nunbody/global/error/ErrorCode.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/Nunbody/domain/mail/service/MailManageService.java b/src/main/java/com/Nunbody/domain/mail/service/MailManageService.java index d399779..4ef54de 100644 --- a/src/main/java/com/Nunbody/domain/mail/service/MailManageService.java +++ b/src/main/java/com/Nunbody/domain/mail/service/MailManageService.java @@ -68,7 +68,7 @@ private String validateImap(ValidateRequestDto validateRequestDto) throws Messag Store store = createStore(prop); store.connect(host, id, password); return "성공"; - } catch (AuthenticationFailedException e) { + } catch (Exception e) { String errorMessage = e.getMessage(); if (errorMessage.contains("Please check your username, password")) { // Handle username or password error @@ -86,6 +86,9 @@ private String validateImap(ValidateRequestDto validateRequestDto) throws Messag if (errorMessage.contains("IMAP access")) { throw new InvalidValueException(IMAP_ERROR); } + if (errorMessage.contains("Couldn't connect to host")) { + throw new InvalidValueException(IMAP_ERROR); + } } return null; } diff --git a/src/main/java/com/Nunbody/global/error/ErrorCode.java b/src/main/java/com/Nunbody/global/error/ErrorCode.java index 5d0a65c..74da579 100644 --- a/src/main/java/com/Nunbody/global/error/ErrorCode.java +++ b/src/main/java/com/Nunbody/global/error/ErrorCode.java @@ -9,7 +9,7 @@ @RequiredArgsConstructor(access = AccessLevel.PRIVATE) public enum ErrorCode { BAD_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다."), - INTERNAL_SERVER_ERROR(HttpStatus.BAD_REQUEST, "서버 내부에서 문제가 발생했습니다."), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부에서 문제가 발생했습니다."), NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 로그인 정보는 존재하지 않습니다."), UNAUTHORIZED(HttpStatus.BAD_REQUEST, "권한이 없습니다."), // Success From b2046463106f404d0acbfee3f025e486ba444f0a Mon Sep 17 00:00:00 2001 From: qogustj Date: Tue, 9 Jul 2024 14:38:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[chore]:=20windyflo=20url=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/Windyflo/service/WindyfloService.java | 14 +++++++------- .../com/Nunbody/external/WindyfloMailClient.java | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java b/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java index ce4f3b4..e1aec48 100644 --- a/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java +++ b/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java @@ -23,14 +23,14 @@ public class WindyfloService { public EmailResDto createMail(WindyfloReq windyfloReq) throws IOException { EmailResDto emailResDto = new EmailResDto("", "", ""); while (emailResDto.template().isEmpty() || emailResDto.header().isEmpty() || emailResDto.body().isEmpty()) { -// ConversationQARes result = windyfloMailClient.findMailInVectorDB(windyfloReq.prompt()); -//// emailResDto = extractEmailTemplate(result.getText()); -// if (result.getText().equals("Hmm, I'm not sure")) { + ConversationQARes result = windyfloMailClient.findMailInVectorDB(windyfloReq.prompt()); +// emailResDto = extractEmailTemplate(result.getText()); + if (result.getText().equals("Hmm, I'm not sure")) { emailResDto = extractEmailTemplate(windyfloMailClient.createMail(windyfloReq.prompt())); -//// } -// else -// emailResDto = extractEmailTemplate(result.getText()); -//// System.out.println(result.getText()); + } + else + emailResDto = extractEmailTemplate(result.getText()); + } return emailResDto; } diff --git a/src/main/java/com/Nunbody/external/WindyfloMailClient.java b/src/main/java/com/Nunbody/external/WindyfloMailClient.java index baf87b7..18edc8b 100644 --- a/src/main/java/com/Nunbody/external/WindyfloMailClient.java +++ b/src/main/java/com/Nunbody/external/WindyfloMailClient.java @@ -13,8 +13,8 @@ @Service @RequiredArgsConstructor public class WindyfloMailClient { - private final String FIND_MAIL_URL = "https://windyflo.com/api/v1/prediction/2eb15033-681a-410b-8577-2b69d8e309d4"; - private final String CREATE_MAIL_URL = "https://windyflo.com/api/v1/prediction/f66b8ade-2393-4a1a-ae48-a23c258b460a"; + private final String FIND_MAIL_URL = "https://windyflo.com/api/v1/prediction/05d769b1-0a34-49c5-83d3-6b92c1d650f8"; + private final String CREATE_MAIL_URL = "https://windyflo.com/api/v1/prediction/fd835f04-0889-4f19-8d97-508901854a76"; private final RestTemplate restTemplate; public ConversationQARes findMailInVectorDB(String question) { From 14ca36ef80f800d7611306ec418d75562db637b8 Mon Sep 17 00:00:00 2001 From: qogustj Date: Tue, 9 Jul 2024 14:53:23 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[chore]:=20windyflo=20url=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/Windyflo/service/WindyfloService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java b/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java index e1aec48..440e47f 100644 --- a/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java +++ b/src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java @@ -23,13 +23,13 @@ public class WindyfloService { public EmailResDto createMail(WindyfloReq windyfloReq) throws IOException { EmailResDto emailResDto = new EmailResDto("", "", ""); while (emailResDto.template().isEmpty() || emailResDto.header().isEmpty() || emailResDto.body().isEmpty()) { - ConversationQARes result = windyfloMailClient.findMailInVectorDB(windyfloReq.prompt()); +// ConversationQARes result = windyfloMailClient.findMailInVectorDB(windyfloReq.prompt()); // emailResDto = extractEmailTemplate(result.getText()); - if (result.getText().equals("Hmm, I'm not sure")) { +// if (result.getText().equals("Hmm, I'm not sure")) { emailResDto = extractEmailTemplate(windyfloMailClient.createMail(windyfloReq.prompt())); - } - else - emailResDto = extractEmailTemplate(result.getText()); +// } +// else +// emailResDto = extractEmailTemplate(result.getText()); } return emailResDto;