Merge pull request #279 from WE-ARE-RACCOONS/RAC-393

RAC-393 fix : 관리자 페이지 수수료 수정

src/main/java/com/postgraduate/domain/adminssr/application/dto/req/Login.java → 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) {
 }

src/main/java/com/postgraduate/domain/adminssr/application/dto/req/SendMessageRequest.java → 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) {
 }

src/main/java/com/postgraduate/domain/admin/application/dto/res/CertificationDetailsResponse.java → 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;
 

src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringInfo.java → 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;
 

src/main/java/com/postgraduate/domain/adminssr/application/dto/res/MentoringManageResponse.java → 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;
 

src/main/java/com/postgraduate/domain/admin/application/dto/res/MentoringWithPaymentResponse.java → 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,

src/main/java/com/postgraduate/domain/admin/application/dto/PaymentInfo.java → 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;
 

src/main/java/com/postgraduate/domain/admin/application/dto/res/SalaryDetailsResponse.java → 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,

src/main/java/com/postgraduate/domain/admin/application/dto/SalaryInfo.java → 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;
 

src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SalaryInfoWithOutId.java → 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;
 

src/main/java/com/postgraduate/domain/adminssr/application/dto/res/SeniorInfo.java → 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;
 

src/main/java/com/postgraduate/domain/adminssr/application/dto/res/UnSettledSalaryInfo.java → 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;
 

src/main/java/com/postgraduate/domain/admin/application/dto/UserInfo.java → 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;
 

src/main/java/com/postgraduate/domain/admin/application/dto/UserMentoringInfo.java → 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,

src/main/java/com/postgraduate/domain/admin/application/dto/res/WishResponse.java → 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;
 

src/main/java/com/postgraduate/domain/admin/application/mapper/AdminMapper.java → src/main/java/com/postgraduate/admin/application/mapper/AdminMapper.java

@@ -1,11 +1,6 @@
-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.mentoring.domain.entity.Mentoring;
 import com.postgraduate.domain.payment.domain.entity.Payment;
 import com.postgraduate.domain.salary.domain.entity.Salary;
@@ -14,9 +9,10 @@
 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;
 
+import static com.postgraduate.domain.mentoring.domain.entity.constant.TermUnit.SHORT;
+
 public class AdminMapper {
     private AdminMapper() {
         throw new IllegalStateException();
@@ -56,38 +52,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 +145,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,40 +159,41 @@ 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(),
                 salary.getSalaryDoneDate()
         );
     }
 
-    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()
         );
     }
 
@@ -212,7 +211,7 @@ public static MentoringWithPaymentResponse mapToMentoringWithPaymentResponse(Men
                 mentoring.getDate(),
                 mentoring.getTerm(),
                 payment.getPay(),
-                4000
+                SHORT.getCharge()
         );
     }
 

src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminAuthUseCase.java → 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;

src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminMentoringUseCase.java → 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<Mentoring> mentorings = mentoringGetService.bySeniorId(seniorId);
         List<MentoringInfo> 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<Mentoring> mentorings = mentoringGetService.byUserId(userId);
         List<MentoringInfo> mentoringInfos = mentorings.stream()
-                .map(AdminSsrMapper::mapToMentoringInfoWithUser)
+                .map(AdminMapper::mapToMentoringInfoWithUser)
                 .toList();
         UserMentoringInfo userInfo = mapToUserMentoringInfo(user);
         return new MentoringManageResponse(mentoringInfos, userInfo);

src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminPaymentUseCase.java → src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java

@@ -1,6 +1,7 @@
-package com.postgraduate.domain.adminssr.application.usecase;
+package com.postgraduate.admin.application.usecase;
 
-import com.postgraduate.domain.adminssr.application.dto.res.*;
+import com.postgraduate.admin.application.dto.res.MentoringWithPaymentResponse;
+import com.postgraduate.admin.application.dto.res.PaymentInfo;
 import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
 import com.postgraduate.domain.mentoring.domain.service.MentoringGetService;
 import com.postgraduate.domain.mentoring.domain.service.MentoringUpdateService;
@@ -18,8 +19,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

src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSalaryUseCase.java → 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

src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminSeniorUseCase.java → 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

src/main/java/com/postgraduate/domain/adminssr/application/usecase/AdminUserUseCase.java → src/main/java/com/postgraduate/admin/application/usecase/AdminUserUseCase.java

@@ -1,8 +1,9 @@
-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.domain.adminssr.application.dto.res.*;
-import com.postgraduate.domain.adminssr.application.mapper.AdminSsrMapper;
+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.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 +15,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 +29,7 @@ public class AdminUserUseCase {
     public List<UserInfo> userInfos() {
         List<Wish> all = wishGetService.all();
         return all.stream()
-                .map(AdminSsrMapper::mapToUserInfo)
+                .map(AdminMapper::mapToUserInfo)
                 .toList();
     }