From e5312f59b70ee5401a07f4fcd0de3a32c8990be8 Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Mon, 18 Mar 2024 23:37:26 +0900
Subject: [PATCH 1/7] =?UTF-8?q?RAC-325=20fix:=20=EC=9E=AC=EB=B0=9C?=
 =?UTF-8?q?=EA=B8=89=20=ED=86=A0=ED=81=B0=20=EC=A0=80=EC=9E=A5=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/adminMain.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/templates/adminMain.html b/src/main/resources/templates/adminMain.html
index 6899511f..8d84756e 100644
--- a/src/main/resources/templates/adminMain.html
+++ b/src/main/resources/templates/adminMain.html
@@ -15,9 +15,7 @@
 <script th:inline="javascript">
     /*<![CDATA[*/
     var accessToken = /*[[${#strings.escapeJavaScript(tokenResponse.accessToken)}]]*/ '';
-    var refreshToken = /*[[${#strings.escapeJavaScript(tokenResponse.refreshToken)}]]*/ '';
     window.localStorage.setItem("accessToken", accessToken);
-    window.localStorage.setItem("refreshToken", refreshToken);
     function goToSenior() {
         var xhr = new XMLHttpRequest();
         xhr.open("GET", "/adminServer/seniorInfo", true);
@@ -283,7 +281,6 @@
                     document.getElementById("output").innerHTML = xhr.responseText;
                 } else {
                     localStorage.removeItem("accessToken");
-                    localStorage.removeItem("refreshToken");
                 }
             }
         };

From ad291826e25a0473ac1da6d23832ae6dd0d9f029 Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Tue, 19 Mar 2024 00:30:52 +0900
Subject: [PATCH 2/7] =?UTF-8?q?RAC-325=20refactor=20:=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/usecase/AdminAuthUseCase.java |  20 ++
 .../usecase/AdminMentoringUseCase.java        |  82 ++++++++
 .../usecase/AdminPaymentUseCase.java          |  34 ++++
 .../usecase/AdminSalaryUseCase.java           |  59 ++++++
 .../usecase/AdminSeniorUseCase.java           |  65 ++++++
 .../application/usecase/AdminUseCase.java     | 192 ------------------
 .../application/usecase/AdminUserUseCase.java |  40 ++++
 .../domain/{ => service}/AuthGetService.java  |   2 +-
 .../AdminWithThymeLeafController.java         |  41 ++--
 9 files changed, 324 insertions(+), 211 deletions(-)
 create mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java
 create mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
 create mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
 create mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
 create mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
 delete mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUseCase.java
 create mode 100644 src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java
 rename src/main/java/com/postgraduate/domain/adminssr/domain/{ => service}/AuthGetService.java (89%)

diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java
new file mode 100644
index 00000000..45dffad6
--- /dev/null
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java
@@ -0,0 +1,20 @@
+package com.postgraduate.domain.adminssr.application.usecase;
+
+import com.postgraduate.domain.adminssr.application.dto.req.Login;
+import com.postgraduate.domain.adminssr.domain.service.AuthGetService;
+import com.postgraduate.domain.user.domain.entity.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminAuthUseCase {
+    private final AuthGetService authGetService;
+
+    public User login(Login loginForm) {
+        return authGetService.login(loginForm.nickName(), loginForm.phoneNumber());
+    }
+
+}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
new file mode 100644
index 00000000..49e57de6
--- /dev/null
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
@@ -0,0 +1,82 @@
+package com.postgraduate.domain.adminssr.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.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.payment.domain.service.PaymentGetService;
+import com.postgraduate.domain.salary.domain.entity.Salary;
+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.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;
+
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToMentoringWithPaymentResponse;
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToUserMentoringInfo;
+import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.CANCEL;
+import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminMentoringUseCase {
+    private final MentoringGetService mentoringGetService;
+    private final MentoringUpdateService mentoringUpdateService;
+    private final SeniorGetService seniorGetService;
+    private final UserGetService userGetService;
+    private final PaymentGetService paymentGetService;
+    private final PaymentManageUseCase paymentManageUseCase;
+    private final SalaryGetService salaryGetService;
+    private final SalaryUpdateService salaryUpdateService;
+
+    public MentoringManageResponse seniorMentorings(Long seniorId) {
+        Senior senior = seniorGetService.bySeniorId(seniorId);
+        List<Mentoring> mentorings = mentoringGetService.bySeniorId(seniorId);
+        List<MentoringInfo> mentoringInfos = mentorings.stream()
+                .map(AdminMapper::mapToMentoringInfo)
+                .toList();
+        UserMentoringInfo seniorInfo = mapToUserMentoringInfo(senior);
+        return new MentoringManageResponse(mentoringInfos, seniorInfo);
+    }
+
+    public MentoringManageResponse userMentoringInfos(Long userId) {
+        User user = userGetService.byUserId(userId);
+        List<Mentoring> mentorings = mentoringGetService.byUserId(userId);
+        List<MentoringInfo> mentoringInfos = mentorings.stream()
+                .map(AdminMapper::mapToMentoringInfo)
+                .toList();
+        UserMentoringInfo userInfo = mapToUserMentoringInfo(user);
+        return new MentoringManageResponse(mentoringInfos, userInfo);
+    }
+
+    public MentoringWithPaymentResponse paymentMentoringInfo(Long paymentId) {
+        Payment payment = paymentGetService.byId(paymentId);
+        Mentoring mentoring = mentoringGetService.byPayment(payment);
+        return mapToMentoringWithPaymentResponse(mentoring);
+    }
+
+    public void refundMentoring(User user, Long mentoringId) {
+        Mentoring mentoring = mentoringGetService.byMentoringId(mentoringId);
+        Payment payment = mentoring.getPayment();
+        paymentManageUseCase.refundPayByAdmin(user, payment.getPaymentId());
+        if (mentoring.getStatus() == DONE) {
+            Senior senior = mentoring.getSenior();
+            Salary salary = salaryGetService.bySenior(senior);
+            salaryUpdateService.minusTotalAmount(salary);
+        }
+        mentoringUpdateService.updateCancel(mentoring);
+    }
+}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
new file mode 100644
index 00000000..bb04fa7d
--- /dev/null
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
@@ -0,0 +1,34 @@
+package com.postgraduate.domain.adminssr.application.usecase;
+
+import com.postgraduate.domain.admin.application.dto.PaymentInfo;
+import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
+import com.postgraduate.domain.mentoring.domain.service.MentoringGetService;
+import com.postgraduate.domain.payment.domain.entity.Payment;
+import com.postgraduate.domain.payment.domain.service.PaymentGetService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToPaymentInfo;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminPaymentUseCase {
+    private final PaymentGetService paymentGetService;
+    private final MentoringGetService mentoringGetService;
+
+    public List<PaymentInfo> paymentInfos() {
+        List<Payment> all = paymentGetService.all();
+        return all.stream()
+                .map(payment -> {
+                    Mentoring mentoring = mentoringGetService.byPaymentWithNull(payment);
+                    if (mentoring == null)
+                        return mapToPaymentInfo(payment);
+                    return mapToPaymentInfo(payment, mentoring);
+                })
+                .toList();
+    }
+}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
new file mode 100644
index 00000000..005647c1
--- /dev/null
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
@@ -0,0 +1,59 @@
+package com.postgraduate.domain.adminssr.application.usecase;
+
+import com.postgraduate.domain.admin.application.dto.SalaryInfo;
+import com.postgraduate.domain.admin.presentation.constant.SalaryStatus;
+import com.postgraduate.domain.salary.domain.entity.Salary;
+import com.postgraduate.domain.salary.domain.service.SalaryGetService;
+import com.postgraduate.domain.salary.domain.service.SalaryUpdateService;
+import com.postgraduate.domain.salary.exception.SalaryNotYetException;
+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.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToSalaryResponse;
+import static com.postgraduate.domain.admin.presentation.constant.SalaryStatus.YET;
+import static com.postgraduate.domain.salary.util.SalaryUtil.getStatus;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminSalaryUseCase {
+    private final SeniorGetService seniorGetService;
+    private final SalaryGetService salaryGetService;
+    private final SalaryUpdateService salaryUpdateService;
+    private final EncryptorUtils encryptorUtils;
+
+    public List<SalaryInfo> salaryInfos() {
+        List<Salary> all = salaryGetService.findAll();
+        return all.stream()
+                .map(salary -> {
+                    if (salary.getAccountNumber() == null)
+                        return mapToSalaryResponse(salary.getSenior(), salary);
+                    String accountNumber = encryptorUtils.decryptData(salary.getAccountNumber());
+                    return mapToSalaryResponse(salary.getSenior(), accountNumber, salary);
+                })
+                .toList();
+    }
+
+    public SalaryInfo seniorSalary(Long seniorId) {
+        Senior senior = seniorGetService.bySeniorId(seniorId);
+        Salary salary = salaryGetService.bySenior(senior);
+        SalaryStatus status = getStatus(salary);
+        if (status != YET)
+            throw new SalaryNotYetException();
+        if (salary.getAccountNumber() == null)
+            return mapToSalaryResponse(senior, salary);
+        String accountNumber = encryptorUtils.decryptData(salary.getAccountNumber());
+        return mapToSalaryResponse(senior, accountNumber, salary);
+    }
+
+    public void salaryDone(Long salaryId) {
+        Salary salary = salaryGetService.bySalaryId(salaryId);
+        salaryUpdateService.updateDone(salary);
+    }
+}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
new file mode 100644
index 00000000..96745f69
--- /dev/null
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
@@ -0,0 +1,65 @@
+package com.postgraduate.domain.adminssr.application.usecase;
+
+import com.postgraduate.domain.admin.application.dto.SeniorInfo;
+import com.postgraduate.domain.admin.application.dto.res.CertificationDetailsResponse;
+import com.postgraduate.domain.admin.presentation.constant.SalaryStatus;
+import com.postgraduate.domain.salary.domain.entity.Salary;
+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.senior.exception.SeniorCertificationException;
+import com.postgraduate.domain.wish.domain.entity.Wish;
+import com.postgraduate.domain.wish.domain.service.WishGetService;
+import lombok.RequiredArgsConstructor;
+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.mapToCertificationInfo;
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToSeniorInfo;
+import static com.postgraduate.domain.salary.util.SalaryUtil.getStatus;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminSeniorUseCase {
+    private final SeniorGetService seniorGetService;
+    private final SeniorUpdateService seniorUpdateService;
+    private final SalaryGetService salaryGetService;
+    private final WishGetService wishGetService;
+
+    public List<SeniorInfo> allSenior() {
+        List<Senior> seniors = seniorGetService.allSeniorId();
+        return seniors.stream()
+                .map(senior -> {
+                    Salary salary = salaryGetService.bySenior(senior);
+                    SalaryStatus salaryStatus = getStatus(salary);
+                    Optional<Wish> wish = wishGetService.byUser(senior.getUser());
+                    return mapToSeniorInfo(senior, salaryStatus, wish.isPresent());
+                })
+                .toList();
+    }
+
+    public CertificationDetailsResponse getCertification(Long seniorId) {
+        Senior senior = seniorGetService.bySeniorId(seniorId);
+        if (senior.getStatus() == Status.APPROVE)
+            throw new SeniorCertificationException();
+        return mapToCertificationInfo(senior);
+    }
+
+
+    public void updateNotApprove(Long seniorId) {
+        Senior senior = seniorGetService.bySeniorId(seniorId);
+        seniorUpdateService.certificationUpdateNotApprove(senior);
+    }
+
+    public void updateApprove(Long seniorId) {
+        Senior senior = seniorGetService.bySeniorId(seniorId);
+        seniorUpdateService.certificationUpdateApprove(senior);
+    }
+
+}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUseCase.java
deleted file mode 100644
index 8a08d038..00000000
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUseCase.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.postgraduate.domain.adminssr.application.usecase;
-
-import com.postgraduate.domain.admin.application.dto.*;
-import com.postgraduate.domain.admin.application.dto.res.CertificationDetailsResponse;
-import com.postgraduate.domain.admin.application.dto.res.MentoringManageResponse;
-import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse;
-import com.postgraduate.domain.admin.application.dto.res.WishResponse;
-import com.postgraduate.domain.admin.application.mapper.AdminMapper;
-import com.postgraduate.domain.admin.presentation.constant.SalaryStatus;
-import com.postgraduate.domain.adminssr.application.dto.req.Login;
-import com.postgraduate.domain.adminssr.domain.AuthGetService;
-import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
-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.payment.domain.service.PaymentGetService;
-import com.postgraduate.domain.salary.domain.entity.Salary;
-import com.postgraduate.domain.salary.domain.service.SalaryGetService;
-import com.postgraduate.domain.salary.domain.service.SalaryUpdateService;
-import com.postgraduate.domain.salary.exception.SalaryNotYetException;
-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.senior.exception.SeniorCertificationException;
-import com.postgraduate.domain.user.domain.entity.User;
-import com.postgraduate.domain.user.domain.service.UserGetService;
-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.global.config.security.util.EncryptorUtils;
-import lombok.RequiredArgsConstructor;
-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.*;
-import static com.postgraduate.domain.admin.presentation.constant.SalaryStatus.YET;
-import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.CANCEL;
-import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE;
-import static com.postgraduate.domain.salary.util.SalaryUtil.getStatus;
-
-@Service
-@Transactional
-@RequiredArgsConstructor
-public class AdminUseCase {
-    private final UserGetService userGetService;
-    private final AuthGetService authGetService;
-    private final SeniorGetService seniorGetService;
-    private final SalaryGetService salaryGetService;
-    private final WishGetService wishGetService;
-    private final WishUpdateService wishUpdateService;
-    private final PaymentGetService paymentGetService;
-    private final MentoringGetService mentoringGetService;
-    private final SeniorUpdateService seniorUpdateService;
-    private final EncryptorUtils encryptorUtils;
-    private final SalaryUpdateService salaryUpdateService;
-    private final PaymentManageUseCase paymentManageUseCase;
-    private final MentoringUpdateService mentoringUpdateService;
-
-    public User login(Login loginForm) {
-        return authGetService.login(loginForm.nickName(), loginForm.phoneNumber());
-    }
-
-    public List<SeniorInfo> allSenior() {
-        List<Senior> seniors = seniorGetService.allSeniorId();
-        return seniors.stream()
-                .map(senior -> {
-                    Salary salary = salaryGetService.bySenior(senior);
-                    SalaryStatus salaryStatus = getStatus(salary);
-                    Optional<Wish> wish = wishGetService.byUser(senior.getUser());
-                    return mapToSeniorInfo(senior, salaryStatus, wish.isPresent());
-                })
-                .toList();
-    }
-
-    public List<UserInfo> userInfos() {
-        List<Wish> all = wishGetService.all();
-        return all.stream()
-                .map(AdminMapper::mapToUserInfo)
-                .toList();
-    }
-
-    public List<SalaryInfo> salaryInfos() {
-        List<Salary> all = salaryGetService.findAll();
-        return all.stream()
-                .map(salary -> {
-                    if (salary.getAccountNumber() == null)
-                        return mapToSalaryResponse(salary.getSenior(), salary);
-                    String accountNumber = encryptorUtils.decryptData(salary.getAccountNumber());
-                    return mapToSalaryResponse(salary.getSenior(), accountNumber, salary);
-                })
-                .toList();
-    }
-
-    public List<PaymentInfo> paymentInfos() {
-        List<Payment> all = paymentGetService.all();
-        return all.stream()
-                .map(payment -> {
-                    Mentoring mentoring = mentoringGetService.byPaymentWithNull(payment);
-                    if (mentoring == null)
-                        return mapToPaymentInfo(payment);
-                    return mapToPaymentInfo(payment, mentoring);
-                })
-                .toList();
-    }
-
-    public CertificationDetailsResponse getCertification(Long seniorId) {
-        Senior senior = seniorGetService.bySeniorId(seniorId);
-        if (senior.getStatus() == Status.APPROVE)
-            throw new SeniorCertificationException();
-        return mapToCertificationInfo(senior);
-    }
-
-    public void updateNotApprove(Long seniorId) {
-        Senior senior = seniorGetService.bySeniorId(seniorId);
-        seniorUpdateService.updateCertificationStatus(senior, Status.NOT_APPROVE);
-    }
-
-    public void updateApprove(Long seniorId) {
-        Senior senior = seniorGetService.bySeniorId(seniorId);
-        seniorUpdateService.updateCertificationStatus(senior, Status.APPROVE);
-    }
-
-    public MentoringManageResponse seniorMentorings(Long seniorId) {
-        Senior senior = seniorGetService.bySeniorId(seniorId);
-        List<Mentoring> mentorings = mentoringGetService.bySeniorId(seniorId);
-        List<MentoringInfo> mentoringInfos = mentorings.stream()
-                .map(AdminMapper::mapToMentoringInfo)
-                .toList();
-        UserMentoringInfo seniorInfo = mapToUserMentoringInfo(senior);
-        return new MentoringManageResponse(mentoringInfos, seniorInfo);
-    }
-
-    public SalaryInfo seniorSalary(Long seniorId) {
-        Senior senior = seniorGetService.bySeniorId(seniorId);
-        Salary salary = salaryGetService.bySenior(senior);
-        SalaryStatus status = getStatus(salary);
-        if (status != YET)
-            throw new SalaryNotYetException();
-        if (salary.getAccountNumber() == null)
-            return mapToSalaryResponse(senior, salary);
-        String accountNumber = encryptorUtils.decryptData(salary.getAccountNumber());
-        return mapToSalaryResponse(senior, accountNumber, salary);
-    }
-
-    public WishResponse wishInfo(Long userId) {
-        Wish wish = wishGetService.byUserId(userId);
-        return mapToWishResponse(wish);
-    }
-
-    public MentoringManageResponse userMentoringInfos(Long userId) {
-        User user = userGetService.byUserId(userId);
-        List<Mentoring> mentorings = mentoringGetService.byUserId(userId);
-        List<MentoringInfo> mentoringInfos = mentorings.stream()
-                .map(AdminMapper::mapToMentoringInfo)
-                .toList();
-        UserMentoringInfo userInfo = mapToUserMentoringInfo(user);
-        return new MentoringManageResponse(mentoringInfos, userInfo);
-    }
-
-    public MentoringWithPaymentResponse paymentMentoringInfo(Long paymentId) {
-        Payment payment = paymentGetService.byId(paymentId);
-        Mentoring mentoring = mentoringGetService.byPayment(payment);
-        return mapToMentoringWithPaymentResponse(mentoring);
-    }
-
-    public void wishDone(Long wishId) {
-        Wish wish = wishGetService.byWishId(wishId);
-        wishUpdateService.updateWishStatus(wish);
-    }
-
-    public void salaryDone(Long salaryId) {
-        Salary salary = salaryGetService.bySalaryId(salaryId);
-        salaryUpdateService.updateStatus(salary, true);
-    }
-
-    public void refundMentoring(User user, Long mentoringId) {
-        Mentoring mentoring = mentoringGetService.byMentoringId(mentoringId);
-        Payment payment = mentoring.getPayment();
-        paymentManageUseCase.refundPayByAdmin(user, payment.getPaymentId());
-        if (mentoring.getStatus() == DONE) {
-            Senior senior = mentoring.getSenior();
-            Salary salary = salaryGetService.bySenior(senior);
-            salaryUpdateService.minusTotalAmount(salary);
-        }
-        mentoringUpdateService.updateStatus(mentoring, CANCEL);
-    }
-}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java
new file mode 100644
index 00000000..7756c62b
--- /dev/null
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java
@@ -0,0 +1,40 @@
+package com.postgraduate.domain.adminssr.application.usecase;
+
+import com.postgraduate.domain.admin.application.dto.UserInfo;
+import com.postgraduate.domain.admin.application.dto.res.WishResponse;
+import com.postgraduate.domain.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;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToWishResponse;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminUserUseCase {
+    private final WishGetService wishGetService;
+    private final WishUpdateService wishUpdateService;
+
+    public List<UserInfo> userInfos() {
+        List<Wish> all = wishGetService.all();
+        return all.stream()
+                .map(AdminMapper::mapToUserInfo)
+                .toList();
+    }
+
+    public WishResponse wishInfo(Long userId) {
+        Wish wish = wishGetService.byUserId(userId);
+        return mapToWishResponse(wish);
+    }
+
+    public void wishDone(Long wishId) {
+        Wish wish = wishGetService.byWishId(wishId);
+        wishUpdateService.updateWishDone(wish);
+    }
+}
diff --git a/src/main/java/com/postgraduate/domain/adminssr/domain/AuthGetService.java b/src/main/java/com/postgraduate/domain/adminssr/domain/service/AuthGetService.java
similarity index 89%
rename from src/main/java/com/postgraduate/domain/adminssr/domain/AuthGetService.java
rename to src/main/java/com/postgraduate/domain/adminssr/domain/service/AuthGetService.java
index c5c286cd..033b8d2f 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/domain/AuthGetService.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/domain/service/AuthGetService.java
@@ -1,4 +1,4 @@
-package com.postgraduate.domain.adminssr.domain;
+package com.postgraduate.domain.adminssr.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/domain/adminssr/presentation/AdminWithThymeLeafController.java
index 6794a923..912fa633 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java
@@ -6,7 +6,7 @@
 import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse;
 import com.postgraduate.domain.admin.application.dto.res.WishResponse;
 import com.postgraduate.domain.adminssr.application.dto.req.Login;
-import com.postgraduate.domain.adminssr.application.usecase.AdminUseCase;
+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;
@@ -22,7 +22,12 @@
 @Controller
 @RequestMapping("/adminServer")
 public class AdminWithThymeLeafController {
-    private final AdminUseCase adminUseCase;
+    private final AdminAuthUseCase adminAuthUseCase;
+    private final AdminSeniorUseCase adminSeniorUseCase;
+    private final AdminUserUseCase adminUserUseCase;
+    private final AdminMentoringUseCase adminMentoringUseCase;
+    private final AdminSalaryUseCase adminSalaryUseCase;
+    private final AdminPaymentUseCase adminPaymentUseCase;
     private final JwtUseCase jwtUseCase;
 
     @GetMapping("/loginForm")
@@ -33,7 +38,7 @@ public String loginForm(Model model, Login loginForm) {
 
     @PostMapping("/login")
     public String login(@ModelAttribute Login loginForm, Model model) {
-        User user = adminUseCase.login(loginForm);
+        User user = adminAuthUseCase.login(loginForm);
         JwtTokenResponse jwtTokenResponse = jwtUseCase.signIn(user);
         model.addAttribute("tokenResponse", jwtTokenResponse);
         return "adminMain";
@@ -41,100 +46,100 @@ public String login(@ModelAttribute Login loginForm, Model model) {
 
     @GetMapping("/seniorInfo")
     public String seniorInfo(Model model) {
-        List<SeniorInfo> seniorInfos = adminUseCase.allSenior();
+        List<SeniorInfo> seniorInfos = adminSeniorUseCase.allSenior();
         model.addAttribute("seniorInfos", seniorInfos);
         return "adminSenior";
     }
 
     @GetMapping("/userInfo")
     public String userInfo(Model model) {
-        List<UserInfo> userInfos = adminUseCase.userInfos();
+        List<UserInfo> userInfos = adminUserUseCase.userInfos();
         model.addAttribute("userInfos", userInfos);
         return "adminUser";
     }
 
     @GetMapping("/paymentInfo")
     public String paymentInfo(Model model) {
-        List<PaymentInfo> paymentInfos = adminUseCase.paymentInfos();
+        List<PaymentInfo> paymentInfos = adminPaymentUseCase.paymentInfos();
         model.addAttribute("paymentInfos", paymentInfos);
         return "adminPayment";
     }
 
     @GetMapping("/salaryInfo")
     public String salaryInfo(Model model) {
-        List<SalaryInfo> salaryInfos = adminUseCase.salaryInfos();
+        List<SalaryInfo> salaryInfos = adminSalaryUseCase.salaryInfos();
         model.addAttribute("salaryInfo", salaryInfos);
         return "adminSalary";
     }
 
     @GetMapping("/certification/{seniorId}")
     public String certification(@PathVariable Long seniorId, Model model) {
-        CertificationDetailsResponse certification = adminUseCase.getCertification(seniorId);
+        CertificationDetailsResponse certification = adminSeniorUseCase.getCertification(seniorId);
         model.addAttribute("certificationInfo", certification);
         return "seniorCertification";
     }
 
     @PostMapping("/certification/{seniorId}/refuse")
     public String certificationRefuse(@PathVariable Long seniorId) {
-        adminUseCase.updateNotApprove(seniorId);
+        adminSeniorUseCase.updateNotApprove(seniorId);
         return "adminEmpty";
     }
 
     @PostMapping("/certification/{seniorId}/approve")
     public String certificationApprove(@PathVariable Long seniorId) {
-        adminUseCase.updateApprove(seniorId);
+        adminSeniorUseCase.updateApprove(seniorId);
         return "adminEmpty";
     }
 
     @GetMapping("/mentoring/{seniorId}")
     public String seniorMentoringInfo(@PathVariable Long seniorId, Model model) {
-        MentoringManageResponse mentoringInfos = adminUseCase.seniorMentorings(seniorId);
+        MentoringManageResponse mentoringInfos = adminMentoringUseCase.seniorMentorings(seniorId);
         model.addAttribute("mentoringInfos", mentoringInfos);
         return "seniorMentoring";
     }
 
     @PostMapping("/mentoring/refund/{mentoringId}")
     public String refundMentoring(@AuthenticationPrincipal User user, @PathVariable Long mentoringId) {
-        adminUseCase.refundMentoring(user, mentoringId);
+        adminMentoringUseCase.refundMentoring(user, mentoringId);
         return "adminEmpty";
     }
 
     @GetMapping("/salary/{seniorId}")
     public String seniorSalaryInfo(@PathVariable Long seniorId, Model model) {
-        SalaryInfo salaryInfo = adminUseCase.seniorSalary(seniorId);
+        SalaryInfo salaryInfo = adminSalaryUseCase.seniorSalary(seniorId);
         model.addAttribute("salaryInfo", salaryInfo);
         return "seniorSalary";
     }
 
     @PostMapping("/salary/done/{salaryId}")
     public String salaryDone(@PathVariable Long salaryId) {
-        adminUseCase.salaryDone(salaryId);
+        adminSalaryUseCase.salaryDone(salaryId);
         return "adminEmpty";
     }
 
     @GetMapping("/user/matching/{userId}")
     public String userMatching(@PathVariable Long userId, Model model) {
-        WishResponse wishResponse = adminUseCase.wishInfo(userId);
+        WishResponse wishResponse = adminUserUseCase.wishInfo(userId);
         model.addAttribute("wishInfo", wishResponse);
         return "userWish";
     }
 
     @PostMapping("/wish/done/{wishId}")
     public String wishDone(@PathVariable Long wishId) {
-        adminUseCase.wishDone(wishId);
+        adminUserUseCase.wishDone(wishId);
         return "adminEmpty";
     }
 
     @GetMapping("/user/mentoring/{userId}")
     public String userMentoring(@PathVariable Long userId, Model model) {
-        MentoringManageResponse mentoringInfos = adminUseCase.userMentoringInfos(userId);
+        MentoringManageResponse mentoringInfos = adminMentoringUseCase.userMentoringInfos(userId);
         model.addAttribute("mentoringInfos", mentoringInfos);
         return "userMentoring";
     }
 
     @GetMapping("/payment/mentoring/{paymentId}")
     public String paymentMentoring(@PathVariable Long paymentId, Model model) {
-        MentoringWithPaymentResponse mentoringInfo = adminUseCase.paymentMentoringInfo(paymentId);
+        MentoringWithPaymentResponse mentoringInfo = adminMentoringUseCase.paymentMentoringInfo(paymentId);
         model.addAttribute("mentoringInfo", mentoringInfo);
         return "paymentMentoring";
     }

From c2d7773447f39659a76ef1eb810c8b04c6f6997e Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Tue, 19 Mar 2024 00:32:37 +0900
Subject: [PATCH 3/7] =?UTF-8?q?RAC-325=20refactor=20:=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=A9=94?=
 =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usecase/MentoringManageByAdminUseCase.java  |  2 +-
 .../usecase/SalaryManageByAdminUseCase.java     |  8 +++++++-
 .../usecase/SeniorManageByAdminUseCase.java     |  7 ++++++-
 .../usecase/UserManageByAdminUseCase.java       |  2 +-
 .../usecase/oauth/SignUpUseCase.java            |  2 +-
 .../usecase/MentoringManageUseCase.java         |  8 ++++----
 .../usecase/MentoringRenewalUseCase.java        |  4 ++--
 .../mentoring/domain/entity/Mentoring.java      |  4 +---
 .../domain/service/MentoringUpdateService.java  | 17 ++++++++++++++++-
 .../domain/service/SalaryUpdateService.java     | 10 +++++++---
 .../domain/senior/domain/entity/Senior.java     |  1 -
 .../domain/service/SeniorUpdateService.java     | 12 +++++++++---
 .../user/domain/service/UserUpdateService.java  |  7 ++++---
 .../domain/wish/domain/entity/Wish.java         |  4 ++--
 .../wish/domain/service/WishUpdateService.java  |  6 ++++--
 .../usecase/oauth/SignUpUseCaseTest.java        |  2 +-
 .../usecase/MentoringManageUseCaseTest.java     | 10 +++++-----
 .../service/MentoringUpdateServiceTest.java     |  6 +++---
 .../domain/service/SalaryUpdateServiceTest.java |  4 ++--
 .../domain/service/SeniorUpdateServiceTest.java |  2 +-
 .../domain/service/UserUpdateServiceTest.java   |  2 +-
 21 files changed, 78 insertions(+), 42 deletions(-)

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
index a36d48df..b0071efd 100644
--- a/src/main/java/com/postgraduate/domain/admin/application/usecase/MentoringManageByAdminUseCase.java
+++ b/src/main/java/com/postgraduate/domain/admin/application/usecase/MentoringManageByAdminUseCase.java
@@ -58,7 +58,7 @@ public MentoringWithPaymentResponse getMentoringWithPayment(Long mentoringId) {
 
     public void cancelMentoring(Long mentoringId) {
         Mentoring mentoring = mentoringGetService.byMentoringId(mentoringId);
-        mentoringUpdateService.updateStatus(mentoring, Status.CANCEL);
+        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/SalaryManageByAdminUseCase.java b/src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java
index 4536bf9f..4af895a4 100644
--- a/src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java
+++ b/src/main/java/com/postgraduate/domain/admin/application/usecase/SalaryManageByAdminUseCase.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Optional;
 
+import static java.lang.Boolean.TRUE;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -69,6 +71,10 @@ private SalaryInfo getSalaryInfo(Senior senior, Salary salary) {
     public void updateSalaryStatus(Long seniorId, Boolean status) {
         Senior senior = seniorGetService.bySeniorId(seniorId);
         Salary salary = salaryGetService.bySenior(senior);
-        salaryUpdateService.updateStatus(salary, status);
+        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
index 26c41fad..efbd1d1d 100644
--- a/src/main/java/com/postgraduate/domain/admin/application/usecase/SeniorManageByAdminUseCase.java
+++ b/src/main/java/com/postgraduate/domain/admin/application/usecase/SeniorManageByAdminUseCase.java
@@ -24,6 +24,7 @@
 import java.util.Optional;
 
 import static com.postgraduate.domain.salary.util.SalaryUtil.getStatus;
+import static com.postgraduate.domain.senior.domain.entity.constant.Status.APPROVE;
 
 @Service
 @Transactional
@@ -44,7 +45,11 @@ public CertificationDetailsResponse getCertificationDetails(Long seniorId) {
 
     public void updateSeniorStatus(Long seniorId, SeniorStatusRequest request) {
         Senior senior = seniorGetService.bySeniorId(seniorId);
-        seniorUpdateService.updateCertificationStatus(senior, request.certificationStatus());
+        if (request.certificationStatus() == APPROVE) {
+            seniorUpdateService.certificationUpdateApprove(senior);
+            return;
+        }
+        seniorUpdateService.certificationUpdateNotApprove(senior);
     }
 
     public SeniorManageResponse getSeniors(Integer page, String search) {
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
index 1a57d3a4..abe8e055 100644
--- a/src/main/java/com/postgraduate/domain/admin/application/usecase/UserManageByAdminUseCase.java
+++ b/src/main/java/com/postgraduate/domain/admin/application/usecase/UserManageByAdminUseCase.java
@@ -42,6 +42,6 @@ public void updateWishStatus(Long wishId) {
         if (wish.getMajor() == null && wish.getField() == null) {
             throw new WishEmptyException();
         }
-        wishUpdateService.updateWishStatus(wish);
+        wishUpdateService.updateWishDone(wish);
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCase.java b/src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCase.java
index 95dff1e0..f9a9bef2 100644
--- a/src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCase.java
+++ b/src/main/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCase.java
@@ -70,7 +70,7 @@ public User changeSenior(User user, SeniorChangeRequest changeRequest) {
         Senior senior = SeniorMapper.mapToSenior(user, changeRequest);
         seniorSaveService.saveSenior(senior);
         user = userGetService.byUserId(user.getUserId());
-        userUpdateService.updateRole(user, Role.SENIOR);
+        userUpdateService.userToSeniorRole(user);
         Salary salary = SalaryMapper.mapToSalary(senior, getSalaryDate());
         salarySaveService.save(salary);
         return user;
diff --git a/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java b/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java
index dfa84594..cb7f38bc 100644
--- a/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java
+++ b/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java
@@ -88,7 +88,7 @@ public void updateCancel(User user, Long mentoringId) {
             throw new MentoringNotWaitingException();
         Payment payment = mentoring.getPayment();
         paymentManageUseCase.refundPayByUser(user, payment.getOrderId());
-        mentoringUpdateService.updateStatus(mentoring, CANCEL);
+        mentoringUpdateService.updateCancel(mentoring);
     }
 
 
@@ -98,7 +98,7 @@ public void updateDone(User user, Long mentoringId) {
         if (mentoring.getStatus() != EXPECTED)
             throw new MentoringNotExpectedException();
         Salary salary = salaryGetService.bySenior(mentoring.getSenior());
-        salaryUpdateService.updateTotalAmount(salary);
+        salaryUpdateService.plusTotalAmount(salary);
         mentoringUpdateService.updateDone(mentoring, salary);
     }
 
@@ -113,7 +113,7 @@ public void updateRefuse(User user, Long mentoringId, MentoringRefuseRequest req
         refuseSaveService.save(refuse);
         Payment payment = mentoring.getPayment();
         paymentManageUseCase.refundPayBySenior(senior, payment.getOrderId());
-        mentoringUpdateService.updateStatus(mentoring, REFUSE);
+        mentoringUpdateService.updateRefuse(mentoring);
     }
 
 
@@ -124,7 +124,7 @@ public Boolean updateExpected(User user, Long mentoringId, MentoringDateRequest
         if (mentoring.getStatus() != WAITING)
             throw new MentoringNotWaitingException();
         mentoringUpdateService.updateDate(mentoring, dateRequest.date());
-        mentoringUpdateService.updateStatus(mentoring, EXPECTED);
+        mentoringUpdateService.updateExpected(mentoring);
         Optional<Account> account = accountGetService.bySenior(senior);
         return account.isPresent();
     }
diff --git a/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringRenewalUseCase.java b/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringRenewalUseCase.java
index 8c0a1aa8..d0da7ab6 100644
--- a/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringRenewalUseCase.java
+++ b/src/main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringRenewalUseCase.java
@@ -39,7 +39,7 @@ public void updateCancelWithAuto(Mentoring mentoring) {
         try {
             paymentManageUseCase.refundPayByUser(mentoring.getUser(), mentoring.getPayment().getOrderId());
             Mentoring cancelMentoring = mentoringGetService.byMentoringIdWithLazy(mentoring.getMentoringId());
-            mentoringUpdateService.updateStatus(cancelMentoring, CANCEL);
+            mentoringUpdateService.updateCancel(cancelMentoring);
             Refuse refuse = RefuseMapper.mapToRefuse(mentoring);
             refuseSaveService.save(refuse);
             log.info("mentoringId : {} 자동 취소", mentoring.getMentoringId());
@@ -56,7 +56,7 @@ public void updateDoneWithAuto(Mentoring mentoring) {
             Mentoring doneMentoring = mentoringGetService.byMentoringIdWithLazy(mentoring.getMentoringId());
             Senior senior = mentoring.getSenior();
             Salary salary = salaryGetService.bySenior(senior);
-            salaryUpdateService.updateTotalAmount(salary);
+            salaryUpdateService.plusTotalAmount(salary);
             mentoringUpdateService.updateDone(doneMentoring, salary);
             log.info("mentoringId : {} 자동 완료", mentoring.getMentoringId());
         } catch (Exception ex) {
diff --git a/src/main/java/com/postgraduate/domain/mentoring/domain/entity/Mentoring.java b/src/main/java/com/postgraduate/domain/mentoring/domain/entity/Mentoring.java
index 83e4fa74..e2325844 100644
--- a/src/main/java/com/postgraduate/domain/mentoring/domain/entity/Mentoring.java
+++ b/src/main/java/com/postgraduate/domain/mentoring/domain/entity/Mentoring.java
@@ -16,7 +16,6 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
-import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE;
 import static java.time.LocalDateTime.now;
 import static java.time.LocalDateTime.parse;
 import static java.time.format.DateTimeFormatter.ofPattern;
@@ -70,8 +69,7 @@ public void updateStatus(Status status) {
         this.status = status;
     }
 
-    public void updateDone(Salary salary) {
-        this.status = DONE;
+    public void updateSalary(Salary salary) {
         this.salary = salary;
     }
 
diff --git a/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateService.java b/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateService.java
index e9e7200e..91743f8c 100644
--- a/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateService.java
+++ b/src/main/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateService.java
@@ -6,6 +6,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.*;
+
 @Service
 @RequiredArgsConstructor
 public class MentoringUpdateService {
@@ -14,8 +16,21 @@ public void updateStatus(Mentoring mentoring, Status status) {
         mentoring.updateStatus(status);
     }
 
+    public void updateRefuse(Mentoring mentoring) {
+        mentoring.updateStatus(REFUSE);
+    }
+
+    public void updateCancel(Mentoring mentoring) {
+        mentoring.updateStatus(CANCEL);
+    }
+
+    public void updateExpected(Mentoring mentoring) {
+        mentoring.updateStatus(EXPECTED);
+    }
+
     public void updateDone(Mentoring mentoring, Salary salary) {
-        mentoring.updateDone(salary);
+        mentoring.updateStatus(DONE);
+        mentoring.updateSalary(salary);
     }
 
     public void updateDate(Mentoring mentoring, String date) {
diff --git a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateService.java b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateService.java
index 9182f99d..55ea059d 100644
--- a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateService.java
+++ b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateService.java
@@ -9,11 +9,15 @@
 public class SalaryUpdateService {
     private static final int AMOUNT = 20000; //todo : 디폴트 20000원 이후 수정
 
-    public void updateStatus(Salary salary, Boolean status) {
-        salary.updateStatus(status);
+    public void updateDone(Salary salary) {
+        salary.updateStatus(true);
     }
 
-    public void updateTotalAmount(Salary salary) {
+    public void updateNot(Salary salary) {
+        salary.updateStatus(false);
+    }
+
+    public void plusTotalAmount(Salary salary) {
         salary.plusAmount(AMOUNT);
     }
 
diff --git a/src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java b/src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java
index 1930e150..cab05db8 100644
--- a/src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java
+++ b/src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java
@@ -64,7 +64,6 @@ public void updateInfo(SeniorMyPageProfileRequest myPageProfileRequest) {
 
     public void updateCertification(String certification) {
         this.certification = certification;
-        this.status = WAITING;
     }
 
     public void updateStatus(Status status) {
diff --git a/src/main/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateService.java b/src/main/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateService.java
index 455042d3..f427015c 100644
--- a/src/main/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateService.java
+++ b/src/main/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateService.java
@@ -3,10 +3,11 @@
 import com.postgraduate.domain.senior.application.dto.req.SeniorMyPageProfileRequest;
 import com.postgraduate.domain.senior.domain.entity.Profile;
 import com.postgraduate.domain.senior.domain.entity.Senior;
-import com.postgraduate.domain.senior.domain.entity.constant.Status;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import static com.postgraduate.domain.senior.domain.entity.constant.Status.*;
+
 @Service
 @RequiredArgsConstructor
 public class SeniorUpdateService {
@@ -16,6 +17,7 @@ public void signUpSeniorProfile(Senior senior, Profile profile) {
 
     public void updateCertification(Senior senior, String imageUrl) {
         senior.updateCertification(imageUrl);
+        senior.updateStatus(WAITING);
     }
 
     public void updateMyPageProfile(Senior senior, SeniorMyPageProfileRequest myPageProfileRequest, Profile profile) {
@@ -27,7 +29,11 @@ public void updateHit(Senior senior) {
         senior.updateHit();
     }
 
-    public void updateCertificationStatus(Senior senior, Status status) {
-        senior.updateStatus(status);
+    public void certificationUpdateApprove(Senior senior) {
+        senior.updateStatus(APPROVE);
+    }
+
+    public void certificationUpdateNotApprove(Senior senior) {
+        senior.updateStatus(NOT_APPROVE);
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/user/domain/service/UserUpdateService.java b/src/main/java/com/postgraduate/domain/user/domain/service/UserUpdateService.java
index 3696fad1..b7efe646 100644
--- a/src/main/java/com/postgraduate/domain/user/domain/service/UserUpdateService.java
+++ b/src/main/java/com/postgraduate/domain/user/domain/service/UserUpdateService.java
@@ -3,10 +3,11 @@
 import com.postgraduate.domain.senior.application.dto.req.SeniorMyPageUserAccountRequest;
 import com.postgraduate.domain.user.application.dto.req.UserInfoRequest;
 import com.postgraduate.domain.user.domain.entity.User;
-import com.postgraduate.domain.user.domain.entity.constant.Role;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import static com.postgraduate.domain.user.domain.entity.constant.Role.SENIOR;
+
 @Service
 @RequiredArgsConstructor
 public class UserUpdateService {
@@ -14,8 +15,8 @@ public void updateDelete(User user) {
         user.updateDelete();
     }
 
-    public void updateRole(User user, Role role) {
-        user.updateRole(role);
+    public void userToSeniorRole(User user) {
+        user.updateRole(SENIOR);
     }
 
     public void updateInfo(User user, UserInfoRequest userInfoRequest) {
diff --git a/src/main/java/com/postgraduate/domain/wish/domain/entity/Wish.java b/src/main/java/com/postgraduate/domain/wish/domain/entity/Wish.java
index a4f12488..91bec5e0 100644
--- a/src/main/java/com/postgraduate/domain/wish/domain/entity/Wish.java
+++ b/src/main/java/com/postgraduate/domain/wish/domain/entity/Wish.java
@@ -32,7 +32,7 @@ public class Wish {
     @Enumerated(EnumType.STRING)
     private Status status;
 
-    public void updateStatus() {
-        this.status = Status.MATCHED;
+    public void updateStatus(Status status) {
+        this.status = status;
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/wish/domain/service/WishUpdateService.java b/src/main/java/com/postgraduate/domain/wish/domain/service/WishUpdateService.java
index ad3d173b..1d5b7f47 100644
--- a/src/main/java/com/postgraduate/domain/wish/domain/service/WishUpdateService.java
+++ b/src/main/java/com/postgraduate/domain/wish/domain/service/WishUpdateService.java
@@ -4,10 +4,12 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import static com.postgraduate.domain.wish.domain.entity.constant.Status.MATCHED;
+
 @Service
 @RequiredArgsConstructor
 public class WishUpdateService {
-    public void updateWishStatus(Wish wish) {
-        wish.updateStatus();
+    public void updateWishDone(Wish wish) {
+        wish.updateStatus(MATCHED);
     }
 }
diff --git a/src/test/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCaseTest.java b/src/test/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCaseTest.java
index 40eeff0b..1ea43b64 100644
--- a/src/test/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCaseTest.java
+++ b/src/test/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseCaseTest.java
@@ -157,7 +157,7 @@ void changeSenior() {
         verify(seniorSaveService, times(1))
                 .saveSenior(any(Senior.class));
         verify(userUpdateService, times(1))
-                .updateRole(any(), eq(SENIOR));
+                .userToSeniorRole(any());
 
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCaseTest.java b/src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCaseTest.java
index 3bf1640a..0066b4e7 100644
--- a/src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCaseTest.java
+++ b/src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCaseTest.java
@@ -173,7 +173,7 @@ void updateCancel() {
 
         mentoringManageUseCase.updateCancel(user, mentoringId);
 
-        verify(mentoringUpdateService).updateStatus(mentoring, CANCEL);
+        verify(mentoringUpdateService).updateCancel(mentoring);
     }
 
     @Test
@@ -255,7 +255,7 @@ void updateDone() {
                 .willReturn(salary);
         mentoringManageUseCase.updateDone(user, mentoringId);
 
-        verify(salaryUpdateService).updateTotalAmount(salary);
+        verify(salaryUpdateService).plusTotalAmount(salary);
         verify(mentoringUpdateService).updateDone(mentoring, salary);
     }
 
@@ -277,7 +277,7 @@ void updateRefuse() {
         mentoringManageUseCase.updateRefuse(user, mentoringId, request);
 
         verify(refuseSaveService).save(any(Refuse.class));
-        verify(mentoringUpdateService).updateStatus(mentoring, REFUSE);
+        verify(mentoringUpdateService).updateRefuse(mentoring);
     }
 
     @Test
@@ -337,7 +337,7 @@ void updateExpectedTrue() {
                 .isEqualTo(TRUE);
 
         verify(mentoringUpdateService).updateDate(mentoring, dateRequest.date());
-        verify(mentoringUpdateService).updateStatus(mentoring, EXPECTED);
+        verify(mentoringUpdateService).updateExpected(mentoring);
     }
 
     @Test
@@ -361,7 +361,7 @@ void updateExpectedFa() {
                 .isEqualTo(FALSE);
 
         verify(mentoringUpdateService).updateDate(mentoring, dateRequest.date());
-        verify(mentoringUpdateService).updateStatus(mentoring, EXPECTED);
+        verify(mentoringUpdateService).updateExpected(mentoring);
     }
 
     @Test
diff --git a/src/test/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateServiceTest.java b/src/test/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateServiceTest.java
index 34506d67..708f2ed2 100644
--- a/src/test/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateServiceTest.java
+++ b/src/test/java/com/postgraduate/domain/mentoring/domain/service/MentoringUpdateServiceTest.java
@@ -48,7 +48,7 @@ void updateStatusDone() {
     @Test
     @DisplayName("CANCEL 변경")
     void updateStatusCancel() {
-        mentoringUpdateService.updateStatus(mentoring, CANCEL);
+        mentoringUpdateService.updateCancel(mentoring);
         assertThat(mentoring.getStatus())
                 .isEqualTo(CANCEL);
     }
@@ -56,7 +56,7 @@ void updateStatusCancel() {
     @Test
     @DisplayName("EXPECTED 변경")
     void updateStatusExpected() {
-        mentoringUpdateService.updateStatus(mentoring, EXPECTED);
+        mentoringUpdateService.updateExpected(mentoring);
         assertThat(mentoring.getStatus())
                 .isEqualTo(EXPECTED);
     }
@@ -64,7 +64,7 @@ void updateStatusExpected() {
     @Test
     @DisplayName("REFUSE 변경")
     void updateStatusRefuse() {
-        mentoringUpdateService.updateStatus(mentoring, REFUSE);
+        mentoringUpdateService.updateRefuse(mentoring);
         assertThat(mentoring.getStatus())
                 .isEqualTo(REFUSE);
     }
diff --git a/src/test/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateServiceTest.java b/src/test/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateServiceTest.java
index 4d51dcc4..7428b740 100644
--- a/src/test/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateServiceTest.java
+++ b/src/test/java/com/postgraduate/domain/salary/domain/service/SalaryUpdateServiceTest.java
@@ -27,7 +27,7 @@ void updateStatusTRUE() {
         Senior senior = mock(Senior.class);
         Salary salary = new Salary(1L, FALSE, senior, 100, LocalDate.now(), LocalDateTime.now(), "a", "b", "c");
 
-        salaryUpdateService.updateStatus(salary, TRUE);
+        salaryUpdateService.updateDone(salary);
 
         assertThat(salary.status())
                 .isTrue();
@@ -39,7 +39,7 @@ void updateStatusFALSE() {
         Senior senior = mock(Senior.class);
         Salary salary = new Salary(1L, TRUE, senior, 0, LocalDate.now(), LocalDateTime.now(), "a", "b", "c");
 
-        salaryUpdateService.updateTotalAmount(salary);
+        salaryUpdateService.plusTotalAmount(salary);
 
         assertThat(salary.getTotalAmount())
                 .isEqualTo(20000);
diff --git a/src/test/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateServiceTest.java b/src/test/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateServiceTest.java
index e214ff4d..7a6be8ea 100644
--- a/src/test/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateServiceTest.java
+++ b/src/test/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateServiceTest.java
@@ -112,7 +112,7 @@ void updateHit() {
     @Test
     @DisplayName("상태 변경")
     void updateStatus() {
-        seniorUpdateService.updateCertificationStatus(senior, APPROVE);
+        seniorUpdateService.certificationUpdateApprove(senior);
 
         assertThat(senior.getStatus())
                 .isEqualTo(APPROVE);
diff --git a/src/test/java/com/postgraduate/domain/user/domain/service/UserUpdateServiceTest.java b/src/test/java/com/postgraduate/domain/user/domain/service/UserUpdateServiceTest.java
index 1a1950c9..ebb7f96c 100644
--- a/src/test/java/com/postgraduate/domain/user/domain/service/UserUpdateServiceTest.java
+++ b/src/test/java/com/postgraduate/domain/user/domain/service/UserUpdateServiceTest.java
@@ -43,7 +43,7 @@ void delete() {
     @Test
     @DisplayName("SENIOR 변경 테스트")
     void updateRoleWithSenior() {
-        userUpdateService.updateRole(user, SENIOR);
+        userUpdateService.userToSeniorRole(user);
 
         assertThat(user.getRole())
                 .isEqualTo(SENIOR);

From c021b9f2010c6dbe3705d8346a1b4454ceea4ef6 Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Tue, 19 Mar 2024 00:52:05 +0900
Subject: [PATCH 4/7] =?UTF-8?q?RAC-325=20feat=20:=20=EC=98=88=EC=99=B8=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B0=8F=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminssr/application/usecase/AdminMentoringUseCase.java  | 1 -
 .../adminssr/application/usecase/AdminSeniorUseCase.java     | 4 ++--
 .../domain/salary/domain/service/SalaryGetService.java       | 4 ++--
 .../domain/salary/exception/SalaryNotYetException.java       | 5 ++++-
 .../salary/presentation/constant/SalaryResponseCode.java     | 3 ++-
 .../salary/presentation/constant/SalaryResponseMessage.java  | 4 +++-
 .../domain/wish/domain/repository/WishRepository.java        | 2 +-
 .../domain/wish/domain/service/WishGetService.java           | 2 +-
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
index 49e57de6..7edf286f 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java
@@ -26,7 +26,6 @@
 
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToMentoringWithPaymentResponse;
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToUserMentoringInfo;
-import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.CANCEL;
 import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE;
 
 @Service
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
index 96745f69..f1d276ce 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
@@ -6,7 +6,6 @@
 import com.postgraduate.domain.salary.domain.entity.Salary;
 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.senior.exception.SeniorCertificationException;
@@ -22,6 +21,7 @@
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToCertificationInfo;
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToSeniorInfo;
 import static com.postgraduate.domain.salary.util.SalaryUtil.getStatus;
+import static com.postgraduate.domain.senior.domain.entity.constant.Status.APPROVE;
 
 @Service
 @Transactional
@@ -46,7 +46,7 @@ public List<SeniorInfo> allSenior() {
 
     public CertificationDetailsResponse getCertification(Long seniorId) {
         Senior senior = seniorGetService.bySeniorId(seniorId);
-        if (senior.getStatus() == Status.APPROVE)
+        if (senior.getStatus() == APPROVE)
             throw new SeniorCertificationException();
         return mapToCertificationInfo(senior);
     }
diff --git a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
index 82f3dd77..bf2750c3 100644
--- a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
+++ b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
@@ -31,8 +31,8 @@ public Salary bySalaryId(Long salaryId) {
 
     public Salary bySenior(Senior senior) {
         LocalDate salaryDate = SalaryUtil.getSalaryDate();
-        log.info("salaryDate : {}", salaryDate);
-        return salaryRepository.findBySeniorAndSalaryDate(senior, salaryDate).orElseThrow(SalaryNotFoundException::new);
+        return salaryRepository.findBySeniorAndSalaryDate(senior, salaryDate)
+                .orElseThrow(SalaryNotFoundException::new);
     }
 
     public Page<SeniorSalary> findDistinctSeniors(String search, Integer page) {
diff --git a/src/main/java/com/postgraduate/domain/salary/exception/SalaryNotYetException.java b/src/main/java/com/postgraduate/domain/salary/exception/SalaryNotYetException.java
index 51b6e79b..10a54359 100644
--- a/src/main/java/com/postgraduate/domain/salary/exception/SalaryNotYetException.java
+++ b/src/main/java/com/postgraduate/domain/salary/exception/SalaryNotYetException.java
@@ -2,8 +2,11 @@
 
 import com.postgraduate.global.exception.ApplicationException;
 
+import static com.postgraduate.domain.salary.presentation.constant.SalaryResponseCode.SALARY_NOT_NEED;
+import static com.postgraduate.domain.salary.presentation.constant.SalaryResponseMessage.NOT_NEED_SALARY;
+
 public class SalaryNotYetException extends ApplicationException {
     public SalaryNotYetException() {
-        super("정산이 필요하지 않습니다.", "code");
+        super(NOT_NEED_SALARY.getMessage(), SALARY_NOT_NEED.getCode());
     }
 }
diff --git a/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseCode.java b/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseCode.java
index 64b72473..35e446c1 100644
--- a/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseCode.java
+++ b/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseCode.java
@@ -11,6 +11,7 @@ public enum SalaryResponseCode {
     SALARY_CREATE("SLR202"),
     SALARY_DELETE("SLR203"),
 
-    SALARY_NOT_FOUND("EX500");
+    SALARY_NOT_FOUND("EX500"),
+    SALARY_NOT_NEED("EX501");
     private final String code;
 }
diff --git a/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseMessage.java b/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseMessage.java
index 9d906847..d52ae97f 100644
--- a/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseMessage.java
+++ b/src/main/java/com/postgraduate/domain/salary/presentation/constant/SalaryResponseMessage.java
@@ -10,7 +10,9 @@ public enum SalaryResponseMessage {
     GET_SALARY_LIST_INFO("정산 리스트 조회에 성공하였습니다."),
     UPDATE_SALARY_STATUS("정산 상태 수정에 성공하였습니다."),
 
-    NOT_FOUND_SALARY("정산을 찾을 수 없습니다.");
+    NOT_FOUND_SALARY("정산을 찾을 수 없습니다."),
+    NOT_NEED_SALARY("정산이 필요하지 않습니다."),
+    ;
 
     private final String message;
 }
diff --git a/src/main/java/com/postgraduate/domain/wish/domain/repository/WishRepository.java b/src/main/java/com/postgraduate/domain/wish/domain/repository/WishRepository.java
index c09af8bb..978f6de7 100644
--- a/src/main/java/com/postgraduate/domain/wish/domain/repository/WishRepository.java
+++ b/src/main/java/com/postgraduate/domain/wish/domain/repository/WishRepository.java
@@ -8,7 +8,7 @@
 
 public interface WishRepository extends JpaRepository<Wish, Long>, WishDslRepository {
     Optional<Wish> findByUser(User user);
-    Optional<Wish> findByUser_UserId(Long userId);
+    Optional<Wish> findByMatchingReceiveIsTrueAndUser_UserId(Long userId);
 
     Optional<Wish> findByWishIdAndMatchingReceiveIsTrue(Long wishId);
 }
diff --git a/src/main/java/com/postgraduate/domain/wish/domain/service/WishGetService.java b/src/main/java/com/postgraduate/domain/wish/domain/service/WishGetService.java
index f4c1da03..a7f8b0ec 100644
--- a/src/main/java/com/postgraduate/domain/wish/domain/service/WishGetService.java
+++ b/src/main/java/com/postgraduate/domain/wish/domain/service/WishGetService.java
@@ -29,7 +29,7 @@ public Optional<Wish> byUser(User user) {
     }
 
     public Wish byUserId(Long userId) {
-        return wishRepository.findByUser_UserId(userId)
+        return wishRepository.findByMatchingReceiveIsTrueAndUser_UserId(userId)
                 .orElseThrow(WishNotFoundException::new);
     }
 

From 745594fa09a6a56144529771bd6b67221611a14f Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Tue, 19 Mar 2024 01:51:26 +0900
Subject: [PATCH 5/7] =?UTF-8?q?RAC-325=20fix=20:=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=A0=95=EC=82=B0=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/adminssr/application/usecase/AdminSalaryUseCase.java | 2 ++
 .../domain/salary/domain/service/SalaryGetService.java          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
index 005647c1..56b991de 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
@@ -16,6 +16,7 @@
 import java.util.List;
 
 import static com.postgraduate.domain.admin.application.mapper.AdminMapper.mapToSalaryResponse;
+import static com.postgraduate.domain.admin.presentation.constant.SalaryStatus.DONE;
 import static com.postgraduate.domain.admin.presentation.constant.SalaryStatus.YET;
 import static com.postgraduate.domain.salary.util.SalaryUtil.getStatus;
 
@@ -31,6 +32,7 @@ public class AdminSalaryUseCase {
     public List<SalaryInfo> salaryInfos() {
         List<Salary> all = salaryGetService.findAll();
         return all.stream()
+                .filter(salary -> getStatus(salary) == DONE)
                 .map(salary -> {
                     if (salary.getAccountNumber() == null)
                         return mapToSalaryResponse(salary.getSenior(), salary);
diff --git a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
index bf2750c3..dfba9da4 100644
--- a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
+++ b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
@@ -30,7 +30,7 @@ public Salary bySalaryId(Long salaryId) {
     }
 
     public Salary bySenior(Senior senior) {
-        LocalDate salaryDate = SalaryUtil.getSalaryDate();
+        LocalDate salaryDate = SalaryUtil.getSalaryDate().minusDays(7);
         return salaryRepository.findBySeniorAndSalaryDate(senior, salaryDate)
                 .orElseThrow(SalaryNotFoundException::new);
     }

From 503bde60035382cd4a1efa1e92f5e3dfbb7eec4d Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Tue, 19 Mar 2024 01:51:51 +0900
Subject: [PATCH 6/7] =?UTF-8?q?RAC-325=20fix=20:=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=99=98=EB=B6=88=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usecase/AdminPaymentUseCase.java          |  7 ++
 .../AdminWithThymeLeafController.java         | 64 +++++++++----------
 src/main/resources/templates/adminMain.html   | 21 ++++++
 .../resources/templates/adminPayment.html     |  2 +
 4 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
index bb04fa7d..e66ab04c 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java
@@ -3,8 +3,10 @@
 import com.postgraduate.domain.admin.application.dto.PaymentInfo;
 import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
 import com.postgraduate.domain.mentoring.domain.service.MentoringGetService;
+import com.postgraduate.domain.payment.application.usecase.PaymentManageUseCase;
 import com.postgraduate.domain.payment.domain.entity.Payment;
 import com.postgraduate.domain.payment.domain.service.PaymentGetService;
+import com.postgraduate.domain.user.domain.entity.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,7 @@
 public class AdminPaymentUseCase {
     private final PaymentGetService paymentGetService;
     private final MentoringGetService mentoringGetService;
+    private final PaymentManageUseCase paymentManageUseCase;
 
     public List<PaymentInfo> paymentInfos() {
         List<Payment> all = paymentGetService.all();
@@ -31,4 +34,8 @@ public List<PaymentInfo> paymentInfos() {
                 })
                 .toList();
     }
+
+    public void refundPayment(User user, Long paymentId) {
+        paymentManageUseCase.refundPayByAdmin(user, paymentId);
+    }
 }
diff --git a/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java b/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java
index 912fa633..7dc439df 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/presentation/AdminWithThymeLeafController.java
@@ -3,7 +3,6 @@
 import com.postgraduate.domain.admin.application.dto.*;
 import com.postgraduate.domain.admin.application.dto.res.CertificationDetailsResponse;
 import com.postgraduate.domain.admin.application.dto.res.MentoringManageResponse;
-import com.postgraduate.domain.admin.application.dto.res.MentoringWithPaymentResponse;
 import com.postgraduate.domain.admin.application.dto.res.WishResponse;
 import com.postgraduate.domain.adminssr.application.dto.req.Login;
 import com.postgraduate.domain.adminssr.application.usecase.*;
@@ -51,27 +50,6 @@ public String seniorInfo(Model model) {
         return "adminSenior";
     }
 
-    @GetMapping("/userInfo")
-    public String userInfo(Model model) {
-        List<UserInfo> userInfos = adminUserUseCase.userInfos();
-        model.addAttribute("userInfos", userInfos);
-        return "adminUser";
-    }
-
-    @GetMapping("/paymentInfo")
-    public String paymentInfo(Model model) {
-        List<PaymentInfo> paymentInfos = adminPaymentUseCase.paymentInfos();
-        model.addAttribute("paymentInfos", paymentInfos);
-        return "adminPayment";
-    }
-
-    @GetMapping("/salaryInfo")
-    public String salaryInfo(Model model) {
-        List<SalaryInfo> salaryInfos = adminSalaryUseCase.salaryInfos();
-        model.addAttribute("salaryInfo", salaryInfos);
-        return "adminSalary";
-    }
-
     @GetMapping("/certification/{seniorId}")
     public String certification(@PathVariable Long seniorId, Model model) {
         CertificationDetailsResponse certification = adminSeniorUseCase.getCertification(seniorId);
@@ -104,6 +82,13 @@ public String refundMentoring(@AuthenticationPrincipal User user, @PathVariable
         return "adminEmpty";
     }
 
+    @GetMapping("/salaryInfo")
+    public String salaryInfo(Model model) {
+        List<SalaryInfo> salaryInfos = adminSalaryUseCase.salaryInfos();
+        model.addAttribute("salaryInfo", salaryInfos);
+        return "adminSalary";
+    }
+
     @GetMapping("/salary/{seniorId}")
     public String seniorSalaryInfo(@PathVariable Long seniorId, Model model) {
         SalaryInfo salaryInfo = adminSalaryUseCase.seniorSalary(seniorId);
@@ -117,6 +102,12 @@ public String salaryDone(@PathVariable Long salaryId) {
         return "adminEmpty";
     }
 
+    @PostMapping("/wish/done/{wishId}")
+    public String wishDone(@PathVariable Long wishId) {
+        adminUserUseCase.wishDone(wishId);
+        return "adminEmpty";
+    }
+
     @GetMapping("/user/matching/{userId}")
     public String userMatching(@PathVariable Long userId, Model model) {
         WishResponse wishResponse = adminUserUseCase.wishInfo(userId);
@@ -124,12 +115,6 @@ public String userMatching(@PathVariable Long userId, Model model) {
         return "userWish";
     }
 
-    @PostMapping("/wish/done/{wishId}")
-    public String wishDone(@PathVariable Long wishId) {
-        adminUserUseCase.wishDone(wishId);
-        return "adminEmpty";
-    }
-
     @GetMapping("/user/mentoring/{userId}")
     public String userMentoring(@PathVariable Long userId, Model model) {
         MentoringManageResponse mentoringInfos = adminMentoringUseCase.userMentoringInfos(userId);
@@ -137,10 +122,23 @@ public String userMentoring(@PathVariable Long userId, Model model) {
         return "userMentoring";
     }
 
-    @GetMapping("/payment/mentoring/{paymentId}")
-    public String paymentMentoring(@PathVariable Long paymentId, Model model) {
-        MentoringWithPaymentResponse mentoringInfo = adminMentoringUseCase.paymentMentoringInfo(paymentId);
-        model.addAttribute("mentoringInfo", mentoringInfo);
-        return "paymentMentoring";
+    @GetMapping("/userInfo")
+    public String userInfo(Model model) {
+        List<UserInfo> userInfos = adminUserUseCase.userInfos();
+        model.addAttribute("userInfos", userInfos);
+        return "adminUser";
+    }
+
+    @GetMapping("/paymentInfo")
+    public String paymentInfo(Model model) {
+        List<PaymentInfo> paymentInfos = adminPaymentUseCase.paymentInfos();
+        model.addAttribute("paymentInfos", paymentInfos);
+        return "adminPayment";
+    }
+
+    @PostMapping("/payment/refund/{paymentId}")
+    public String refundPayment(@AuthenticationPrincipal User user, @PathVariable Long paymentId) {
+        adminPaymentUseCase.refundPayment(user, paymentId);
+        return "adminEmpty";
     }
 }
diff --git a/src/main/resources/templates/adminMain.html b/src/main/resources/templates/adminMain.html
index 8d84756e..31f7b94c 100644
--- a/src/main/resources/templates/adminMain.html
+++ b/src/main/resources/templates/adminMain.html
@@ -286,6 +286,27 @@
         };
         xhr.send();
     }
+
+    function refundPayment(paymentId) {
+        if (confirm("정말 환불하겠습니까??") == true){    //확인
+            var xhr = new XMLHttpRequest();
+            xhr.open("POST", "/adminServer/payment/refund/" + paymentId, true);
+            xhr.setRequestHeader("Authorization", "Bearer " + accessToken);
+            xhr.onreadystatechange = function() {
+                if (xhr.readyState === XMLHttpRequest.DONE) {
+                    if (xhr.status === 200) {
+                        document.getElementById("output").innerHTML = xhr.responseText;
+                    } else {
+                        localStorage.removeItem("accessToken");
+                        localStorage.removeItem("refreshToken");
+                    }
+                }
+            };
+            xhr.send();
+        }else{   //취소
+            return false;
+        }
+    }
 </script>
 
 
diff --git a/src/main/resources/templates/adminPayment.html b/src/main/resources/templates/adminPayment.html
index 6d96a756..ab554f2b 100644
--- a/src/main/resources/templates/adminPayment.html
+++ b/src/main/resources/templates/adminPayment.html
@@ -26,6 +26,7 @@
         <th>전화번호</th>
         <th>결제일시</th>
         <th>멘토링정보</th>
+        <th>환불/취소</th>
         <th>결제상태</th>
     </tr>
     </thead>
@@ -36,6 +37,7 @@
         <td th:text="${paymentInfo.phoneNumber()}">phoneNumber</td>
         <td th:text="${paymentInfo.createdAt()}">createdAt</td>
         <td><button th:paymentId="${paymentInfo.paymentId()}" th:onclick="getPaymentMentoring(this.getAttribute('paymentId'))">멘토링정보보기</button></td>
+        <td><button th:paymentId="${paymentInfo.paymentId()}" th:onclick="refundPayment(this.getAttribute('paymentId'))">환불/취소</button></td>
         <td th:text="${paymentInfo.status()}">status</td>
     </tr>
     </tbody>

From 69fecd2cbe76c401dc0f8ef9c69a6e10a7751b2b Mon Sep 17 00:00:00 2001
From: yang <ywj9811@gmail.com>
Date: Tue, 19 Mar 2024 02:29:53 +0900
Subject: [PATCH 7/7] =?UTF-8?q?RAC-325=20fix=20:=20=EC=A0=95=EC=82=B0=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminssr/application/usecase/AdminSalaryUseCase.java    | 2 +-
 .../adminssr/application/usecase/AdminSeniorUseCase.java    | 2 +-
 .../domain/salary/domain/service/SalaryGetService.java      | 6 ++++++
 .../domain/senior/presentation/SeniorControllerTest.java    | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
index 56b991de..e386a9d1 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java
@@ -44,7 +44,7 @@ public List<SalaryInfo> salaryInfos() {
 
     public SalaryInfo seniorSalary(Long seniorId) {
         Senior senior = seniorGetService.bySeniorId(seniorId);
-        Salary salary = salaryGetService.bySenior(senior);
+        Salary salary = salaryGetService.bySeniorLastWeek(senior);
         SalaryStatus status = getStatus(salary);
         if (status != YET)
             throw new SalaryNotYetException();
diff --git a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
index f1d276ce..d2fe6c0b 100644
--- a/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
+++ b/src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java
@@ -36,7 +36,7 @@ public List<SeniorInfo> allSenior() {
         List<Senior> seniors = seniorGetService.allSeniorId();
         return seniors.stream()
                 .map(senior -> {
-                    Salary salary = salaryGetService.bySenior(senior);
+                    Salary salary = salaryGetService.bySeniorLastWeek(senior);
                     SalaryStatus salaryStatus = getStatus(salary);
                     Optional<Wish> wish = wishGetService.byUser(senior.getUser());
                     return mapToSeniorInfo(senior, salaryStatus, wish.isPresent());
diff --git a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
index dfba9da4..1958dd83 100644
--- a/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
+++ b/src/main/java/com/postgraduate/domain/salary/domain/service/SalaryGetService.java
@@ -30,6 +30,12 @@ public Salary bySalaryId(Long salaryId) {
     }
 
     public Salary bySenior(Senior senior) {
+        LocalDate salaryDate = SalaryUtil.getSalaryDate();
+        return salaryRepository.findBySeniorAndSalaryDate(senior, salaryDate)
+                .orElseThrow(SalaryNotFoundException::new);
+    }
+
+    public Salary bySeniorLastWeek(Senior senior) {
         LocalDate salaryDate = SalaryUtil.getSalaryDate().minusDays(7);
         return salaryRepository.findBySeniorAndSalaryDate(senior, salaryDate)
                 .orElseThrow(SalaryNotFoundException::new);
diff --git a/src/test/java/com/postgraduate/domain/senior/presentation/SeniorControllerTest.java b/src/test/java/com/postgraduate/domain/senior/presentation/SeniorControllerTest.java
index 405d88f0..c074fcac 100644
--- a/src/test/java/com/postgraduate/domain/senior/presentation/SeniorControllerTest.java
+++ b/src/test/java/com/postgraduate/domain/senior/presentation/SeniorControllerTest.java
@@ -9,6 +9,7 @@
 import com.postgraduate.domain.available.domain.repository.AvailableRepository;
 import com.postgraduate.domain.salary.domain.entity.Salary;
 import com.postgraduate.domain.salary.domain.repository.SalaryRepository;
+import com.postgraduate.domain.salary.util.SalaryUtil;
 import com.postgraduate.domain.senior.application.dto.req.*;
 import com.postgraduate.domain.senior.domain.entity.Info;
 import com.postgraduate.domain.senior.domain.entity.Profile;
@@ -31,12 +32,14 @@
 import org.junit.jupiter.params.provider.EmptySource;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.mockito.BDDMockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 
 import java.io.IOException;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,6 +50,7 @@
 import static java.lang.Boolean.TRUE;
 import static java.time.LocalDateTime.now;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doNothing;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;