From 9daf13748121f364edec7cf1109fe2b948f608ca Mon Sep 17 00:00:00 2001 From: yang Date: Fri, 7 Jun 2024 03:46:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?RAC-368=20fix=20:=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EB=B2=84=EC=A0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../batch/cancel/CancelJobConfig.java | 2 +- .../batch/done/DoneJobConfig.java | 2 +- .../batch/done/DoneMentoringRowMapper.java | 19 ------------------- 4 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/com/postgraduate/batch/done/DoneMentoringRowMapper.java diff --git a/build.gradle b/build.gradle index b4d78963..394340b4 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,7 @@ dependencies { // https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter implementation 'org.redisson:redisson-spring-boot-starter:3.18.0' - implementation 'com.github.ywj9811:QueryDslItemReader:v1.0.0' + implementation 'com.github.ywj9811:querydsl-itemreader:v1.0.1' } tasks.named('test') { diff --git a/src/main/java/com/postgraduate/batch/cancel/CancelJobConfig.java b/src/main/java/com/postgraduate/batch/cancel/CancelJobConfig.java index 7b24b499..4ba2e3ab 100644 --- a/src/main/java/com/postgraduate/batch/cancel/CancelJobConfig.java +++ b/src/main/java/com/postgraduate/batch/cancel/CancelJobConfig.java @@ -3,7 +3,7 @@ import com.postgraduate.domain.mentoring.domain.entity.Mentoring; import com.querydslitemreader.core.pagingitemreader.expression.Expression; import com.querydslitemreader.core.pagingitemreader.options.QueryDslNoOffsetNumberOptions; -import com.querydslitemreader.core.pagingitemreader.options.QueryDslNoOffsetPagingItemReader; +import com.querydslitemreader.core.pagingitemreader.QueryDslNoOffsetPagingItemReader; import jakarta.persistence.EntityManagerFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/postgraduate/batch/done/DoneJobConfig.java b/src/main/java/com/postgraduate/batch/done/DoneJobConfig.java index 3b2429b0..50ee2df6 100644 --- a/src/main/java/com/postgraduate/batch/done/DoneJobConfig.java +++ b/src/main/java/com/postgraduate/batch/done/DoneJobConfig.java @@ -4,7 +4,7 @@ import com.postgraduate.domain.mentoring.domain.entity.constant.Status; import com.querydslitemreader.core.pagingitemreader.expression.Expression; import com.querydslitemreader.core.pagingitemreader.options.QueryDslNoOffsetNumberOptions; -import com.querydslitemreader.core.pagingitemreader.options.QueryDslNoOffsetPagingItemReader; +import com.querydslitemreader.core.pagingitemreader.QueryDslNoOffsetPagingItemReader; import jakarta.persistence.EntityManagerFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/postgraduate/batch/done/DoneMentoringRowMapper.java b/src/main/java/com/postgraduate/batch/done/DoneMentoringRowMapper.java deleted file mode 100644 index a7ee0d71..00000000 --- a/src/main/java/com/postgraduate/batch/done/DoneMentoringRowMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.postgraduate.batch.done; - -import org.springframework.jdbc.core.RowMapper; - -import java.sql.ResultSet; -import java.sql.SQLException; - -public class DoneMentoringRowMapper implements RowMapper { - @Override - public DoneMentoring mapRow(ResultSet rs, int rowNum) throws SQLException { - return new DoneMentoring( - rs.getLong("mentoring_id"), - rs.getLong("senior_senior_id"), - rs.getLong("salary_salary_id"), - rs.getString("date"), - rs.getInt("pay") - ); - } -} From 2f03bdc934a7531c3b820f486e4dad2a3f94fe00 Mon Sep 17 00:00:00 2001 From: yang Date: Wed, 12 Jun 2024 20:43:15 +0900 Subject: [PATCH 2/3] =?UTF-8?q?RAC-397=20refactor=20:=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=ED=86=A1=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rSingUpMessage.java => ButtonMessage.java} | 4 +- .../content/CertificationApproveMessage.java | 10 ---- .../content/CertificationDeniedMessage.java | 10 ---- .../dto/req/content/JuniorAcceptMessage.java | 7 --- .../dto/req/content/JuniorApplyMessage.java | 7 --- .../dto/req/content/JuniorFinishMessage.java | 10 ---- .../content/JuniorMatchingFailMessage.java | 11 ---- .../content/JuniorMatchingSuccessMessage.java | 11 ---- .../dto/req/content/JuniorRefuseMessage.java | 10 ---- .../dto/req/content/SeniorAcceptMessage.java | 7 --- .../dto/req/content/SeniorApplyMessage.java | 11 ---- .../dto/req/content/SeniorFinishMessage.java | 7 --- ...ngWaitingMessage.java => TextMessage.java} | 2 +- .../content/{button => }/WebLinkButton.java | 2 +- .../application/mapper/BizppurioMapper.java | 51 ++++++++++++------- .../usecase/BizppurioSeniorMessage.java | 4 ++ 16 files changed, 41 insertions(+), 123 deletions(-) rename src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/{SeniorSingUpMessage.java => ButtonMessage.java} (61%) delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationApproveMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationDeniedMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorAcceptMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorApplyMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorFinishMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingFailMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingSuccessMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorRefuseMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorAcceptMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorApplyMessage.java delete mode 100644 src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorFinishMessage.java rename src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/{JuniorMatchingWaitingMessage.java => TextMessage.java} (79%) rename src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/{button => }/WebLinkButton.java (93%) diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorSingUpMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/ButtonMessage.java similarity index 61% rename from src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorSingUpMessage.java rename to src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/ButtonMessage.java index 9287918b..31902491 100644 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorSingUpMessage.java +++ b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/ButtonMessage.java @@ -1,8 +1,6 @@ package com.postgraduate.global.bizppurio.application.dto.req.content; -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record SeniorSingUpMessage( +public record ButtonMessage( String message, String senderkey, String templatecode, diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationApproveMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationApproveMessage.java deleted file mode 100644 index e0ebb6f5..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationApproveMessage.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record CertificationApproveMessage( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationDeniedMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationDeniedMessage.java deleted file mode 100644 index 51f9c569..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/CertificationDeniedMessage.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record CertificationDeniedMessage( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorAcceptMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorAcceptMessage.java deleted file mode 100644 index 8d29dc64..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorAcceptMessage.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -public record JuniorAcceptMessage( - String message, - String senderkey, - String templatecode -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorApplyMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorApplyMessage.java deleted file mode 100644 index 0cfbc462..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorApplyMessage.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -public record JuniorApplyMessage( - String message, - String senderkey, - String templatecode -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorFinishMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorFinishMessage.java deleted file mode 100644 index 6e16ac5d..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorFinishMessage.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record JuniorFinishMessage( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingFailMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingFailMessage.java deleted file mode 100644 index 15a79d2f..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingFailMessage.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record JuniorMatchingFailMessage ( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button -) implements Message -{} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingSuccessMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingSuccessMessage.java deleted file mode 100644 index a4557bdd..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingSuccessMessage.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record JuniorMatchingSuccessMessage( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button -) implements Message { -} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorRefuseMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorRefuseMessage.java deleted file mode 100644 index 651af74a..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorRefuseMessage.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record JuniorRefuseMessage( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorAcceptMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorAcceptMessage.java deleted file mode 100644 index 9497de60..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorAcceptMessage.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -public record SeniorAcceptMessage( - String message, - String senderkey, - String templatecode -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorApplyMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorApplyMessage.java deleted file mode 100644 index 0d3d7698..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorApplyMessage.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; - -public record SeniorApplyMessage( - String message, - String senderkey, - String templatecode, - WebLinkButton[] button - -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorFinishMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorFinishMessage.java deleted file mode 100644 index ce81d0f2..00000000 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/SeniorFinishMessage.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content; - -public record SeniorFinishMessage( - String message, - String senderkey, - String templatecode -) implements Message {} diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingWaitingMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/TextMessage.java similarity index 79% rename from src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingWaitingMessage.java rename to src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/TextMessage.java index 63d1451d..6497d9b6 100644 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/JuniorMatchingWaitingMessage.java +++ b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/TextMessage.java @@ -1,6 +1,6 @@ package com.postgraduate.global.bizppurio.application.dto.req.content; -public record JuniorMatchingWaitingMessage( +public record TextMessage( String message, String senderkey, String templatecode diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/button/WebLinkButton.java b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/WebLinkButton.java similarity index 93% rename from src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/button/WebLinkButton.java rename to src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/WebLinkButton.java index d0634528..00932bbc 100644 --- a/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/button/WebLinkButton.java +++ b/src/main/java/com/postgraduate/global/bizppurio/application/dto/req/content/WebLinkButton.java @@ -1,4 +1,4 @@ -package com.postgraduate.global.bizppurio.application.dto.req.content.button; +package com.postgraduate.global.bizppurio.application.dto.req.content; public record WebLinkButton( String name, diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/mapper/BizppurioMapper.java b/src/main/java/com/postgraduate/global/bizppurio/application/mapper/BizppurioMapper.java index 397eca38..4cd06e21 100644 --- a/src/main/java/com/postgraduate/global/bizppurio/application/mapper/BizppurioMapper.java +++ b/src/main/java/com/postgraduate/global/bizppurio/application/mapper/BizppurioMapper.java @@ -6,7 +6,7 @@ import com.postgraduate.global.bizppurio.application.dto.req.JuniorMatchingFailRequest; import com.postgraduate.global.bizppurio.application.dto.req.JuniorMatchingSuccessRequest; import com.postgraduate.global.bizppurio.application.dto.req.content.*; -import com.postgraduate.global.bizppurio.application.dto.req.content.button.WebLinkButton; +import com.postgraduate.global.bizppurio.application.dto.req.content.WebLinkButton; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -30,6 +30,8 @@ public class BizppurioMapper { private String certificationDenied; @Value("${bizppurio.template.junior_mentoring_refuse}") private String juniorMentoringRefuse; + @Value("${bizppurio.template.senior_mentoring_refund}") + private String seniorMentoringRefund; @Value("${bizppurio.template.senior_mentoring_accept}") private String seniorMentoringAccept; @Value("${bizppurio.template.junior_mentoring_accept}") @@ -73,7 +75,7 @@ public CommonRequest mapToSeniorSignUpMessage(User user) { 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); + Message messageBody = new ButtonMessage(message, senderKey, seniorSignUp, buttons); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -86,7 +88,7 @@ public CommonRequest mapToSeniorApplyMessage(User user) { WebLinkButton mentoringCheck = new WebLinkButton("멘토링 신청 확인하기", type, seniorMentoringPage, seniorMentoringPage); WebLinkButton[] buttons = {mentoringCheck}; - Message messageBody = new SeniorApplyMessage(message, senderKey, seniorMentoringApply, buttons); + Message messageBody = new ButtonMessage(message, senderKey, seniorMentoringApply, buttons); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -99,7 +101,7 @@ public CommonRequest mapToSeniorAcceptMessage(User user, String link, String tim "\n" + "멘토링 진행 일시에 선배님께서 줌 또는 구글미트를 활용하여 비대면 대화 링크를 열어주시면 됩니다!" ); - Message messageBody = new SeniorAcceptMessage(message, senderKey, seniorMentoringAccept); + Message messageBody = new TextMessage(message, senderKey, seniorMentoringAccept); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -111,7 +113,7 @@ public CommonRequest mapToCertificationApprove(User user) { ); WebLinkButton profile = new WebLinkButton("프로필 완성하기", type, profilePage, profilePage); WebLinkButton[] buttons = {profile}; - CertificationApproveMessage messageBody = new CertificationApproveMessage(message, senderKey, certificationApprove, buttons); + Message messageBody = new ButtonMessage(message, senderKey, certificationApprove, buttons); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -125,7 +127,7 @@ public CommonRequest mapToCertificationDenied(User user) { ); WebLinkButton certification = new WebLinkButton("대학원 재인증하기", type, certificationPage, certificationPage); WebLinkButton[] buttons = {certification}; - CertificationDeniedMessage messageBody = new CertificationDeniedMessage(message, senderKey, certificationDenied, buttons); + Message messageBody = new ButtonMessage(message, senderKey, certificationDenied, buttons); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -139,7 +141,22 @@ public CommonRequest mapToSeniorFinish(User user) { "\n" + "멘토링 확정은 멘토링이 정상적으로 진행되었는지 확인하기 위함이며, 멘토링 완료 확정이 진행되지 않을시 정산이 지연될 수 있는점 양해 부탁드려요!\uD83D\uDE03" ); - SeniorFinishMessage messageBody = new SeniorFinishMessage(message, senderKey, seniorMentoringFinish); + Message messageBody = new TextMessage(message, senderKey, seniorMentoringFinish); + return createCommonRequest(messageBody, user.getPhoneNumber()); + } + + public CommonRequest mapToSeniorRefundMessage(User user) { + String message = ( + "안녕하세요, " + user.getNickName() + "님!\n" + + "대학원 김선배입니다 \uD83D\uDE42\n" + + "\n" + + "다름이 아니라 신청한 후배님께서 멘토링을 환불하셔서 알려드려요 !\n" + + "\n" + + "후배가 환불할 경우, 멘토링은 자동으로 취소되며 다음 멘토링 재매칭을 위해 최선을 다하겠습니다 \uD83D\uDE42\n" + + "\n" + + "항상 저희 대학원 김선배를 찾아주셔서 감사드려요" + ); + Message messageBody = new TextMessage(message, senderKey, seniorMentoringRefund); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -151,7 +168,7 @@ public CommonRequest mapToJuniorApplyMessage(User user) { "\n" + "선배님이 다음날 오후 11시 59분까지 멘토링을 수락해주시지 않으면 멘토링이 자동 취소 및 환불되니 유의해주세요! \uD83D\uDE42" ); - JuniorApplyMessage messageBody = new JuniorApplyMessage(message, senderKey, juniorMentoringApply); + Message messageBody = new TextMessage(message, senderKey, juniorMentoringApply); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -166,7 +183,7 @@ public CommonRequest mapToJuniorAcceptMessage(User user, String link, String tim "\n" + "멘토링 시간은 꼭 지켜주세요! \uD83D\uDD05" ); - JuniorAcceptMessage messageBody = new JuniorAcceptMessage(message, senderKey, juniorMentoringAccept); + Message messageBody = new TextMessage(message, senderKey, juniorMentoringAccept); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -180,7 +197,7 @@ public CommonRequest mapToJuniorRefuseMessage(User user) { ); WebLinkButton otherSenior = new WebLinkButton("다른 선배 보러가기", type, mainPage, mainPage); WebLinkButton[] buttons = {otherSenior}; - JuniorRefuseMessage messageBody = new JuniorRefuseMessage(message, senderKey, juniorMentoringRefuse, buttons); + Message messageBody = new ButtonMessage(message, senderKey, juniorMentoringRefuse, buttons); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -198,7 +215,7 @@ public CommonRequest mapToJuniorFinish(User user) { WebLinkButton mentoringFinish = new WebLinkButton("진행 확정하러가기", type, juniorMentoringPage, juniorMentoringPage); WebLinkButton[] buttons = {mentoringFinish}; - JuniorFinishMessage messageBody = new JuniorFinishMessage(message, senderKey, juniorMentoringFinish, buttons); + Message messageBody = new ButtonMessage(message, senderKey, juniorMentoringFinish, buttons); return createCommonRequest(messageBody, user.getPhoneNumber()); } @@ -213,11 +230,11 @@ public CommonRequest mapToJuniorMatchingFail(JuniorMatchingFailRequest request) request.alterPostgraduate() + "대학원 " + request.alterMajor() + "학과의 선배를 매칭 드리고 싶어요!\n" + "\n" + "신청해주신 선배는 찾지 못했지만, 유사학과의 다른 선배와 멘토링을 해보는 건 어때요 ?" - ); + ); WebLinkButton goMainPage = new WebLinkButton("대학원 김선배 바로가기", type, mainPage, mainPage); WebLinkButton[] buttons = {goMainPage}; - JuniorMatchingFailMessage messageBody = new JuniorMatchingFailMessage(message, senderKey, juniorMatchingFail, buttons); + Message messageBody = new ButtonMessage(message, senderKey, juniorMatchingFail, buttons); return createCommonRequest(messageBody, request.phoneNumber()); } @@ -227,14 +244,14 @@ public CommonRequest mapToJuniorMatchingSuccess(JuniorMatchingSuccessRequest req "\n" + "오래 기다려주셔서 감사드립니다!\n" + "\n" + - request.name() + "님께서 신청해주신, " + request.postgraduate() + "대학원 " + request.major() + "학과 선배와 매칭되었어요 \uD83D\uDE42\n" + + request.name() + "님께서 신청해주신, " + request.postgraduate() + "대학원 " + request.major() + "랩실 선배와 매칭되었어요 \uD83D\uDE42\n" + "\n" + "아래 링크를 눌러 멘토링을 진행해보세요 !" - ); + ); WebLinkButton goMainPage = new WebLinkButton("대학원 김선배 바로가기", type, mainPage, mainPage); WebLinkButton[] buttons = {goMainPage}; - JuniorMatchingSuccessMessage messageBody = new JuniorMatchingSuccessMessage(message, senderKey, juniorMatchingSucess, buttons); + Message messageBody = new ButtonMessage(message, senderKey, juniorMatchingSucess, buttons); return createCommonRequest(messageBody, request.phoneNumber()); } @@ -249,7 +266,7 @@ public CommonRequest mapToJuniorMatchingWaiting(User user) { "신청해주신 선배를 찾는데에는 3~7일 정도 소요되어요 \uD83D\uDE0A" ); - JuniorMatchingWaitingMessage messageBody = new JuniorMatchingWaitingMessage(message, senderKey, juniorMatchingWaiting); + Message messageBody = new TextMessage(message, senderKey, juniorMatchingWaiting); return createCommonRequest(messageBody, user.getPhoneNumber()); } diff --git a/src/main/java/com/postgraduate/global/bizppurio/application/usecase/BizppurioSeniorMessage.java b/src/main/java/com/postgraduate/global/bizppurio/application/usecase/BizppurioSeniorMessage.java index cfaab53d..36b53432 100644 --- a/src/main/java/com/postgraduate/global/bizppurio/application/usecase/BizppurioSeniorMessage.java +++ b/src/main/java/com/postgraduate/global/bizppurio/application/usecase/BizppurioSeniorMessage.java @@ -22,6 +22,10 @@ public void mentoringApply(User user) { bizppurioSend.sendMessageWithExceptionHandling(() -> mapper.mapToSeniorApplyMessage(user)); } + public void mentoringRefund(User user) { + bizppurioSend.sendMessageWithExceptionHandling(() -> mapper.mapToSeniorRefundMessage(user)); + } + public void mentoringAccept(Senior senior, String time) { bizppurioSend.sendMessageWithExceptionHandling(() -> { User user = senior.getUser(); From f8c4007e259397a89b3e00834711dba94f4e69de Mon Sep 17 00:00:00 2001 From: yang Date: Wed, 12 Jun 2024 20:43:28 +0900 Subject: [PATCH 3/3] =?UTF-8?q?RAC-397=20feat=20:=20=ED=9B=84=EB=B0=B0=20?= =?UTF-8?q?=EB=A9=98=ED=86=A0=EB=A7=81=20=ED=99=98=EB=B6=88=EC=8B=9C=20?= =?UTF-8?q?=EC=84=A0=EB=B0=B0=20=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mentoring/application/usecase/MentoringManageUseCase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java b/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java index c187e2b2..ae7217d7 100644 --- a/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java +++ b/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java @@ -72,9 +72,11 @@ public ApplyingResponse applyMentoring(User user, MentoringApplyRequest request) @Transactional public void updateCancel(User user, Long mentoringId) { Mentoring mentoring = mentoringGetService.byIdAndUserAndWaiting(mentoringId, user); + Senior senior = mentoring.getSenior(); Payment payment = mentoring.getPayment(); paymentManageUseCase.refundPayByUser(user, payment.getOrderId()); mentoringUpdateService.updateCancel(mentoring); + bizppurioSeniorMessage.mentoringRefund(senior.getUser()); }