Skip to content

Commit

Permalink
Merge pull request #244 from WE-ARE-RACCOONS/RAC-347
Browse files Browse the repository at this point in the history
RAC-347 fix : ์•Œ๋ฆผํ†ก ๋‚ด์šฉ ์ˆ˜์ •
  • Loading branch information
ywj9811 authored Apr 23, 2024
2 parents 14e8995 + bf6147b commit 8a2dcd2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
public record WebLinkButton(
String name,
String type,
String url_mobile
String url_mobile,
String url_pc
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public CommonRequest mapToSeniorSignUpMessage(User user) {
"์„ ๋ฐฐ๋‹˜์— ์„ฑ๊ณต์ ์ธ ๋ฉ˜ํ† ๋ง ๋งค์นญ์„ ๊ธฐ์›ํ•˜๊ฒ ์Šต๋‹ˆ๋‹ค! \uD83D\uDE42"
);

WebLinkButton certification = new WebLinkButton("๋Œ€ํ•™์› ์ธ์ฆํ•˜๊ธฐ", type, certificationPage);
WebLinkButton profile = new WebLinkButton("ํ”„๋กœํ•„ ์ž‘์„ฑํ•˜๊ธฐ", "WL", profilePage);
WebLinkButton certification = new WebLinkButton("๋Œ€ํ•™์› ์ธ์ฆํ•˜๊ธฐ", type, certificationPage, certificationPage);
WebLinkButton profile = new WebLinkButton("ํ”„๋กœํ•„ ์ž‘์„ฑํ•˜๊ธฐ", "WL", profilePage, profilePage);
WebLinkButton[] buttons = {certification, profile};
Message messageBody = new SeniorSingUpMessage(message, senderKey, seniorSignUp, buttons);
return createCommonRequest(messageBody, user);
Expand All @@ -76,7 +76,7 @@ public CommonRequest mapToSeniorApplyMessage(User user) {
"ํ›„๋ฐฐ๋‹˜์œผ๋กœ๋ถ€ํ„ฐ ๋ฉ˜ํ† ๋ง ์‹ ์ฒญ์ด ๋“ค์–ด์™”์Šต๋‹ˆ๋‹ค! ๋‹ค์Œ๋‚  ์˜คํ›„ 11์‹œ 59๋ถ„๊นŒ์ง€ ์‹ ์ฒญํ•ด์ฃผ์‹œ์ง€ ์•Š์œผ๋ฉด ๋ฉ˜ํ† ๋ง ์‹ ์ฒญ์ด ์ž๋™ ์ทจ์†Œ๋˜๋‹ˆ! ์ง€๊ธˆ ์ˆ˜๋ฝํ•˜๋Ÿฌ ๊ฐ€๋ณผ๊นŒ์š”? \uD83D\uDE42"
);

WebLinkButton mentoringCheck = new WebLinkButton("๋ฉ˜ํ† ๋ง ์‹ ์ฒญ ํ™•์ธํ•˜๊ธฐ", type, seniorMentoringPage);
WebLinkButton mentoringCheck = new WebLinkButton("๋ฉ˜ํ† ๋ง ์‹ ์ฒญ ํ™•์ธํ•˜๊ธฐ", type, seniorMentoringPage, seniorMentoringPage);
WebLinkButton[] buttons = {mentoringCheck};
Message messageBody = new SeniorApplyMessage(message, senderKey, seniorMentoringApply, buttons);
return createCommonRequest(messageBody, user);
Expand All @@ -101,7 +101,7 @@ public CommonRequest mapToCertificationApprove(User user) {
"\n" +
"์ด์ œ ํ”„๋กœํ•„ ์ž‘์„ฑ๋งŒ ์™„๋ฃŒ๋˜๋ฉด, ์„ ๋ฐฐ๋‹˜์˜ ๋ฉ˜ํ† ๋ง ์‹ ์ฒญ๋ฅ ์ด up!up! \uD83D\uDD25"
);
WebLinkButton profile = new WebLinkButton("ํ”„๋กœํ•„ ์™„์„ฑํ•˜๊ธฐ", type, profilePage);
WebLinkButton profile = new WebLinkButton("ํ”„๋กœํ•„ ์™„์„ฑํ•˜๊ธฐ", type, profilePage, profilePage);
WebLinkButton[] buttons = {profile};
CertificationApproveMessage messageBody = new CertificationApproveMessage(message, senderKey, certificationApprove, buttons);
return createCommonRequest(messageBody, user);
Expand All @@ -115,7 +115,7 @@ public CommonRequest mapToCertificationDenied(User user) {
"\n" +
"์žฌ์‹ ์ฒญ ํ•ด์ฃผ์‹œ๋ฉด ๋น ๋ฅด๊ฒŒ ์žฌ์‹ฌ์‚ฌ ํ•˜๋„๋ก ํ•˜๊ฒ ์Šต๋‹ˆ๋‹ค!"
);
WebLinkButton certification = new WebLinkButton("๋Œ€ํ•™์› ์žฌ์ธ์ฆํ•˜๊ธฐ", type, certificationPage);
WebLinkButton certification = new WebLinkButton("๋Œ€ํ•™์› ์žฌ์ธ์ฆํ•˜๊ธฐ", type, certificationPage, certificationPage);
WebLinkButton[] buttons = {certification};
CertificationDeniedMessage messageBody = new CertificationDeniedMessage(message, senderKey, certificationDenied, buttons);
return createCommonRequest(messageBody, user);
Expand Down Expand Up @@ -170,7 +170,7 @@ public CommonRequest mapToJuniorRefuseMessage(User user) {
"\n" +
"ํ˜น์‹œ ๋ฉ˜ํ† ๋ง์„ ์ง„ํ–‰ํ•˜๊ณ  ์‹ถ์—ˆ๋˜ ๋‹ค๋ฅธ ์„ ๋ฐฐ๋‹˜์ด ์žˆ๋‹ค๋ฉด ์ง€๊ธˆ ์‹ ์ฒญํ•ด๋ณด์„ธ์š”!"
);
WebLinkButton otherSenior = new WebLinkButton("๋‹ค๋ฅธ ์„ ๋ฐฐ ๋ณด๋Ÿฌ๊ฐ€๊ธฐ", type, mainPage);
WebLinkButton otherSenior = new WebLinkButton("๋‹ค๋ฅธ ์„ ๋ฐฐ ๋ณด๋Ÿฌ๊ฐ€๊ธฐ", type, mainPage, mainPage);
WebLinkButton[] buttons = {otherSenior};
JuniorRefuseMessage messageBody = new JuniorRefuseMessage(message, senderKey, juniorMentoringRefuse, buttons);
return createCommonRequest(messageBody, user);
Expand All @@ -187,7 +187,7 @@ public CommonRequest mapToJuniorFinish(User user) {
"\n" +
"๋ณ„๋„์˜ ๋ฌธ์˜๊ฐ€ ์—†๋‹ค๋ฉด, 3์ผ ํ›„ ๋ฉ˜ํ† ๋ง์ด ์ž๋™ ํ™•์ •๋˜๋ฉฐ ์„ ๋ฐฐ๋‹˜๊ป˜ ๋ณด์ˆ˜๋น„๊ฐ€ ์ •์‚ฐ๋ฉ๋‹ˆ๋‹ค!"
);
WebLinkButton mentoringFinish = new WebLinkButton("์ง„ํ–‰ ํ™•์ •ํ•˜๋Ÿฌ๊ฐ€๊ธฐ", type, juniorMentoringPage);
WebLinkButton mentoringFinish = new WebLinkButton("์ง„ํ–‰ ํ™•์ •ํ•˜๋Ÿฌ๊ฐ€๊ธฐ", type, juniorMentoringPage, juniorMentoringPage);
WebLinkButton[] buttons = {mentoringFinish};

JuniorFinishMessage messageBody = new JuniorFinishMessage(message, senderKey, juniorMentoringFinish, buttons);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void handle(HttpServletRequest request, HttpServletResponse response, Acc
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding("UTF-8");
logService.save(new LogRequest(env, CustomAccessDeniedHandler.class.getSimpleName(), PERMISSION_DENIED.getMessage()));
log.error("AccessDenied : {}", PERMISSION_DENIED.getMessage());
log.error("AuthenticationEntryPoint : {} {}", PERMISSION_DENIED.getMessage(), request.getRequestURI());
objectMapper.writeValue(
response.getOutputStream(),
new ErrorResponse(AUTH_DENIED.getCode(), PERMISSION_DENIED.getMessage())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void commence(HttpServletRequest request, HttpServletResponse response, A
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding("UTF-8");
logService.save(new LogRequest(env, CustomAuthenticationEntryPoint.class.getSimpleName(), FAILED_AUTH.getMessage()));
log.error("AuthenticationEntryPoint : {}", FAILED_AUTH.getMessage());
log.error("AuthenticationEntryPoint : {} {}", FAILED_AUTH.getMessage(), request.getRequestURI());
objectMapper.writeValue(
response.getOutputStream(),
new ErrorResponse(AUTH_FAILED.getCode(), FAILED_AUTH.getMessage())
Expand Down

0 comments on commit 8a2dcd2

Please sign in to comment.