Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] : windyflo url 변경 #72

Merged
merged 4 commits into from
Jul 9, 2024
Merged

[chore] : windyflo url 변경 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91ae1ca
로직 변경
qogustj Jul 4, 2024
b204646
[chore]: windyflo url 변경
qogustj Jul 9, 2024
256095c
Merge branch 'main' of github.com:Capstone-Richam/richam-server into …
qogustj Jul 9, 2024
14ca36e
[chore]: windyflo url 변경
qogustj Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/Nunbody/domain/Windyflo/service/WindyfloService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ 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());
// 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());

}
return emailResDto;
}
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/Nunbody/domain/mail/service/MailManageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/Nunbody/external/WindyfloMailClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/Nunbody/global/error/ErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading