Merge pull request #329 from WE-ARE-RACCOONS/RAC-478

RAC-478 feat : 관리자 페이지 API

src/main/java/com/postgraduate/admin/application/dto/res/WishResponse.java → src/main/java/com/postgraduate/admin/application/dto/res/MatchingWishResponse.java

@@ -1,15 +1,16 @@
 package com.postgraduate.admin.application.dto.res;
 
+
 import java.time.LocalDateTime;
 
-public record WishResponse(
+public record MatchingWishResponse(
         Long wishId,
-        String nickName,
+        String field,
+        String postgradu,
+        String professor,
+        String lab,
         String phoneNumber,
         LocalDateTime createAt,
-        Boolean marketingReceive,
-        Boolean matchingReceive,
-        String major,
-        String field
+        LocalDateTime updatedAt
 ) {
 }

src/main/java/com/postgraduate/admin/application/dto/res/MatchingWishResponses.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record MatchingWishResponses(List<MatchingWishResponse> wishResponses) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/MentoringManageResponse.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 public record MentoringManageResponse(
-        List<MentoringInfo> mentoringInfo,
-        UserMentoringInfo userMentoringInfo
+        UserInfoBasic userInfoBasic,
+        List<MentoringInfo> mentoringInfo
 ) {
 }

src/main/java/com/postgraduate/admin/application/dto/res/PaymentInfos.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record PaymentInfos(List<PaymentInfo> paymentInfos) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfo.java

@@ -3,7 +3,6 @@
 import java.time.LocalDateTime;
 
 public record SalaryInfo(
-        Long salaryId,
         String nickName,
         String phoneNumber,
         Integer totalAmount,
@@ -12,7 +11,7 @@ public record SalaryInfo(
         String accountNumber,
         LocalDateTime salaryDoneDate
 ) {
-    public SalaryInfo(Long salaryId, String nickName, String phoneNumber, int totalAmount, LocalDateTime salaryDoneDate) {
-        this(salaryId, nickName, phoneNumber, totalAmount, null, null, null, salaryDoneDate);
+    public SalaryInfo(String nickName, String phoneNumber, int totalAmount, LocalDateTime salaryDoneDate) {
+        this(nickName, phoneNumber, totalAmount, null, null, null, salaryDoneDate);
     }
 }

src/main/java/com/postgraduate/admin/application/dto/res/SalaryInfos.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record SalaryInfos(List<SalaryInfo> salaryInfos) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/SeniorInfos.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record SeniorInfos(List<SeniorInfo> seniorInfos) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/UnsettledSalaryInfos.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record UnsettledSalaryInfos(List<UnSettledSalaryInfo> unSettledSalaryInfos) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/UserInfo.java

@@ -1,17 +1,12 @@
 package com.postgraduate.admin.application.dto.res;
 
-import com.postgraduate.domain.member.user.domain.entity.constant.Status;
-
 import java.time.LocalDateTime;
 
 public record UserInfo(
         Long userId,
         String nickName,
         String phoneNumber,
         LocalDateTime createdAt,
-        Boolean marketingReceive,
-        Boolean matchingReceive,
-        Long wishId,
-        Status matchingStatus,
+        Boolean marketinRgeceive,
         Boolean isSenior
 ) { }

src/main/java/com/postgraduate/admin/application/dto/res/UserMentoringInfo.java → src/main/java/com/postgraduate/admin/application/dto/res/UserInfoBasic.java

@@ -1,6 +1,6 @@
 package com.postgraduate.admin.application.dto.res;
 
-public record UserMentoringInfo(
+public record UserInfoBasic(
         String nickName,
         String phoneNumber
 ) { }

src/main/java/com/postgraduate/admin/application/dto/res/UserInfos.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record UserInfos(List<UserInfo> userInfos) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/WaitingWishResponse.java

@@ -0,0 +1,14 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.time.LocalDateTime;
+
+public record WaitingWishResponse(
+        Long wishId,
+        String field,
+        String postgradu,
+        String professor,
+        String lab,
+        String phoneNumber,
+        LocalDateTime createAt
+) {
+}

src/main/java/com/postgraduate/admin/application/dto/res/WaitingWishResponses.java

@@ -0,0 +1,6 @@
+package com.postgraduate.admin.application.dto.res;
+
+import java.util.List;
+
+public record WaitingWishResponses(List<WaitingWishResponse> wishResponses) {
+}

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

@@ -1,7 +1,7 @@
 package com.postgraduate.admin.application.mapper;
 
 import com.postgraduate.admin.application.dto.res.*;
-import com.postgraduate.domain.member.user.domain.entity.constant.Status;
+import com.postgraduate.domain.member.user.domain.entity.MemberRole;
 import com.postgraduate.domain.mentoring.domain.entity.Mentoring;
 import com.postgraduate.domain.payment.domain.entity.Payment;
 import com.postgraduate.domain.salary.domain.entity.Salary;
@@ -10,6 +10,7 @@
 import com.postgraduate.domain.member.senior.domain.entity.Senior;
 import com.postgraduate.domain.member.user.application.utils.UserUtils;
 import com.postgraduate.domain.member.user.domain.entity.User;
+import com.postgraduate.domain.wish.domain.entity.Wish;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,20 +42,18 @@ public CertificationDetailsResponse mapToCertificationInfo(Senior senior) {
         );
     }
 
-    public UserInfo mapToUserInfo(User user) {
+    public UserInfo mapToUserInfo(MemberRole memberRole) {
+        User user = memberRole.getUser();
         return new UserInfo(
                 user.getUserId(),
                 user.getNickName(),
                 user.getPhoneNumber(),
                 user.getCreatedAt(),
                 user.getMarketingReceive(),
-                false,
-                1L, // todo : wish 삭제에 따른 변경 필요
-                Status.MATCHED,
-                false
+                user.isSenior()
         );
     }
-    
+
 
     public SeniorInfo mapToSeniorInfo(Salary salary) {
         Senior senior = salary.getSenior();
@@ -66,7 +65,7 @@ public SeniorInfo mapToSeniorInfo(Salary salary) {
                 senior.getStatus(),
                 salary.getTotalAmount(),
                 user.getMarketingReceive(),
-                false //todo : wish 삭제에 따른 선배에서 후배 판단 조건 삭제 or 수정 필요
+                user.isJunior()
         );
     }
 
@@ -99,16 +98,16 @@ private MentoringInfo getMentoringInfo(Mentoring mentoring, User user) {
     }
 
 
-    public UserMentoringInfo mapToUserMentoringInfo(User user) {
-        return new UserMentoringInfo(
+    public UserInfoBasic mapToUserMentoringInfo(User user) {
+        return new UserInfoBasic(
                 user.getNickName(),
                 user.getPhoneNumber()
         );
     }
 
-    public UserMentoringInfo mapToUserMentoringInfo(Senior senior) {
+    public UserInfoBasic mapToUserMentoringInfo(Senior senior) {
         User user = senior.getUser();
-        return new UserMentoringInfo(
+        return new UserInfoBasic(
                 user.getNickName(),
                 user.getPhoneNumber()
         );
@@ -140,10 +139,10 @@ public PaymentInfo mapToPaymentInfo(Payment payment) {
         return getPaymentInfo(payment, null, user);
     }
 
-    public SalaryInfoWithOutId mapToSalaryResponse(Senior senior, String accountNumber, Salary salary) {
+    public SalaryInfo mapToSalaryResponse(Senior senior, String accountNumber, Salary salary) {
         User user = senior.getUser();
         SalaryAccount account = salary.getAccount();
-        return new SalaryInfoWithOutId(
+        return new SalaryInfo(
                 user.getNickName(),
                 user.getPhoneNumber(),
                 salary.getTotalAmount(),
@@ -154,19 +153,9 @@ public SalaryInfoWithOutId mapToSalaryResponse(Senior senior, String accountNumb
         );
     }
 
-    public SalaryInfoWithOutId mapToSalaryResponse(Senior senior, Salary salary) {
-        User user = senior.getUser();
-        return new SalaryInfoWithOutId (
-                user.getNickName(),
-                user.getPhoneNumber(),
-                salary.getTotalAmount(),
-                salary.getSalaryDoneDate()
-        );
-    }
-
-    public SalaryInfoWithOutId mapToSalaryResponse(Salary salary) {
+    public SalaryInfo mapToSalaryResponse(Salary salary) {
         User user = userUtils.getArchiveUser();
-        return new SalaryInfoWithOutId (
+        return new SalaryInfo(
                 user.getNickName(),
                 user.getPhoneNumber(),
                 salary.getTotalAmount(),
@@ -239,4 +228,29 @@ private static MentoringWithPaymentResponse getMentoringWithPaymentResponse(Ment
                 SHORT.getCharge()
         );
     }
+
+    public WaitingWishResponse mapToWaitingWish(Wish wish) {
+        return new WaitingWishResponse(
+                wish.getWishId(),
+                wish.getField(),
+                wish.getPostgradu(),
+                wish.getProfessor(),
+                wish.getLab(),
+                wish.getPhoneNumber(),
+                wish.getCreatedAt()
+        );
+    }
+
+    public MatchingWishResponse mapToMatchedWish(Wish wish) {
+        return new MatchingWishResponse(
+                wish.getWishId(),
+                wish.getField(),
+                wish.getPostgradu(),
+                wish.getProfessor(),
+                wish.getLab(),
+                wish.getPhoneNumber(),
+                wish.getCreatedAt(),
+                wish.getUpdatedAt()
+        );
+    }
 }

src/main/java/com/postgraduate/admin/application/usecase/AdminMentoringUseCase.java

@@ -1,7 +1,7 @@
 package com.postgraduate.admin.application.usecase;
 
 import com.postgraduate.admin.application.dto.res.MentoringManageResponse;
-import com.postgraduate.admin.application.dto.res.UserMentoringInfo;
+import com.postgraduate.admin.application.dto.res.UserInfoBasic;
 import com.postgraduate.admin.application.dto.res.MentoringInfo;
 import com.postgraduate.admin.application.mapper.AdminMapper;
 import com.postgraduate.admin.domain.service.*;
@@ -36,8 +36,8 @@ public MentoringManageResponse seniorMentorings(Long seniorId) {
         List<MentoringInfo> mentoringInfos = mentorings.stream()
                 .map(adminMapper::mapToMentoringInfoWithSenior)
                 .toList();
-        UserMentoringInfo seniorInfo = adminMapper.mapToUserMentoringInfo(senior);
-        return new MentoringManageResponse(mentoringInfos, seniorInfo);
+        UserInfoBasic seniorInfo = adminMapper.mapToUserMentoringInfo(senior);
+        return new MentoringManageResponse(seniorInfo, mentoringInfos);
     }
 
     @Transactional(readOnly = true)
@@ -47,8 +47,8 @@ public MentoringManageResponse userMentoringInfos(Long userId) {
         List<MentoringInfo> mentoringInfos = mentorings.stream()
                 .map(adminMapper::mapToMentoringInfoWithUser)
                 .toList();
-        UserMentoringInfo userInfo = adminMapper.mapToUserMentoringInfo(user);
-        return new MentoringManageResponse(mentoringInfos, userInfo);
+        UserInfoBasic userInfo = adminMapper.mapToUserMentoringInfo(user);
+        return new MentoringManageResponse(userInfo, mentoringInfos);
     }
 
     public void refundMentoring(User user, Long mentoringId) {

src/main/java/com/postgraduate/admin/application/usecase/AdminPaymentUseCase.java

@@ -1,7 +1,7 @@
 package com.postgraduate.admin.application.usecase;
 
 import com.postgraduate.admin.application.dto.res.MentoringWithPaymentResponse;
-import com.postgraduate.admin.application.dto.res.PaymentInfo;
+import com.postgraduate.admin.application.dto.res.PaymentInfos;
 import com.postgraduate.admin.application.dto.res.PaymentWithMentoringQuery;
 import com.postgraduate.admin.application.mapper.AdminMapper;
 import com.postgraduate.admin.domain.service.AdminMentoringService;
@@ -11,11 +11,10 @@
 import com.postgraduate.domain.payment.application.usecase.PaymentManageUseCase;
 import com.postgraduate.domain.member.user.domain.entity.User;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 import static com.postgraduate.domain.mentoring.domain.entity.constant.MentoringStatus.DONE;
 
 @Service
@@ -29,15 +28,15 @@ public class AdminPaymentUseCase {
     private final AdminMapper adminMapper;
 
     @Transactional(readOnly = true)
-    public List<PaymentInfo> paymentInfos() {
-        List<PaymentWithMentoringQuery> all = adminPaymentService.allPayments();
-        return all.stream()
+    public PaymentInfos paymentInfos(Integer page) {
+        Page<PaymentWithMentoringQuery> all = adminPaymentService.allPayments(page);
+        return new PaymentInfos(all.stream()
                 .map(pm -> {
                     if (pm.mentoring().isEmpty())
                         return adminMapper.mapToPaymentInfo(pm.payment());
                     return adminMapper.mapToPaymentInfo(pm.payment(), pm.mentoring().get());
                 })
-                .toList();
+                .toList());
     }
 
     @Transactional(readOnly = true)