From 65ffe94d8abf8e9a3f06b76202a4b6bbea135345 Mon Sep 17 00:00:00 2001 From: yang Date: Thu, 30 May 2024 02:15:10 +0900 Subject: [PATCH 1/3] =?UTF-8?q?RAC-393=20fix=20:=20=EB=B0=B0=EC=B9=98=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EA=B0=92=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 --- .../com/postgraduate/batch/scheduler/JobSchedulerConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/postgraduate/batch/scheduler/JobSchedulerConfig.java b/src/main/java/com/postgraduate/batch/scheduler/JobSchedulerConfig.java index a2c675ac..68a42e56 100644 --- a/src/main/java/com/postgraduate/batch/scheduler/JobSchedulerConfig.java +++ b/src/main/java/com/postgraduate/batch/scheduler/JobSchedulerConfig.java @@ -16,6 +16,8 @@ import java.time.LocalDateTime; +import static com.postgraduate.domain.salary.util.SalaryUtil.*; + @Configuration @Slf4j @RequiredArgsConstructor @@ -47,7 +49,7 @@ public void launchDoneJob() throws JobInstanceAlreadyCompleteException, JobExecu @Scheduled(cron = "0 0 0 * * 4", zone = "Asia/Seoul") public void launchSalaryJob() throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { JobParameters jobParameters = new JobParametersBuilder() - .addLocalDateTime("date", LocalDateTime.now()) + .addLocalDateTime("date", LocalDateTime.from(getSalaryDate().plusDays(7))) .toJobParameters(); jobLauncher.run(salaryJob, jobParameters); } From d91de1d4169be2359f92c6d4eee898977d32f7eb Mon Sep 17 00:00:00 2001 From: yang Date: Thu, 30 May 2024 02:17:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?RAC-393=20refactor=20:=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/dto/req/Login.java | 2 +- .../dto/req/SendMessageRequest.java | 2 +- .../dto/res/CertificationDetailsResponse.java | 2 +- .../application/dto/res/MentoringInfo.java | 2 +- .../dto/res/MentoringManageResponse.java | 2 +- .../dto/res/MentoringWithPaymentResponse.java | 2 +- .../application/dto/res}/PaymentInfo.java | 2 +- .../dto/res/SalaryDetailsResponse.java | 2 +- .../application/dto/res}/SalaryInfo.java | 2 +- .../dto/res/SalaryInfoWithOutId.java | 2 +- .../application/dto/res/SeniorInfo.java | 2 +- .../dto/res/UnSettledSalaryInfo.java | 2 +- .../application/dto/res}/UserInfo.java | 2 +- .../dto/res}/UserMentoringInfo.java | 2 +- .../application/dto/res/WishResponse.java | 2 +- .../admin/application/mapper/AdminMapper.java | 70 +++--- .../application/usecase/AdminAuthUseCase.java | 6 +- .../usecase/AdminMentoringUseCase.java | 16 +- .../usecase/AdminPaymentUseCase.java | 8 +- .../usecase/AdminSalaryUseCase.java | 10 +- .../usecase/AdminSeniorUseCase.java | 10 +- .../application/usecase/AdminUserUseCase.java | 12 +- .../domain/service/AuthGetService.java | 2 +- .../AdminWithThymeLeafController.java | 6 +- .../admin/application/dto/MentoringInfo.java | 14 -- .../admin/application/dto/SeniorInfo.java | 15 -- .../dto/req/SeniorStatusRequest.java | 7 - .../dto/res/CertificationResponse.java | 12 - .../dto/res/MentoringManageResponse.java | 11 - .../dto/res/PaymentManageResponse.java | 12 - .../application/dto/res/RefundResponse.java | 14 -- .../dto/res/SalaryManageResponse.java | 12 - .../dto/res/SeniorManageResponse.java | 12 - .../dto/res/UserManageResponse.java | 12 - .../MentoringManageByAdminUseCase.java | 66 ----- .../usecase/PaymentManageByAdminUseCase.java | 28 --- .../usecase/SalaryManageByAdminUseCase.java | 82 ------- .../usecase/SeniorManageByAdminUseCase.java | 68 ------ .../usecase/UserManageByAdminUseCase.java | 47 ---- .../exception/SeniorNotWaitingException.java | 12 - .../admin/presentation/AdminController.java | 132 ---------- .../constant/AdminResponseCode.java | 15 -- .../constant/AdminResponseMessage.java | 17 -- .../presentation/constant/SalaryStatus.java | 8 - .../dto/res/CertificationDetailsResponse.java | 17 -- .../dto/res/MentoringWithPaymentResponse.java | 14 -- .../application/dto/res/PaymentInfo.java | 15 -- .../dto/res/SalaryDetailsResponse.java | 11 - .../application/dto/res/SalaryInfo.java | 18 -- .../application/dto/res/UserInfo.java | 17 -- .../dto/res/UserMentoringInfo.java | 6 - .../application/dto/res/WishResponse.java | 15 -- .../application/mapper/AdminSsrMapper.java | 230 ------------------ 53 files changed, 88 insertions(+), 1021 deletions(-) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/req/Login.java (50%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/req/SendMessageRequest.java (63%) rename src/main/java/com/postgraduate/{domain => }/admin/application/dto/res/CertificationDetailsResponse.java (85%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/res/MentoringInfo.java (82%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/res/MentoringManageResponse.java (71%) rename src/main/java/com/postgraduate/{domain => }/admin/application/dto/res/MentoringWithPaymentResponse.java (83%) rename src/main/java/com/postgraduate/{domain/admin/application/dto => admin/application/dto/res}/PaymentInfo.java (85%) rename src/main/java/com/postgraduate/{domain => }/admin/application/dto/res/SalaryDetailsResponse.java (79%) rename src/main/java/com/postgraduate/{domain/admin/application/dto => admin/application/dto/res}/SalaryInfo.java (90%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/res/SalaryInfoWithOutId.java (88%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/res/SeniorInfo.java (82%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/dto/res/UnSettledSalaryInfo.java (89%) rename src/main/java/com/postgraduate/{domain/admin/application/dto => admin/application/dto/res}/UserInfo.java (87%) rename src/main/java/com/postgraduate/{domain/admin/application/dto => admin/application/dto/res}/UserMentoringInfo.java (62%) rename src/main/java/com/postgraduate/{domain => }/admin/application/dto/res/WishResponse.java (82%) rename src/main/java/com/postgraduate/{domain => }/admin/application/mapper/AdminMapper.java (78%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/usecase/AdminAuthUseCase.java (70%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/usecase/AdminMentoringUseCase.java (84%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/usecase/AdminPaymentUseCase.java (88%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/usecase/AdminSalaryUseCase.java (86%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/usecase/AdminSeniorUseCase.java (85%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/application/usecase/AdminUserUseCase.java (78%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/domain/service/AuthGetService.java (89%) rename src/main/java/com/postgraduate/{domain/adminssr => admin}/presentation/AdminWithThymeLeafController.java (95%) delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/MentoringInfo.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/SeniorInfo.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/req/SeniorStatusRequest.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringManageResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/PaymentManageResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/RefundResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryManageResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/SeniorManageResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/dto/res/UserManageResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/usecase/MentoringManageByAdminUseCase.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/usecase/PaymentManageByAdminUseCase.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/usecase/SeniorManageByAdminUseCase.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/application/usecase/UserManageByAdminUseCase.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/exception/SeniorNotWaitingException.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/presentation/AdminController.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseCode.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseMessage.java delete mode 100644 src/main/java/com/postgraduate/domain/admin/presentation/constant/SalaryStatus.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/CertificationDetailsResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringWithPaymentResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/PaymentInfo.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryDetailsResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfo.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserInfo.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserMentoringInfo.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/dto/res/WishResponse.java delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/mapper/AdminSsrMapper.java diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/req/Login.java b/src/main/java/com/postgraduate/admin/application/dto/req/Login.java similarity index 50% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/req/Login.java rename to src/main/java/com/postgraduate/admin/application/dto/req/Login.java index 9c774554..f7c3ea07 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/req/Login.java +++ b/src/main/java/com/postgraduate/admin/application/dto/req/Login.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.req; +package com.postgraduate.admin.application.dto.req; public record Login(String nickName, String phoneNumber) { } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/req/SendMessageRequest.java b/src/main/java/com/postgraduate/admin/application/dto/req/SendMessageRequest.java similarity index 63% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/req/SendMessageRequest.java rename to src/main/java/com/postgraduate/admin/application/dto/req/SendMessageRequest.java index e6e65e08..08ab7385 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/req/SendMessageRequest.java +++ b/src/main/java/com/postgraduate/admin/application/dto/req/SendMessageRequest.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.req; +package com.postgraduate.admin.application.dto.req; public record SendMessageRequest(String phoneNumber, String nickName, String postgraduate, String major) { } diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationDetailsResponse.java b/src/main/java/com/postgraduate/admin/application/dto/res/CertificationDetailsResponse.java similarity index 85% rename from src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationDetailsResponse.java rename to src/main/java/com/postgraduate/admin/application/dto/res/CertificationDetailsResponse.java index 3590cb4d..be9df783 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationDetailsResponse.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/CertificationDetailsResponse.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto.res; +package com.postgraduate.admin.application.dto.res; import java.time.LocalDateTime; diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/MentoringInfo.java similarity index 82% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/MentoringInfo.java index d9cda907..845b542a 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/MentoringInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.res; +package com.postgraduate.admin.application.dto.res; import com.postgraduate.domain.mentoring.domain.entity.constant.Status; diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringManageResponse.java b/src/main/java/com/postgraduate/admin/application/dto/res/MentoringManageResponse.java similarity index 71% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringManageResponse.java rename to src/main/java/com/postgraduate/admin/application/dto/res/MentoringManageResponse.java index 0ebe655d..5c85a7c0 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringManageResponse.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/MentoringManageResponse.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.res; +package com.postgraduate.admin.application.dto.res; import java.util.List; diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringWithPaymentResponse.java b/src/main/java/com/postgraduate/admin/application/dto/res/MentoringWithPaymentResponse.java similarity index 83% rename from src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringWithPaymentResponse.java rename to src/main/java/com/postgraduate/admin/application/dto/res/MentoringWithPaymentResponse.java index 55bdfc56..70c33a1d 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringWithPaymentResponse.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/MentoringWithPaymentResponse.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto.res; +package com.postgraduate.admin.application.dto.res; public record MentoringWithPaymentResponse( Long mentoringId, diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/PaymentInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/PaymentInfo.java similarity index 85% rename from src/main/java/com/postgraduate/domain/admin/application/dto/PaymentInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/PaymentInfo.java index 5e935e5b..da43b240 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/PaymentInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/PaymentInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto; +package com.postgraduate.admin.application.dto.res; import com.postgraduate.domain.payment.domain.entity.constant.Status; diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryDetailsResponse.java b/src/main/java/com/postgraduate/admin/application/dto/res/SalaryDetailsResponse.java similarity index 79% rename from src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryDetailsResponse.java rename to src/main/java/com/postgraduate/admin/application/dto/res/SalaryDetailsResponse.java index ee5076b7..eae4749a 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryDetailsResponse.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/SalaryDetailsResponse.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto.res; +package com.postgraduate.admin.application.dto.res; public record SalaryDetailsResponse( String nickName, diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/SalaryInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfo.java similarity index 90% rename from src/main/java/com/postgraduate/domain/admin/application/dto/SalaryInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfo.java index 6ba17ad7..d6d0bf5a 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/SalaryInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto; +package com.postgraduate.admin.application.dto.res; import java.time.LocalDateTime; diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfoWithOutId.java b/src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfoWithOutId.java similarity index 88% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfoWithOutId.java rename to src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfoWithOutId.java index 2ccac1fb..e4e67b02 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfoWithOutId.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfoWithOutId.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.res; +package com.postgraduate.admin.application.dto.res; import java.time.LocalDateTime; diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SeniorInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/SeniorInfo.java similarity index 82% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SeniorInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/SeniorInfo.java index 660408af..b5b69796 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SeniorInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/SeniorInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.res; +package com.postgraduate.admin.application.dto.res; import com.postgraduate.domain.senior.domain.entity.constant.Status; diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UnSettledSalaryInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/UnSettledSalaryInfo.java similarity index 89% rename from src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UnSettledSalaryInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/UnSettledSalaryInfo.java index 589dd1a1..20ca76e7 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UnSettledSalaryInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/UnSettledSalaryInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.application.dto.res; +package com.postgraduate.admin.application.dto.res; import java.time.LocalDate; diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/UserInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/UserInfo.java similarity index 87% rename from src/main/java/com/postgraduate/domain/admin/application/dto/UserInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/UserInfo.java index 3af5e2b7..b4610e49 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/UserInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/UserInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto; +package com.postgraduate.admin.application.dto.res; import com.postgraduate.domain.wish.domain.entity.constant.Status; diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/UserMentoringInfo.java b/src/main/java/com/postgraduate/admin/application/dto/res/UserMentoringInfo.java similarity index 62% rename from src/main/java/com/postgraduate/domain/admin/application/dto/UserMentoringInfo.java rename to src/main/java/com/postgraduate/admin/application/dto/res/UserMentoringInfo.java index 7d8226d5..ec1464da 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/UserMentoringInfo.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/UserMentoringInfo.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto; +package com.postgraduate.admin.application.dto.res; public record UserMentoringInfo( String nickName, diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/WishResponse.java b/src/main/java/com/postgraduate/admin/application/dto/res/WishResponse.java similarity index 82% rename from src/main/java/com/postgraduate/domain/admin/application/dto/res/WishResponse.java rename to src/main/java/com/postgraduate/admin/application/dto/res/WishResponse.java index 10215ef8..b3728906 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/WishResponse.java +++ b/src/main/java/com/postgraduate/admin/application/dto/res/WishResponse.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.admin.application.dto.res; +package com.postgraduate.admin.application.dto.res; import java.time.LocalDateTime; diff --git a/src/main/java/com/postgraduate/domain/admin/application/mapper/AdminMapper.java b/src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java similarity index 78% rename from src/main/java/com/postgraduate/domain/admin/application/mapper/AdminMapper.java rename to src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java index 4c02f331..fb284116 100644 --- a/src/main/java/com/postgraduate/domain/admin/application/mapper/AdminMapper.java +++ b/src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java @@ -1,11 +1,7 @@ -package com.postgraduate.domain.admin.application.mapper; - -import com.postgraduate.domain.account.domain.entity.Account; -import com.postgraduate.domain.admin.application.dto.*; -import com.postgraduate.domain.admin.application.dto.res.CertificationDetailsResponse; -import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse; -import com.postgraduate.domain.admin.application.dto.res.SalaryDetailsResponse; -import com.postgraduate.domain.admin.presentation.constant.SalaryStatus; +package com.postgraduate.admin.application.mapper; + +import com.postgraduate.admin.application.dto.res.*; +import com.postgraduate.domain.adminssr.application.dto.res.*; import com.postgraduate.domain.mentoring.domain.entity.Mentoring; import com.postgraduate.domain.payment.domain.entity.Payment; import com.postgraduate.domain.salary.domain.entity.Salary; @@ -14,7 +10,6 @@ import com.postgraduate.domain.senior.domain.entity.Senior; import com.postgraduate.domain.user.domain.entity.User; import com.postgraduate.domain.user.domain.entity.constant.Role; -import com.postgraduate.domain.admin.application.dto.res.WishResponse; import com.postgraduate.domain.wish.domain.entity.Wish; public class AdminMapper { @@ -56,38 +51,41 @@ public static UserInfo mapToUserInfo(Wish wish) { ); } - public static SeniorInfo mapToSeniorInfo(Senior senior, SalaryStatus salaryStatus, Boolean isUser) { + public static SeniorInfo mapToSeniorInfo(Senior senior, int totalAmount, Boolean isUser) { User user = senior.getUser(); return new SeniorInfo( senior.getSeniorId(), user.getNickName(), user.getPhoneNumber(), senior.getStatus(), - salaryStatus, + totalAmount, user.getMarketingReceive(), isUser ); } - public static MentoringInfo mapToMentoringInfo(Mentoring mentoring) { + public static MentoringInfo mapToMentoringInfoWithSenior(Mentoring mentoring) { User user = mentoring.getUser(); return new MentoringInfo( mentoring.getMentoringId(), mentoring.getStatus(), user.getNickName(), user.getPhoneNumber(), - mentoring.getCreatedAt() + mentoring.getCreatedAt(), + mentoring.getDate() ); } - public static MentoringInfo mapToSeniorMentoringInfo(Mentoring mentoring) { - User user = mentoring.getSenior().getUser(); + public static MentoringInfo mapToMentoringInfoWithUser(Mentoring mentoring) { + Senior senior = mentoring.getSenior(); + User user = senior.getUser(); return new MentoringInfo( mentoring.getMentoringId(), mentoring.getStatus(), user.getNickName(), user.getPhoneNumber(), - mentoring.getCreatedAt() + mentoring.getCreatedAt(), + mentoring.getDate() ); } @@ -146,11 +144,10 @@ public static PaymentInfo mapToPaymentInfo(Payment payment) { ); } - public static SalaryInfo mapToSalaryResponse(Senior senior, String accountNumber, Salary salary) { + public static SalaryInfoWithOutId mapToSalaryResponse(Senior senior, String accountNumber, Salary salary) { User user = senior.getUser(); SalaryAccount account = salary.getAccount(); - return new SalaryInfo( - salary.getSalaryId(), + return new SalaryInfoWithOutId( user.getNickName(), user.getPhoneNumber(), salary.getTotalAmount(), @@ -161,10 +158,9 @@ public static SalaryInfo mapToSalaryResponse(Senior senior, String accountNumber ); } - public static SalaryInfo mapToSalaryResponse(Senior senior, Salary salary) { + public static SalaryInfoWithOutId mapToSalaryResponse(Senior senior, Salary salary) { User user = senior.getUser(); - return new SalaryInfo( - salary.getSalaryId(), + return new SalaryInfoWithOutId ( user.getNickName(), user.getPhoneNumber(), salary.getTotalAmount(), @@ -172,29 +168,31 @@ public static SalaryInfo mapToSalaryResponse(Senior senior, Salary salary) { ); } - public static SalaryDetailsResponse mapToSalaryDetailsResponse(Senior senior, Account account, String accountNumber, int totalAmount, Boolean status) { + public static UnSettledSalaryInfo mapToUnSettledSalaryResponse(Salary salary) { + Senior senior = salary.getSenior(); User user = senior.getUser(); - return new SalaryDetailsResponse( + return new UnSettledSalaryInfo( + salary.getSalaryId(), user.getNickName(), user.getPhoneNumber(), - totalAmount, - account.getAccountHolder(), - account.getBank(), - accountNumber, - status + salary.getTotalAmount(), + salary.getSalaryDate() ); } - public static SalaryDetailsResponse mapToSalaryDetailsResponse(Senior senior, int totalAmount, Boolean status) { + public static UnSettledSalaryInfo mapToUnSettledSalaryResponse(Salary salary, String accountNumber) { + Senior senior = salary.getSenior(); User user = senior.getUser(); - return new SalaryDetailsResponse( + SalaryAccount account = salary.getAccount(); + return new UnSettledSalaryInfo( + salary.getSalaryId(), user.getNickName(), user.getPhoneNumber(), - totalAmount, - null, - null, - null, - status + salary.getTotalAmount(), + account.getAccountHolder(), + account.getBank(), + accountNumber, + salary.getSalaryDate() ); } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminAuthUseCase.java similarity index 70% rename from src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java rename to src/main/java/com/postgraduate/admin/application/usecase/AdminAuthUseCase.java index 45dffad6..66d1c321 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminAuthUseCase.java @@ -1,7 +1,7 @@ -package com.postgraduate.domain.adminssr.application.usecase; +package com.postgraduate.admin.application.usecase; -import com.postgraduate.domain.adminssr.application.dto.req.Login; -import com.postgraduate.domain.adminssr.domain.service.AuthGetService; +import com.postgraduate.admin.application.dto.req.Login; +import com.postgraduate.admin.domain.service.AuthGetService; import com.postgraduate.domain.user.domain.entity.User; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminMentoringUseCase.java similarity index 84% rename from src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java rename to src/main/java/com/postgraduate/admin/application/usecase/AdminMentoringUseCase.java index 59430e50..5cd8bae8 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminMentoringUseCase.java @@ -1,9 +1,9 @@ -package com.postgraduate.domain.adminssr.application.usecase; +package com.postgraduate.admin.application.usecase; -import com.postgraduate.domain.adminssr.application.dto.res.UserMentoringInfo; -import com.postgraduate.domain.adminssr.application.dto.res.MentoringInfo; -import com.postgraduate.domain.adminssr.application.dto.res.MentoringManageResponse; -import com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper; +import com.postgraduate.admin.application.dto.res.MentoringManageResponse; +import com.postgraduate.admin.application.dto.res.UserMentoringInfo; +import com.postgraduate.admin.application.dto.res.MentoringInfo; +import com.postgraduate.admin.application.mapper.AdminMapper; import com.postgraduate.domain.mentoring.domain.entity.Mentoring; import com.postgraduate.domain.mentoring.domain.service.MentoringGetService; import com.postgraduate.domain.mentoring.domain.service.MentoringUpdateService; @@ -22,7 +22,7 @@ import java.util.List; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.*; +import static com.postgraduate.admin.application.mapper.AdminMapper.*; import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE; @Service @@ -42,7 +42,7 @@ public MentoringManageResponse seniorMentorings(Long seniorId) { Senior senior = seniorGetService.bySeniorId(seniorId); List mentorings = mentoringGetService.bySeniorId(seniorId); List mentoringInfos = mentorings.stream() - .map(AdminSsrMapper::mapToMentoringInfoWithSenior) + .map(AdminMapper::mapToMentoringInfoWithSenior) .toList(); UserMentoringInfo seniorInfo = mapToUserMentoringInfo(senior); return new MentoringManageResponse(mentoringInfos, seniorInfo); @@ -53,7 +53,7 @@ public MentoringManageResponse userMentoringInfos(Long userId) { User user = userGetService.byUserId(userId); List mentorings = mentoringGetService.byUserId(userId); List mentoringInfos = mentorings.stream() - .map(AdminSsrMapper::mapToMentoringInfoWithUser) + .map(AdminMapper::mapToMentoringInfoWithUser) .toList(); UserMentoringInfo userInfo = mapToUserMentoringInfo(user); return new MentoringManageResponse(mentoringInfos, userInfo); diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java similarity index 88% rename from src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java rename to src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java index dcc32223..97414ccd 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java @@ -1,5 +1,7 @@ -package com.postgraduate.domain.adminssr.application.usecase; +package com.postgraduate.admin.application.usecase; +import com.postgraduate.admin.application.dto.res.MentoringWithPaymentResponse; +import com.postgraduate.admin.application.dto.res.PaymentInfo; import com.postgraduate.domain.adminssr.application.dto.res.*; import com.postgraduate.domain.mentoring.domain.entity.Mentoring; import com.postgraduate.domain.mentoring.domain.service.MentoringGetService; @@ -18,8 +20,8 @@ import java.util.List; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToMentoringWithPaymentResponse; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToPaymentInfo; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToMentoringWithPaymentResponse; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToPaymentInfo; @Service @Transactional diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminSalaryUseCase.java similarity index 86% rename from src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java rename to src/main/java/com/postgraduate/admin/application/usecase/AdminSalaryUseCase.java index 4df73c19..1ab82539 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminSalaryUseCase.java @@ -1,7 +1,7 @@ -package com.postgraduate.domain.adminssr.application.usecase; +package com.postgraduate.admin.application.usecase; -import com.postgraduate.domain.adminssr.application.dto.res.SalaryInfoWithOutId; -import com.postgraduate.domain.adminssr.application.dto.res.UnSettledSalaryInfo; +import com.postgraduate.admin.application.dto.res.SalaryInfoWithOutId; +import com.postgraduate.admin.application.dto.res.UnSettledSalaryInfo; import com.postgraduate.domain.salary.domain.entity.Salary; import com.postgraduate.domain.salary.domain.entity.SalaryAccount; import com.postgraduate.domain.salary.domain.service.SalaryGetService; @@ -15,8 +15,8 @@ import java.util.List; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToSalaryResponse; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToUnSettledSalaryResponse; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToSalaryResponse; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToUnSettledSalaryResponse; @Service @Transactional diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminSeniorUseCase.java similarity index 85% rename from src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java rename to src/main/java/com/postgraduate/admin/application/usecase/AdminSeniorUseCase.java index 7ccdb127..8b2791bb 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminSeniorUseCase.java @@ -1,7 +1,7 @@ -package com.postgraduate.domain.adminssr.application.usecase; +package com.postgraduate.admin.application.usecase; -import com.postgraduate.domain.adminssr.application.dto.res.CertificationDetailsResponse; -import com.postgraduate.domain.adminssr.application.dto.res.SeniorInfo; +import com.postgraduate.admin.application.dto.res.CertificationDetailsResponse; +import com.postgraduate.admin.application.dto.res.SeniorInfo; import com.postgraduate.domain.salary.domain.entity.Salary; import com.postgraduate.domain.salary.domain.service.SalaryGetService; import com.postgraduate.domain.senior.domain.entity.Senior; @@ -18,8 +18,8 @@ import java.util.List; import java.util.Optional; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToCertificationInfo; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToSeniorInfo; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToCertificationInfo; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToSeniorInfo; import static com.postgraduate.domain.senior.domain.entity.constant.Status.APPROVE; @Service diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java similarity index 78% rename from src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java rename to src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java index c6a9319f..1045dd3c 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java @@ -1,8 +1,10 @@ -package com.postgraduate.domain.adminssr.application.usecase; +package com.postgraduate.admin.application.usecase; -import com.postgraduate.domain.adminssr.application.dto.req.SendMessageRequest; +import com.postgraduate.admin.application.dto.req.SendMessageRequest; +import com.postgraduate.admin.application.dto.res.UserInfo; +import com.postgraduate.admin.application.dto.res.WishResponse; import com.postgraduate.domain.adminssr.application.dto.res.*; -import com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper; +import com.postgraduate.admin.application.mapper.AdminMapper; import com.postgraduate.domain.wish.domain.entity.Wish; import com.postgraduate.domain.wish.domain.service.WishGetService; import com.postgraduate.domain.wish.domain.service.WishUpdateService; @@ -14,7 +16,7 @@ import java.util.List; -import static com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper.mapToWishResponse; +import static com.postgraduate.admin.application.mapper.AdminMapper.mapToWishResponse; @Service @Transactional @@ -28,7 +30,7 @@ public class AdminUserUseCase { public List userInfos() { List all = wishGetService.all(); return all.stream() - .map(AdminSsrMapper::mapToUserInfo) + .map(AdminMapper::mapToUserInfo) .toList(); } diff --git a/src/main/java/com/postgraduate/domain/adminssr/domain/service/AuthGetService.java b/src/main/java/com/postgraduate/admin/domain/service/AuthGetService.java similarity index 89% rename from src/main/java/com/postgraduate/domain/adminssr/domain/service/AuthGetService.java rename to src/main/java/com/postgraduate/admin/domain/service/AuthGetService.java index 033b8d2f..af2fa657 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/domain/service/AuthGetService.java +++ b/src/main/java/com/postgraduate/admin/domain/service/AuthGetService.java @@ -1,4 +1,4 @@ -package com.postgraduate.domain.adminssr.domain.service; +package com.postgraduate.admin.domain.service; import com.postgraduate.domain.user.domain.entity.User; import com.postgraduate.domain.user.domain.repository.UserRepository; diff --git a/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java b/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java similarity index 95% rename from src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java rename to src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java index d908f01c..fbd15e63 100644 --- a/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java +++ b/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java @@ -1,5 +1,9 @@ -package com.postgraduate.domain.adminssr.presentation; +package com.postgraduate.admin.presentation; +import com.postgraduate.admin.application.dto.req.Login; +import com.postgraduate.admin.application.dto.req.SendMessageRequest; +import com.postgraduate.admin.application.dto.res.*; +import com.postgraduate.admin.application.usecase.*; import com.postgraduate.domain.adminssr.application.dto.req.*; import com.postgraduate.domain.adminssr.application.dto.res.*; import com.postgraduate.domain.adminssr.application.usecase.*; diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/MentoringInfo.java b/src/main/java/com/postgraduate/domain/admin/application/dto/MentoringInfo.java deleted file mode 100644 index a9c31cd3..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/MentoringInfo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.postgraduate.domain.admin.application.dto; - -import com.postgraduate.domain.mentoring.domain.entity.constant.Status; - -import java.time.LocalDateTime; - -public record MentoringInfo( - Long mentoringId, - Status status, - String nickName, - String phoneNumber, - LocalDateTime createdAt -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/SeniorInfo.java b/src/main/java/com/postgraduate/domain/admin/application/dto/SeniorInfo.java deleted file mode 100644 index 7bd3f6d9..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/SeniorInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.postgraduate.domain.admin.application.dto; - -import com.postgraduate.domain.admin.presentation.constant.SalaryStatus; -import com.postgraduate.domain.senior.domain.entity.constant.Status; - -public record SeniorInfo( - Long seniorId, - String nickName, - String phoneNumber, - Status certificationStatus, - SalaryStatus salaryStatus, - Boolean marketingReceive, - Boolean isUser -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/req/SeniorStatusRequest.java b/src/main/java/com/postgraduate/domain/admin/application/dto/req/SeniorStatusRequest.java deleted file mode 100644 index c316746b..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/req/SeniorStatusRequest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.req; - -import com.postgraduate.domain.senior.domain.entity.constant.Status; - -public record SeniorStatusRequest( - Status certificationStatus -) { } diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationResponse.java deleted file mode 100644 index bde212b8..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -public record CertificationResponse( - String result, - String result_msg, - String cst_id, - String custKey, - String AuthKey, - String PCD_PAY_URL, - String return_url -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringManageResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringManageResponse.java deleted file mode 100644 index e8674fff..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringManageResponse.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -import com.postgraduate.domain.admin.application.dto.MentoringInfo; -import com.postgraduate.domain.admin.application.dto.UserMentoringInfo; -import java.util.List; - -public record MentoringManageResponse( - List mentoringInfo, - UserMentoringInfo userMentoringInfo -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/PaymentManageResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/PaymentManageResponse.java deleted file mode 100644 index ddbb604c..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/PaymentManageResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -import com.postgraduate.domain.admin.application.dto.PaymentInfo; - -import java.util.List; - -public record PaymentManageResponse( - List paymentInfo, - Long totalElements, - Integer totalPages -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/RefundResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/RefundResponse.java deleted file mode 100644 index ddba3630..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/RefundResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -public record RefundResponse( - String PCD_PAY_RST, - String PCD_PAY_CODE, - String PCD_PAY_MSG, - String PCD_PAY_OID, - String PCD_PAY_GOODS, - String PCD_REFUND_TOTAL, - String PCD_PAY_TIME, - String PCD_PAY_CARDTRADENUM, - String PCD_PAY_CARDRECEIPT -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryManageResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryManageResponse.java deleted file mode 100644 index db928e8a..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryManageResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -import com.postgraduate.domain.admin.application.dto.SalaryInfo; - -import java.util.List; - -public record SalaryManageResponse( - List salaryInfos, - Long totalElements, - Integer totalPages -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/SeniorManageResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/SeniorManageResponse.java deleted file mode 100644 index 0d74a3ec..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/SeniorManageResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -import com.postgraduate.domain.admin.application.dto.SeniorInfo; - -import java.util.List; - -public record SeniorManageResponse( - List seniorInfo, - Long totalElements, - Integer totalPages -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/dto/res/UserManageResponse.java b/src/main/java/com/postgraduate/domain/admin/application/dto/res/UserManageResponse.java deleted file mode 100644 index fab98e1a..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/dto/res/UserManageResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.postgraduate.domain.admin.application.dto.res; - -import com.postgraduate.domain.admin.application.dto.UserInfo; - -import java.util.List; - -public record UserManageResponse( - List userInfo, - Long totalElements, - Integer totalPages -) { -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/usecase/MentoringManageByAdminUseCase.java b/src/main/java/com/postgraduate/domain/admin/application/usecase/MentoringManageByAdminUseCase.java deleted file mode 100644 index b0071efd..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/usecase/MentoringManageByAdminUseCase.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.postgraduate.domain.admin.application.usecase; - -import com.postgraduate.domain.admin.application.dto.MentoringInfo; -import com.postgraduate.domain.admin.application.dto.UserMentoringInfo; -import com.postgraduate.domain.admin.application.dto.res.MentoringManageResponse; -import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse; -import com.postgraduate.domain.admin.application.mapper.AdminMapper; -import com.postgraduate.domain.mentoring.domain.entity.Mentoring; -import com.postgraduate.domain.mentoring.domain.entity.constant.Status; -import com.postgraduate.domain.mentoring.domain.service.MentoringGetService; -import com.postgraduate.domain.mentoring.domain.service.MentoringUpdateService; -import com.postgraduate.domain.payment.application.usecase.PaymentManageUseCase; -import com.postgraduate.domain.payment.domain.entity.Payment; -import com.postgraduate.domain.senior.domain.entity.Senior; -import com.postgraduate.domain.senior.domain.service.SeniorGetService; -import com.postgraduate.domain.user.domain.entity.User; -import com.postgraduate.domain.user.domain.service.UserGetService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@Transactional -@RequiredArgsConstructor -public class MentoringManageByAdminUseCase { - private final MentoringGetService mentoringGetService; - private final MentoringUpdateService mentoringUpdateService; - private final UserGetService userGetService; - private final SeniorGetService seniorGetService; - private final PaymentManageUseCase paymentManageUseCase; - - public MentoringManageResponse getUserMentorings(Long userId) { - List mentorings = mentoringGetService.byUserId(userId); - List mentoringInfos = mentorings.stream() - .map(AdminMapper::mapToSeniorMentoringInfo) - .toList(); - User user = userGetService.byUserId(userId); - UserMentoringInfo userMentoringInfo = AdminMapper.mapToUserMentoringInfo(user); - return new MentoringManageResponse(mentoringInfos, userMentoringInfo); - } - - public MentoringManageResponse getSeniorMentorings(Long seniorId) { - List mentorings = mentoringGetService.bySeniorId(seniorId); - List mentoringInfos = mentorings.stream() - .map(AdminMapper::mapToMentoringInfo) - .toList(); - Senior senior = seniorGetService.bySeniorId(seniorId); - UserMentoringInfo userMentoringInfo = AdminMapper.mapToUserMentoringInfo(senior); - return new MentoringManageResponse(mentoringInfos, userMentoringInfo); - } - - public MentoringWithPaymentResponse getMentoringWithPayment(Long mentoringId) { - Mentoring mentoring = mentoringGetService.byMentoringId(mentoringId); - return AdminMapper.mapToMentoringWithPaymentResponse(mentoring); - } - - public void cancelMentoring(Long mentoringId) { - Mentoring mentoring = mentoringGetService.byMentoringId(mentoringId); - mentoringUpdateService.updateCancel(mentoring); - Payment payment = mentoring.getPayment(); - User user = mentoring.getUser(); - paymentManageUseCase.refundPayByUser(user, payment.getOrderId()); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/usecase/PaymentManageByAdminUseCase.java b/src/main/java/com/postgraduate/domain/admin/application/usecase/PaymentManageByAdminUseCase.java deleted file mode 100644 index 14679c7b..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/usecase/PaymentManageByAdminUseCase.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.postgraduate.domain.admin.application.usecase; - -import com.postgraduate.domain.admin.application.dto.PaymentInfo; -import com.postgraduate.domain.admin.application.dto.res.PaymentManageResponse; -import com.postgraduate.domain.admin.application.mapper.AdminMapper; -import com.postgraduate.domain.mentoring.domain.entity.Mentoring; -import com.postgraduate.domain.mentoring.domain.service.MentoringGetService; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@Transactional -@RequiredArgsConstructor -public class PaymentManageByAdminUseCase { - private final MentoringGetService mentoringGetService; - - public PaymentManageResponse getPayments(Integer page, String search) { - Page mentorings = mentoringGetService.all(page, search); - List paymentInfos = mentorings.map(AdminMapper::mapToPaymentInfo).toList(); - long totalElements = mentorings.getTotalElements(); - int totalPages = mentorings.getTotalPages(); - return new PaymentManageResponse(paymentInfos, totalElements, totalPages); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java b/src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java deleted file mode 100644 index b3097ae1..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.postgraduate.domain.admin.application.usecase; - -import com.postgraduate.domain.account.domain.entity.Account; -import com.postgraduate.domain.account.domain.service.AccountGetService; -import com.postgraduate.domain.admin.application.dto.SalaryInfo; -import com.postgraduate.domain.admin.application.dto.res.SalaryDetailsResponse; -import com.postgraduate.domain.admin.application.dto.res.SalaryManageResponse; -import com.postgraduate.domain.admin.application.mapper.AdminMapper; -import com.postgraduate.domain.salary.application.dto.SeniorSalary; -import com.postgraduate.domain.salary.domain.entity.Salary; -import com.postgraduate.domain.salary.domain.entity.SalaryAccount; -import com.postgraduate.domain.salary.domain.service.SalaryGetService; -import com.postgraduate.domain.salary.domain.service.SalaryUpdateService; -import com.postgraduate.domain.senior.domain.entity.Senior; -import com.postgraduate.domain.senior.domain.service.SeniorGetService; -import com.postgraduate.global.config.security.util.EncryptorUtils; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Optional; - -import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToSalaryResponse; -import static java.lang.Boolean.TRUE; - -@Service -@Transactional -@RequiredArgsConstructor -public class SalaryManageByAdminUseCase { - private final SeniorGetService seniorGetService; - private final AccountGetService accountGetService; - private final SalaryGetService salaryGetService; - private final EncryptorUtils encryptorUtils; - private final SalaryUpdateService salaryUpdateService; - - public SalaryDetailsResponse getSalary(Long seniorId) { - Senior senior = seniorGetService.bySeniorId(seniorId); - Salary salary = salaryGetService.bySenior(senior); - - Optional optionalAccount = accountGetService.bySenior(senior); - if (optionalAccount.isPresent()) { - Account account = optionalAccount.get(); - String accountNumber = encryptorUtils.decryptData(account.getAccountNumber()); - return AdminMapper.mapToSalaryDetailsResponse(senior, account, accountNumber, salary.getTotalAmount(), salary.status()); - } - return AdminMapper.mapToSalaryDetailsResponse(senior, salary.getTotalAmount(), salary.status()); - } - - public SalaryManageResponse getSalaries(Integer page, String search) { - Page seniorSalaries = salaryGetService.findDistinctSeniors(search, page); - List salaryInfos = seniorSalaries.stream() - .map(seniorSalary -> { - Salary salary = salaryGetService.bySenior(seniorSalary.senior()); - return getSalaryInfo(seniorSalary.senior(), salary); - }) - .toList(); - Long totalElements = seniorSalaries.getTotalElements(); - int totalPages = seniorSalaries.getTotalPages(); - return new SalaryManageResponse(salaryInfos, totalElements, totalPages); - } - - private SalaryInfo getSalaryInfo(Senior senior, Salary salary) { - SalaryAccount account = salary.getAccount(); - if (account != null) { - String accountNumber = encryptorUtils.decryptData(account.getAccountNumber()); - return mapToSalaryResponse(senior, accountNumber, salary); - } - return mapToSalaryResponse(senior, salary); - } - - public void updateSalaryStatus(Long seniorId, Boolean status) { - Senior senior = seniorGetService.bySeniorId(seniorId); - Salary salary = salaryGetService.bySenior(senior); - if (TRUE.equals(status)) { - salaryUpdateService.updateDone(salary); - return; - } - salaryUpdateService.updateNot(salary); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/usecase/SeniorManageByAdminUseCase.java b/src/main/java/com/postgraduate/domain/admin/application/usecase/SeniorManageByAdminUseCase.java deleted file mode 100644 index 961eb425..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/usecase/SeniorManageByAdminUseCase.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.postgraduate.domain.admin.application.usecase; - -import com.postgraduate.domain.admin.application.dto.SeniorInfo; -import com.postgraduate.domain.admin.application.dto.req.SeniorStatusRequest; -import com.postgraduate.domain.admin.application.dto.res.CertificationDetailsResponse; -import com.postgraduate.domain.admin.application.dto.res.SeniorManageResponse; -import com.postgraduate.domain.admin.application.mapper.AdminMapper; -import com.postgraduate.domain.admin.exception.SeniorNotWaitingException; -import com.postgraduate.domain.salary.domain.entity.Salary; -import com.postgraduate.domain.admin.presentation.constant.SalaryStatus; -import com.postgraduate.domain.salary.domain.service.SalaryGetService; -import com.postgraduate.domain.senior.domain.entity.Senior; -import com.postgraduate.domain.senior.domain.entity.constant.Status; -import com.postgraduate.domain.senior.domain.service.SeniorGetService; -import com.postgraduate.domain.senior.domain.service.SeniorUpdateService; -import com.postgraduate.domain.wish.domain.entity.Wish; -import com.postgraduate.domain.wish.domain.service.WishGetService; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Optional; - -import static com.postgraduate.domain.senior.domain.entity.constant.Status.APPROVE; - -@Service -@Transactional -@RequiredArgsConstructor -public class SeniorManageByAdminUseCase { - private final SeniorGetService seniorGetService; - private final SeniorUpdateService seniorUpdateService; - private final SalaryGetService salaryGetService; - private final WishGetService wishGetService; - - public CertificationDetailsResponse getCertificationDetails(Long seniorId) { - Senior senior = seniorGetService.bySeniorId(seniorId); - if (senior.getStatus() != Status.WAITING) { - throw new SeniorNotWaitingException(); - } - return AdminMapper.mapToCertificationInfo(senior); - } - - public void updateSeniorStatus(Long seniorId, SeniorStatusRequest request) { - Senior senior = seniorGetService.bySeniorId(seniorId); - if (request.certificationStatus() == APPROVE) { - seniorUpdateService.certificationUpdateApprove(senior); - return; - } - seniorUpdateService.certificationUpdateNotApprove(senior); - } - - public SeniorManageResponse getSeniors(Integer page, String search) { - Page seniors = seniorGetService.all(page, search); - List seniorInfos = seniors.stream() - .map(senior -> { - Salary salary = salaryGetService.bySenior(senior); - SalaryStatus salaryStatus = salary.getSalaryStatus(); - Optional wish = wishGetService.byUser(senior.getUser()); - return AdminMapper.mapToSeniorInfo(senior, salaryStatus, wish.isPresent()); - }) - .toList(); - long totalElements = seniors.getTotalElements(); - int totalPages = seniors.getTotalPages(); - return new SeniorManageResponse(seniorInfos, totalElements, totalPages); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/application/usecase/UserManageByAdminUseCase.java b/src/main/java/com/postgraduate/domain/admin/application/usecase/UserManageByAdminUseCase.java deleted file mode 100644 index abe8e055..00000000 --- a/src/main/java/com/postgraduate/domain/admin/application/usecase/UserManageByAdminUseCase.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.postgraduate.domain.admin.application.usecase; - -import com.postgraduate.domain.admin.application.dto.UserInfo; -import com.postgraduate.domain.admin.application.dto.res.UserManageResponse; -import com.postgraduate.domain.admin.application.mapper.AdminMapper; -import com.postgraduate.domain.admin.application.dto.res.WishResponse; -import com.postgraduate.domain.wish.domain.entity.Wish; -import com.postgraduate.domain.wish.domain.service.WishGetService; -import com.postgraduate.domain.wish.domain.service.WishUpdateService; -import com.postgraduate.domain.wish.exception.WishEmptyException; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@Transactional -@RequiredArgsConstructor -public class UserManageByAdminUseCase { - private final WishGetService wishGetService; - private final WishUpdateService wishUpdateService; - - public UserManageResponse getUsers(Integer page, String search) { - Page wishes = wishGetService.all(page, search); - List userInfos = wishes.stream() - .map(AdminMapper::mapToUserInfo) - .toList(); - long totalElements = wishes.getTotalElements(); - int totalPages = wishes.getTotalPages(); - return new UserManageResponse(userInfos, totalElements, totalPages); - } - - public WishResponse getWish(Long wishId) { - Wish wish = wishGetService.byWishId(wishId); - return AdminMapper.mapToWishResponse(wish); - } - - public void updateWishStatus(Long wishId) { - Wish wish = wishGetService.byWishId(wishId); - if (wish.getMajor() == null && wish.getField() == null) { - throw new WishEmptyException(); - } - wishUpdateService.updateWishDone(wish); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/exception/SeniorNotWaitingException.java b/src/main/java/com/postgraduate/domain/admin/exception/SeniorNotWaitingException.java deleted file mode 100644 index e1fcb141..00000000 --- a/src/main/java/com/postgraduate/domain/admin/exception/SeniorNotWaitingException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.postgraduate.domain.admin.exception; - -import com.postgraduate.global.exception.ApplicationException; - -import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode.STATUS_NOT_WAITING; -import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage.NOT_WAITING_STATUS; - -public class SeniorNotWaitingException extends ApplicationException { - public SeniorNotWaitingException() { - super(NOT_WAITING_STATUS.getMessage(), STATUS_NOT_WAITING.getCode()); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/presentation/AdminController.java b/src/main/java/com/postgraduate/domain/admin/presentation/AdminController.java deleted file mode 100644 index 0177585e..00000000 --- a/src/main/java/com/postgraduate/domain/admin/presentation/AdminController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.postgraduate.domain.admin.presentation; - -import com.postgraduate.domain.admin.application.dto.req.SeniorStatusRequest; -import com.postgraduate.domain.admin.application.dto.res.*; -import com.postgraduate.domain.admin.application.usecase.*; -import com.postgraduate.domain.admin.application.dto.res.WishResponse; -import com.postgraduate.global.dto.ResponseDto; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import static com.postgraduate.domain.admin.presentation.constant.AdminResponseCode.ADMIN_FIND; -import static com.postgraduate.domain.admin.presentation.constant.AdminResponseCode.ADMIN_UPDATE; -import static com.postgraduate.domain.admin.presentation.constant.AdminResponseMessage.*; - - -@RestController -@RequiredArgsConstructor -@RequestMapping("/admin") -@Tag(name = "ADMIN Controller", description = "관리자의 모든 API는 토큰이 필요합니다.") -public class AdminController { - private final SeniorManageByAdminUseCase seniorManageUseCase; - private final UserManageByAdminUseCase userManageUseCase; - private final MentoringManageByAdminUseCase mentoringManageUseCase; - private final PaymentManageByAdminUseCase paymentManageUseCase; - private final SalaryManageByAdminUseCase salaryManageUseCase; - - @GetMapping("/certification/{seniorId}") - @Operation(summary = "[관리자] 선배 프로필 승인 요청 조회", description = "선배 신청 시 작성한 사전 작성정보 및 첨부사진을 조회합니다.") - public ResponseDto getCertificationDetails(@PathVariable Long seniorId) { - CertificationDetailsResponse certification = seniorManageUseCase.getCertificationDetails(seniorId); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), certification); - } - - @PatchMapping("/certification/{seniorId}") - @Operation(summary = "[관리자] 선배 프로필 승인 요청 응답", description = "선배 승인 신청한 유저를 승인 또는 거부합니다.") - public ResponseDto updateSeniorStatus(@PathVariable Long seniorId, - @RequestBody @Valid SeniorStatusRequest request) { - seniorManageUseCase.updateSeniorStatus(seniorId, request); - return ResponseDto.create(ADMIN_UPDATE.getCode(), UPDATE_SENIOR_STATUS.getMessage()); - } - - @GetMapping("/users") - @Operation(summary = "[관리자] 후배 정보 목록", description = "대학생 후배 정보 목록을 조회합니다.") - public ResponseDto getUsers(@RequestParam(required = false) Integer page, - @RequestParam(required = false) String search) { - UserManageResponse users = userManageUseCase.getUsers(page, search); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), users); - } - - @GetMapping("/wish/{wishId}") - @Operation(summary = "[관리자] 후배 매칭 지원 정보", description = "대학생 후배 매칭 지원 정보를 상세 조회합니다.") - public ResponseDto getWish(@PathVariable Long wishId) { - WishResponse wish = userManageUseCase.getWish(wishId); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), wish); - } - - @PatchMapping("/wish/{wishId}") - @Operation(summary = "[관리자] 후배 매칭 지원 완료", description = "대학생 매칭지원을 완료합니다.") - public ResponseDto updateWishStatus(@PathVariable Long wishId) { - userManageUseCase.updateWishStatus(wishId); - return ResponseDto.create(ADMIN_UPDATE.getCode(), UPDATE_WISH_STATUS.getMessage()); - } - - @GetMapping("/seniors") - @Operation(summary = "[관리자] 선배 정보 목록", description = "대학원생 선배 정보 목록을 조회합니다.") - public ResponseDto getSeniors(@RequestParam(required = false) Integer page, - @RequestParam(required = false) String search) { - SeniorManageResponse seniors = seniorManageUseCase.getSeniors(page, search); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), seniors); - } - - @GetMapping("/salary") - @Operation(summary = "[관리자] 정산 목록 조회", description = "한 달 기준으로 정산 목록을 조회합니다. 기준일은 [11일 ~ 내월 10일]입니다.") - public ResponseDto getSalaries(@RequestParam(required = false) Integer page, - @RequestParam(required = false) String search) { - SalaryManageResponse salaries = salaryManageUseCase.getSalaries(page, search); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), salaries); - } - - @GetMapping("/salary/{seniorId}") - @Operation(summary = "[관리자] 선배 정산 상세 정보", description = "대학원생 선배 정산 상세 정보를 조회합니다.") - public ResponseDto getSalary(@PathVariable Long seniorId) { - SalaryDetailsResponse salary = salaryManageUseCase.getSalary(seniorId); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), salary); - } - - @PatchMapping("/salary/{seniorId}") - @Operation(summary = "[관리자] 정산 상태 변경", description = "대학원생 선배 정산 상태를 변경합니다.") - public ResponseDto updateSalaryStatus(@PathVariable Long seniorId, @RequestParam Boolean status) { - salaryManageUseCase.updateSalaryStatus(seniorId, status); - return ResponseDto.create(ADMIN_UPDATE.getCode(), UPDATE_SALARY_STATUS.getMessage()); - } - - @GetMapping("/user/{userId}/mentoring") - @Operation(summary = "[관리자] 후배 멘토링 조회", description = "후배의 멘토링 목록을 조회합니다.") - public ResponseDto getUserMentorings(@PathVariable Long userId) { - MentoringManageResponse mentorings = mentoringManageUseCase.getUserMentorings(userId); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), mentorings); - } - - @GetMapping("/senior/{seniorId}/mentoring") - @Operation(summary = "[관리자] 선배 멘토링 조회", description = "선배의 멘토링 목록을 조회합니다.") - public ResponseDto getSeniorMentorings(@PathVariable Long seniorId) { - MentoringManageResponse mentorings = mentoringManageUseCase.getSeniorMentorings(seniorId); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), mentorings); - } - - @PatchMapping("/mentoring/{mentoringId}") - @Operation(summary = "[관리자] 멘토링 취소 및 환불", description = "멘토링을 취소 및 환불합니다.") - public ResponseDto cancelMentoring(@PathVariable Long mentoringId) { - mentoringManageUseCase.cancelMentoring(mentoringId); - return ResponseDto.create(ADMIN_UPDATE.getCode(), UPDATE_MENTORING_STATUS.getMessage()); - } - - @GetMapping("/payments") - @Operation(summary = "[관리자] 결제 정보 목록", description = "결제 정보 목록을 조회합니다.") - public ResponseDto getPayments(@RequestParam(required = false) Integer page, - @RequestParam(required = false) String search) { - PaymentManageResponse payments = paymentManageUseCase.getPayments(page, search); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), payments); - } - - @GetMapping("/payments/{mentoringId}") - @Operation(summary = "[관리자] 결제된 멘토링 정보", description = "결제된 멘토링 정보를 조회합니다.") - public ResponseDto getPayments(@PathVariable Long mentoringId) { - MentoringWithPaymentResponse mentoringWithPayment = mentoringManageUseCase.getMentoringWithPayment(mentoringId); - return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), mentoringWithPayment); - } -} diff --git a/src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseCode.java b/src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseCode.java deleted file mode 100644 index d30b8f93..00000000 --- a/src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseCode.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.postgraduate.domain.admin.presentation.constant; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum AdminResponseCode { - ADMIN_FIND("ADM200"), - ADMIN_CREATE("ADM201"), - ADMIN_UPDATE("ADM202"), - ADMIN_DELETE("ADM203"); - - private final String code; -} diff --git a/src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseMessage.java b/src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseMessage.java deleted file mode 100644 index e5bb385e..00000000 --- a/src/main/java/com/postgraduate/domain/admin/presentation/constant/AdminResponseMessage.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.postgraduate.domain.admin.presentation.constant; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum AdminResponseMessage { - GET_DETAILS("상세 조회에 성공하였습니다."), - GET_LIST("목록 조회에 성공하였습니다."), - UPDATE_SENIOR_STATUS("선배 승인 상태 수정에 성공하였습니다."), - UPDATE_SALARY_STATUS("정산 상태 수정에 성공하였습니다."), - UPDATE_WISH_STATUS("매칭 지원 완료에 성공하였습니다."), - UPDATE_MENTORING_STATUS("멘토링 상태 변경에 성공하였습니다."); - - private final String message; -} diff --git a/src/main/java/com/postgraduate/domain/admin/presentation/constant/SalaryStatus.java b/src/main/java/com/postgraduate/domain/admin/presentation/constant/SalaryStatus.java deleted file mode 100644 index 23e58308..00000000 --- a/src/main/java/com/postgraduate/domain/admin/presentation/constant/SalaryStatus.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.postgraduate.domain.admin.presentation.constant; - -import lombok.Getter; - -@Getter -public enum SalaryStatus { - DONE, YET, NONE -} diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/CertificationDetailsResponse.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/CertificationDetailsResponse.java deleted file mode 100644 index 6bfa08fe..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/CertificationDetailsResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -import java.time.LocalDateTime; - -public record CertificationDetailsResponse( - Long seniorId, - String certification, - String nickName, - String phoneNumber, - LocalDateTime createdAt, - String postgradu, - String major, - String field, - String lab, - String professor, - String keyword -) { } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringWithPaymentResponse.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringWithPaymentResponse.java deleted file mode 100644 index 1a404047..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringWithPaymentResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -public record MentoringWithPaymentResponse( - Long mentoringId, - Long paymentId, - String userNickname, - String userPhoneNumber, - String seniorNickname, - String seniorPhoneNumber, - String date, - int term, - int pay, - int charge -) { } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/PaymentInfo.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/PaymentInfo.java deleted file mode 100644 index a948c7a9..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/PaymentInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -import com.postgraduate.domain.payment.domain.entity.constant.Status; - -import java.time.LocalDateTime; - -public record PaymentInfo( - Long paymentId, - Long mentoringId, - String userNickName, - String phoneNumber, - LocalDateTime createdAt, - Integer pay, - Status status -) { } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryDetailsResponse.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryDetailsResponse.java deleted file mode 100644 index 4d2b002c..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryDetailsResponse.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -public record SalaryDetailsResponse( - String nickName, - String phoneNumber, - Integer totalAmount, - String accountHolder, - String bank, - String accountNumber, - Boolean status -) {} diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfo.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfo.java deleted file mode 100644 index 1ac79ccd..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -import java.time.LocalDateTime; - -public record SalaryInfo( - Long salaryId, - String nickName, - String phoneNumber, - Integer totalAmount, - String accountHolder, - String bank, - String accountNumber, - LocalDateTime salaryDoneDate -) { - public SalaryInfo(Long salaryId, String nickName, String phoneNumber, int totalAmount, LocalDateTime salaryDoneDate) { - this(salaryId, nickName, phoneNumber, totalAmount, null, null, null, salaryDoneDate); - } -} diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserInfo.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserInfo.java deleted file mode 100644 index e8bad992..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -import com.postgraduate.domain.wish.domain.entity.constant.Status; - -import java.time.LocalDateTime; - -public record UserInfo( - Long userId, - String nickName, - String phoneNumber, - LocalDateTime createdAt, - Boolean marketingReceive, - Boolean matchingReceive, - Long wishId, - Status matchingStatus, - Boolean isSenior -) { } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserMentoringInfo.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserMentoringInfo.java deleted file mode 100644 index 5796e267..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UserMentoringInfo.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -public record UserMentoringInfo( - String nickName, - String phoneNumber -) { } diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/WishResponse.java b/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/WishResponse.java deleted file mode 100644 index 80e5c975..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/dto/res/WishResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.postgraduate.domain.adminssr.application.dto.res; - -import java.time.LocalDateTime; - -public record WishResponse( - Long wishId, - String nickName, - String phoneNumber, - LocalDateTime createAt, - Boolean marketingReceive, - Boolean matchingReceive, - String major, - String field -) { -} diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/mapper/AdminSsrMapper.java b/src/main/java/com/postgraduate/domain/adminssr/application/mapper/AdminSsrMapper.java deleted file mode 100644 index c6083e23..00000000 --- a/src/main/java/com/postgraduate/domain/adminssr/application/mapper/AdminSsrMapper.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.postgraduate.domain.adminssr.application.mapper; - -import com.postgraduate.domain.adminssr.application.dto.res.*; -import com.postgraduate.domain.adminssr.application.dto.res.SeniorInfo; -import com.postgraduate.domain.adminssr.application.dto.res.UnSettledSalaryInfo; -import com.postgraduate.domain.mentoring.domain.entity.Mentoring; -import com.postgraduate.domain.payment.domain.entity.Payment; -import com.postgraduate.domain.salary.domain.entity.Salary; -import com.postgraduate.domain.salary.domain.entity.SalaryAccount; -import com.postgraduate.domain.senior.domain.entity.Info; -import com.postgraduate.domain.senior.domain.entity.Senior; -import com.postgraduate.domain.user.domain.entity.User; -import com.postgraduate.domain.user.domain.entity.constant.Role; -import com.postgraduate.domain.wish.domain.entity.Wish; - -public class AdminSsrMapper { - private AdminSsrMapper() { - throw new IllegalStateException(); - } - - public static CertificationDetailsResponse mapToCertificationInfo(Senior senior) { - User user = senior.getUser(); - Info info = senior.getInfo(); - return new CertificationDetailsResponse( - senior.getSeniorId(), - senior.getCertification(), - user.getNickName(), - user.getPhoneNumber(), - senior.getCreatedAt(), - info.getPostgradu(), - info.getMajor(), - info.getField(), - info.getLab(), - info.getProfessor(), - info.getKeyword() - ); - } - - public static UserInfo mapToUserInfo(Wish wish) { - User user = wish.getUser(); - Boolean isSenior = user.getRole() == Role.SENIOR; - return new UserInfo( - user.getUserId(), - user.getNickName(), - user.getPhoneNumber(), - user.getCreatedAt(), - user.getMarketingReceive(), - wish.getMatchingReceive(), - wish.getWishId(), - wish.getStatus(), - isSenior - ); - } - - public static SeniorInfo mapToSeniorInfo(Senior senior, int totalAmount, Boolean isUser) { - User user = senior.getUser(); - return new SeniorInfo( - senior.getSeniorId(), - user.getNickName(), - user.getPhoneNumber(), - senior.getStatus(), - totalAmount, - user.getMarketingReceive(), - isUser - ); - } - - public static MentoringInfo mapToMentoringInfoWithSenior(Mentoring mentoring) { - User user = mentoring.getUser(); - return new MentoringInfo( - mentoring.getMentoringId(), - mentoring.getStatus(), - user.getNickName(), - user.getPhoneNumber(), - mentoring.getCreatedAt(), - mentoring.getDate() - ); - } - - public static MentoringInfo mapToMentoringInfoWithUser(Mentoring mentoring) { - Senior senior = mentoring.getSenior(); - User user = senior.getUser(); - return new MentoringInfo( - mentoring.getMentoringId(), - mentoring.getStatus(), - user.getNickName(), - user.getPhoneNumber(), - mentoring.getCreatedAt(), - mentoring.getDate() - ); - } - - public static UserMentoringInfo mapToUserMentoringInfo(User user) { - return new UserMentoringInfo( - user.getNickName(), - user.getPhoneNumber() - ); - } - - public static UserMentoringInfo mapToUserMentoringInfo(Senior senior) { - User user = senior.getUser(); - return new UserMentoringInfo( - user.getNickName(), - user.getPhoneNumber() - ); - } - - public static PaymentInfo mapToPaymentInfo(Mentoring mentoring) { - Payment payment = mentoring.getPayment(); - User user = mentoring.getUser(); - return new PaymentInfo( - payment.getPaymentId(), - mentoring.getMentoringId(), - user.getNickName(), - user.getPhoneNumber(), - payment.getPaidAt(), - payment.getPay(), - payment.getStatus() - ); - } - - public static PaymentInfo mapToPaymentInfo(Payment payment, Mentoring mentoring) { - User user = payment.getUser(); - return new PaymentInfo( - payment.getPaymentId(), - mentoring.getMentoringId(), - user.getNickName(), - user.getPhoneNumber(), - payment.getPaidAt(), - payment.getPay(), - payment.getStatus() - ); - } - - public static PaymentInfo mapToPaymentInfo(Payment payment) { - User user = payment.getUser(); - return new PaymentInfo( - payment.getPaymentId(), - null, - user.getNickName(), - user.getPhoneNumber(), - payment.getPaidAt(), - payment.getPay(), - payment.getStatus() - ); - } - - public static SalaryInfoWithOutId mapToSalaryResponse(Senior senior, String accountNumber, Salary salary) { - User user = senior.getUser(); - SalaryAccount account = salary.getAccount(); - return new SalaryInfoWithOutId( - user.getNickName(), - user.getPhoneNumber(), - salary.getTotalAmount(), - account.getAccountHolder(), - account.getBank(), - accountNumber, - salary.getSalaryDoneDate() - ); - } - - public static SalaryInfoWithOutId mapToSalaryResponse(Senior senior, Salary salary) { - User user = senior.getUser(); - return new SalaryInfoWithOutId ( - user.getNickName(), - user.getPhoneNumber(), - salary.getTotalAmount(), - salary.getSalaryDoneDate() - ); - } - - public static UnSettledSalaryInfo mapToUnSettledSalaryResponse(Salary salary) { - Senior senior = salary.getSenior(); - User user = senior.getUser(); - return new UnSettledSalaryInfo( - salary.getSalaryId(), - user.getNickName(), - user.getPhoneNumber(), - salary.getTotalAmount(), - salary.getSalaryDate() - ); - } - - public static UnSettledSalaryInfo mapToUnSettledSalaryResponse(Salary salary, String accountNumber) { - Senior senior = salary.getSenior(); - User user = senior.getUser(); - SalaryAccount account = salary.getAccount(); - return new UnSettledSalaryInfo( - salary.getSalaryId(), - user.getNickName(), - user.getPhoneNumber(), - salary.getTotalAmount(), - account.getAccountHolder(), - account.getBank(), - accountNumber, - salary.getSalaryDate() - ); - } - - public static MentoringWithPaymentResponse mapToMentoringWithPaymentResponse(Mentoring mentoring) { - User user = mentoring.getUser(); - Senior senior = mentoring.getSenior(); - Payment payment = mentoring.getPayment(); - return new MentoringWithPaymentResponse( - mentoring.getMentoringId(), - payment.getPaymentId(), - user.getNickName(), - user.getPhoneNumber(), - senior.getUser().getNickName(), - senior.getUser().getPhoneNumber(), - mentoring.getDate(), - mentoring.getTerm(), - payment.getPay(), - 4000 - ); - } - - public static WishResponse mapToWishResponse(Wish wish) { - User user = wish.getUser(); - return new WishResponse( - wish.getWishId(), - user.getNickName(), - user.getPhoneNumber(), - user.getCreatedAt(), - user.getMarketingReceive(), - wish.getMatchingReceive(), - wish.getMajor(), - wish.getField()); - } -} From fe8eb0f733b85b363a54a6dc6acd6e9ff63700ed Mon Sep 17 00:00:00 2001 From: yang Date: Thu, 30 May 2024 02:56:33 +0900 Subject: [PATCH 3/3] =?UTF-8?q?RAC-393=20fix:=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=88=98?= =?UTF-8?q?=EB=A3=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/application/mapper/AdminMapper.java | 5 +++-- .../application/usecase/AdminPaymentUseCase.java | 1 - .../application/usecase/AdminUserUseCase.java | 1 - .../presentation/AdminWithThymeLeafController.java | 3 --- .../application/dto/res/CertificationResponse.java | 11 +++++++++++ .../application/dto/res/RefundResponse.java | 14 ++++++++++++++ .../application/usecase/PaymentManageUseCase.java | 4 ++-- .../domain/salary/domain/entity/Salary.java | 11 ----------- 8 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/postgraduate/domain/payment/application/dto/res/CertificationResponse.java create mode 100644 src/main/java/com/postgraduate/domain/payment/application/dto/res/RefundResponse.java diff --git a/src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java b/src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java index fb284116..31d460db 100644 --- a/src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java +++ b/src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java @@ -1,7 +1,6 @@ package com.postgraduate.admin.application.mapper; import com.postgraduate.admin.application.dto.res.*; -import com.postgraduate.domain.adminssr.application.dto.res.*; import com.postgraduate.domain.mentoring.domain.entity.Mentoring; import com.postgraduate.domain.payment.domain.entity.Payment; import com.postgraduate.domain.salary.domain.entity.Salary; @@ -12,6 +11,8 @@ import com.postgraduate.domain.user.domain.entity.constant.Role; import com.postgraduate.domain.wish.domain.entity.Wish; +import static com.postgraduate.domain.mentoring.domain.entity.constant.TermUnit.SHORT; + public class AdminMapper { private AdminMapper() { throw new IllegalStateException(); @@ -210,7 +211,7 @@ public static MentoringWithPaymentResponse mapToMentoringWithPaymentResponse(Men mentoring.getDate(), mentoring.getTerm(), payment.getPay(), - 4000 + SHORT.getCharge() ); } diff --git a/src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java index 97414ccd..72dfd50d 100644 --- a/src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java @@ -2,7 +2,6 @@ import com.postgraduate.admin.application.dto.res.MentoringWithPaymentResponse; import com.postgraduate.admin.application.dto.res.PaymentInfo; -import com.postgraduate.domain.adminssr.application.dto.res.*; import com.postgraduate.domain.mentoring.domain.entity.Mentoring; import com.postgraduate.domain.mentoring.domain.service.MentoringGetService; import com.postgraduate.domain.mentoring.domain.service.MentoringUpdateService; diff --git a/src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java b/src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java index 1045dd3c..3dd208d3 100644 --- a/src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java +++ b/src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java @@ -3,7 +3,6 @@ import com.postgraduate.admin.application.dto.req.SendMessageRequest; import com.postgraduate.admin.application.dto.res.UserInfo; import com.postgraduate.admin.application.dto.res.WishResponse; -import com.postgraduate.domain.adminssr.application.dto.res.*; import com.postgraduate.admin.application.mapper.AdminMapper; import com.postgraduate.domain.wish.domain.entity.Wish; import com.postgraduate.domain.wish.domain.service.WishGetService; diff --git a/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java b/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java index fbd15e63..37812f9d 100644 --- a/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java +++ b/src/main/java/com/postgraduate/admin/presentation/AdminWithThymeLeafController.java @@ -4,9 +4,6 @@ import com.postgraduate.admin.application.dto.req.SendMessageRequest; import com.postgraduate.admin.application.dto.res.*; import com.postgraduate.admin.application.usecase.*; -import com.postgraduate.domain.adminssr.application.dto.req.*; -import com.postgraduate.domain.adminssr.application.dto.res.*; -import com.postgraduate.domain.adminssr.application.usecase.*; import com.postgraduate.domain.auth.application.dto.res.JwtTokenResponse; import com.postgraduate.domain.auth.application.usecase.jwt.JwtUseCase; import com.postgraduate.domain.user.domain.entity.User; diff --git a/src/main/java/com/postgraduate/domain/payment/application/dto/res/CertificationResponse.java b/src/main/java/com/postgraduate/domain/payment/application/dto/res/CertificationResponse.java new file mode 100644 index 00000000..32d3cba6 --- /dev/null +++ b/src/main/java/com/postgraduate/domain/payment/application/dto/res/CertificationResponse.java @@ -0,0 +1,11 @@ +package com.postgraduate.domain.payment.application.dto.res; + +public record CertificationResponse ( + String result, + String result_msg, + String cst_id, + String custKey, + String AuthKey, + String PCD_PAY_URL, + String return_url +){ } diff --git a/src/main/java/com/postgraduate/domain/payment/application/dto/res/RefundResponse.java b/src/main/java/com/postgraduate/domain/payment/application/dto/res/RefundResponse.java new file mode 100644 index 00000000..6e2a94bf --- /dev/null +++ b/src/main/java/com/postgraduate/domain/payment/application/dto/res/RefundResponse.java @@ -0,0 +1,14 @@ +package com.postgraduate.domain.payment.application.dto.res; + +public record RefundResponse( + String PCD_PAY_RST, + String PCD_PAY_CODE, + String PCD_PAY_MSG, + String PCD_PAY_OID, + String PCD_PAY_GOODS, + String PCD_REFUND_TOTAL, + String PCD_PAY_TIME, + String PCD_PAY_CARDTRADENUM, + String PCD_PAY_CARDRECEIPT +) { +} diff --git a/src/main/java/com/postgraduate/domain/payment/application/usecase/PaymentManageUseCase.java b/src/main/java/com/postgraduate/domain/payment/application/usecase/PaymentManageUseCase.java index 14364869..ac2b05cd 100644 --- a/src/main/java/com/postgraduate/domain/payment/application/usecase/PaymentManageUseCase.java +++ b/src/main/java/com/postgraduate/domain/payment/application/usecase/PaymentManageUseCase.java @@ -1,7 +1,7 @@ package com.postgraduate.domain.payment.application.usecase; -import com.postgraduate.domain.admin.application.dto.res.CertificationResponse; -import com.postgraduate.domain.admin.application.dto.res.RefundResponse; +import com.postgraduate.domain.payment.application.dto.res.CertificationResponse; +import com.postgraduate.domain.payment.application.dto.res.RefundResponse; import com.postgraduate.domain.payment.application.dto.req.PaymentResultRequest; import com.postgraduate.domain.payment.application.mapper.PaymentMapper; import com.postgraduate.domain.payment.domain.entity.Payment; diff --git a/src/main/java/com/postgraduate/domain/salary/domain/entity/Salary.java b/src/main/java/com/postgraduate/domain/salary/domain/entity/Salary.java index e51c2ec2..372df497 100644 --- a/src/main/java/com/postgraduate/domain/salary/domain/entity/Salary.java +++ b/src/main/java/com/postgraduate/domain/salary/domain/entity/Salary.java @@ -1,6 +1,5 @@ package com.postgraduate.domain.salary.domain.entity; -import com.postgraduate.domain.admin.presentation.constant.SalaryStatus; import com.postgraduate.domain.senior.domain.entity.Senior; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -11,8 +10,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import static com.postgraduate.domain.admin.presentation.constant.SalaryStatus.*; - @Entity @Builder @AllArgsConstructor @@ -63,12 +60,4 @@ public void plusAmount(int amount) { public void minusAmount(int amount) { this.totalAmount -= amount; } - - public SalaryStatus getSalaryStatus() { - if (this.totalAmount == 0) - return NONE; - if (this.status()) - return DONE; - return YET; - } }