Merge pull request #40 from WE-ARE-RACCOONS/RAC-146

RAC-146 refactor : 변경된 요구사항 적용
WE-ARE-RACCOONS · Nov 12, 2023 · ff5a776 · ff5a776
2 parents 25b6809 + 5ddf418
commit ff5a776
Show file tree

Hide file tree

Showing 23 changed files with 218 additions and 55 deletions.
diff --git a/src/main/java/com/postgraduate/domain/auth/application/dto/req/SignUpRequest.java b/src/main/java/com/postgraduate/domain/auth/application/dto/req/SignUpRequest.java
@@ -12,5 +12,7 @@ public class SignUpRequest {
     @NotNull
     private Long socialId;
     @NotNull
+    private String phoneNumber;
+    @NotNull
     private String nickName;
 }
diff --git a/src/main/java/com/postgraduate/domain/auth/application/dto/res/AuthUserResponse.java b/src/main/java/com/postgraduate/domain/auth/application/dto/res/AuthUserResponse.java
@@ -4,13 +4,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 import java.util.Optional;
 
 @Builder
 @Getter
-@NoArgsConstructor
 @AllArgsConstructor
 public class AuthUserResponse {
     private Optional<User> user;

diff --git a/src/main/java/com/postgraduate/domain/mentoring/application/dto/DoneMentoringInfo.java b/src/main/java/com/postgraduate/domain/mentoring/application/dto/DoneMentoringInfo.java
@@ -0,0 +1,21 @@
+package com.postgraduate.domain.mentoring.application.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class DoneMentoringInfo {
+    Long mentoringId;
+    Long seniorId;
+    String nickName;
+    String postgradu;
+    String field;
+    String professor;
+    String date;
+    int term;
+}
diff --git a/...application/dto/AppliedMentoringInfo.java → ...pplication/dto/ExpectedMentoringInfo.java b/...application/dto/AppliedMentoringInfo.java → ...pplication/dto/ExpectedMentoringInfo.java
@@ -1,5 +1,6 @@
 package com.postgraduate.domain.mentoring.application.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -8,14 +9,14 @@
 @Getter
 @Builder
 @AllArgsConstructor
-public class AppliedMentoringInfo {
+public class ExpectedMentoringInfo {
     Long mentoringId;
     Long seniorId;
     String nickName;
     String postgradu;
     String field;
     String professor;
-    String[] dates;
+    String date;
     int term;
     String chatLink;
 }
diff --git a/src/main/java/com/postgraduate/domain/mentoring/application/dto/WaitingMentoringInfo.java b/src/main/java/com/postgraduate/domain/mentoring/application/dto/WaitingMentoringInfo.java
@@ -0,0 +1,19 @@
+package com.postgraduate.domain.mentoring.application.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class WaitingMentoringInfo {
+    Long mentoringId;
+    Long seniorId;
+    String nickName;
+    String postgradu;
+    String field;
+    String major;
+    int term;
+}
diff --git a/.../java/com/postgraduate/domain/mentoring/application/dto/res/AppliedMentoringResponse.java b/.../java/com/postgraduate/domain/mentoring/application/dto/res/AppliedMentoringResponse.java
@@ -1,6 +1,5 @@
 package com.postgraduate.domain.mentoring.application.dto.res;
 
-import com.postgraduate.domain.mentoring.application.dto.AppliedMentoringInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -11,5 +10,5 @@
 @Builder
 @AllArgsConstructor
 public class AppliedMentoringResponse {
-    List<AppliedMentoringInfo> appliedMentoringInfos;
+    List<?> appliedMentoringInfos;
 }
diff --git a/src/main/java/com/postgraduate/domain/mentoring/application/mapper/MentoringMapper.java b/src/main/java/com/postgraduate/domain/mentoring/application/mapper/MentoringMapper.java
@@ -1,6 +1,8 @@
 package com.postgraduate.domain.mentoring.application.mapper;
 
-import com.postgraduate.domain.mentoring.application.dto.AppliedMentoringInfo;
+import com.postgraduate.domain.mentoring.application.dto.DoneMentoringInfo;
+import com.postgraduate.domain.mentoring.application.dto.ExpectedMentoringInfo;
+import com.postgraduate.domain.mentoring.application.dto.WaitingMentoringInfo;
 import com.postgraduate.domain.mentoring.application.dto.req.MentoringApplyRequest;
 import com.postgraduate.domain.mentoring.application.dto.res.AppliedMentoringDetailResponse;
 import com.postgraduate.domain.mentoring.application.dto.res.SeniorMentoringDetailResponse;
@@ -13,32 +15,45 @@
 import java.util.stream.Stream;
 
 public class MentoringMapper {
-    public static AppliedMentoringInfo mapToExpectedAppliedInfo(Mentoring mentoring) {
+    public static ExpectedMentoringInfo mapToExpectedInfo(Mentoring mentoring) {
         Senior senior = mentoring.getSenior();
-        String[] dates = mentoring.getDate().split(",");
-        return AppliedMentoringInfo.builder()
+        return ExpectedMentoringInfo.builder()
                 .mentoringId(mentoring.getMentoringId())
-                .dates(dates)
                 .seniorId(senior.getSeniorId())
                 .nickName(senior.getUser().getNickName())
                 .postgradu(senior.getInfo().getPostgradu())
                 .professor(senior.getInfo().getProfessor())
                 .field(senior.getInfo().getField())
+                .term(senior.getProfile().getTerm())
+                .date(mentoring.getDate())
                 .chatLink(senior.getProfile().getChatLink())
                 .build();
     }
-    public static AppliedMentoringInfo mapToWaitingOrDoneAppliedInfo(Mentoring mentoring) {
+
+    public static DoneMentoringInfo mapToDoneInfo(Mentoring mentoring) {
         Senior senior = mentoring.getSenior();
-        String[] dates = mentoring.getDate().split(",");
-        return AppliedMentoringInfo.builder()
+        return DoneMentoringInfo.builder()
                 .mentoringId(mentoring.getMentoringId())
-                .dates(dates)
-                .term(senior.getProfile().getTerm())
                 .seniorId(senior.getSeniorId())
                 .nickName(senior.getUser().getNickName())
                 .postgradu(senior.getInfo().getPostgradu())
                 .professor(senior.getInfo().getProfessor())
                 .field(senior.getInfo().getField())
+                .term(senior.getProfile().getTerm())
+                .date(mentoring.getDate())
+                .build();
+    }
+
+    public static WaitingMentoringInfo mapToWaitingInfo(Mentoring mentoring) {
+        Senior senior = mentoring.getSenior();
+        return WaitingMentoringInfo.builder()
+                .mentoringId(mentoring.getMentoringId())
+                .term(senior.getProfile().getTerm())
+                .seniorId(senior.getSeniorId())
+                .nickName(senior.getUser().getNickName())
+                .postgradu(senior.getInfo().getPostgradu())
+                .major(senior.getInfo().getMajor())
+                .field(senior.getInfo().getField())
                 .build();
     }
     public static AppliedMentoringDetailResponse mapToAppliedDetailInfo(Mentoring mentoring) {

diff --git a/...main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringInfoUseCase.java b/...main/java/com/postgraduate/domain/mentoring/application/usecase/MentoringInfoUseCase.java
@@ -1,6 +1,8 @@
 package com.postgraduate.domain.mentoring.application.usecase;
 
-import com.postgraduate.domain.mentoring.application.dto.AppliedMentoringInfo;
+import com.postgraduate.domain.mentoring.application.dto.DoneMentoringInfo;
+import com.postgraduate.domain.mentoring.application.dto.ExpectedMentoringInfo;
+import com.postgraduate.domain.mentoring.application.dto.WaitingMentoringInfo;
 import com.postgraduate.domain.mentoring.application.dto.res.AppliedMentoringDetailResponse;
 import com.postgraduate.domain.mentoring.application.dto.res.AppliedMentoringResponse;
 import com.postgraduate.domain.mentoring.application.dto.res.SeniorMentoringDetailResponse;
@@ -22,8 +24,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.DONE;
-import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.WAITING;
+import static com.postgraduate.domain.mentoring.domain.entity.constant.Status.*;
 
 @Service
 @Transactional
@@ -33,9 +34,21 @@ public class MentoringInfoUseCase {
     private final CheckIsMyMentoringUseCase checkIsMyMentoringUseCase;
     private final SeniorGetService seniorGetService;
 
-    public AppliedMentoringResponse getMentorings(Status status, User user) {
-        List<Mentoring> mentorings = mentoringGetService.mentoringByUser(user, status);
-        return getCategories(status, mentorings);
+
+    public AppliedMentoringDetailResponse getMentoringDetail(User user, Long mentoringId) {
+        Mentoring mentoring = checkIsMyMentoringUseCase.byUser(user, mentoringId);
+        if (mentoring.getStatus() != WAITING) {
+            throw new MentoringNotWaitingException();
+        }
+        return MentoringMapper.mapToAppliedDetailInfo(mentoring);
+    }
+
+    public SeniorMentoringDetailResponse getSeniorMentoringDetail(User user, Long mentoringId) {
+        Mentoring mentoring = checkIsMyMentoringUseCase.bySenior(user, mentoringId);
+        if (mentoring.getStatus() == DONE) {
+            throw new MentoringDoneException();
+        }
+        return MentoringMapper.mapToSeniorMentoringDetail(mentoring);
     }
 
     public List<SeniorMentoringResponse> getSeniorMentorings(Status status, User user) {
@@ -45,39 +58,42 @@ public List<SeniorMentoringResponse> getSeniorMentorings(Status status, User use
         return mentorings.stream().map(MentoringMapper::mapToSeniorMentoring).collect(Collectors.toList());
     }
 
-    private AppliedMentoringResponse getCategories(Status status, List<Mentoring> mentorings) {
-        List<AppliedMentoringInfo> appliedMentoringInfos = new ArrayList<>();
+    public AppliedMentoringResponse getMentorings(Status status, User user) {
+        List<Mentoring> mentorings = mentoringGetService.mentoringByUser(user, status);
+        return getCategories(status, mentorings);
+    }
 
-        switch (status) {
-            case WAITING, DONE -> {
-                for (Mentoring mentoring : mentorings) {
-                    appliedMentoringInfos.add(MentoringMapper.mapToWaitingOrDoneAppliedInfo(mentoring));
-                }
-                return new AppliedMentoringResponse(appliedMentoringInfos);
-            }
+    private AppliedMentoringResponse getCategories(Status status, List<Mentoring> mentorings) {
+        if (status == WAITING) {
+            return getWaiting(mentorings);
+        }
+        if (status == EXPECTED) {
+            return getExpected(mentorings);
+        }
+        return getDone(mentorings);
+    }
 
-            default -> {
-                for (Mentoring mentoring : mentorings) {
-                    appliedMentoringInfos.add(MentoringMapper.mapToExpectedAppliedInfo(mentoring));
-                }
-                return new AppliedMentoringResponse(appliedMentoringInfos);
-            }
+    private AppliedMentoringResponse getWaiting(List<Mentoring> mentorings) {
+        List<WaitingMentoringInfo> waitingMentoringInfos = new ArrayList<>();
+        for (Mentoring mentoring : mentorings) {
+            waitingMentoringInfos.add(MentoringMapper.mapToWaitingInfo(mentoring));
         }
+        return new AppliedMentoringResponse(waitingMentoringInfos);
     }
 
-    public AppliedMentoringDetailResponse getMentoringDetail(User user, Long mentoringId) {
-        Mentoring mentoring = checkIsMyMentoringUseCase.byUser(user, mentoringId);
-        if (mentoring.getStatus() != WAITING) {
-            throw new MentoringNotWaitingException();
+    private AppliedMentoringResponse getExpected(List<Mentoring> mentorings) {
+        List<ExpectedMentoringInfo> expectedMentoringInfos = new ArrayList<>();
+        for (Mentoring mentoring : mentorings) {
+            expectedMentoringInfos.add(MentoringMapper.mapToExpectedInfo(mentoring));
         }
-        return MentoringMapper.mapToAppliedDetailInfo(mentoring);
+        return new AppliedMentoringResponse(expectedMentoringInfos);
     }
 
-    public SeniorMentoringDetailResponse getSeniorMentoringDetail(User user, Long mentoringId) {
-        Mentoring mentoring = checkIsMyMentoringUseCase.bySenior(user, mentoringId);
-        if (mentoring.getStatus() == DONE) {
-            throw new MentoringDoneException();
+    private AppliedMentoringResponse getDone(List<Mentoring> mentorings) {
+        List<DoneMentoringInfo> doneMentoringInfos = new ArrayList<>();
+        for (Mentoring mentoring : mentorings) {
+            doneMentoringInfos.add(MentoringMapper.mapToDoneInfo(mentoring));
         }
-        return MentoringMapper.mapToSeniorMentoringDetail(mentoring);
+        return new AppliedMentoringResponse(doneMentoringInfos);
     }
 }
diff --git a/...va/com/postgraduate/domain/senior/application/dto/req/SeniorProfileAndAccountRequest.java b/...va/com/postgraduate/domain/senior/application/dto/req/SeniorProfileAndAccountRequest.java
@@ -18,9 +18,11 @@ public class SeniorProfileAndAccountRequest {
     @NotNull
     private String time;
     @NotNull
+    private String oneLiner;
+    @NotNull
+    private String keyword;
+    @NotNull
     private String account;
     @NotNull
     private String bank;
-    @NotNull
-    private String rrn;
 }
diff --git a/src/main/java/com/postgraduate/domain/senior/application/dto/req/SeniorProfileRequest.java b/src/main/java/com/postgraduate/domain/senior/application/dto/req/SeniorProfileRequest.java
@@ -17,4 +17,8 @@ public class SeniorProfileRequest {
     private String chatLink;
     @NotNull
     private String time;
+    @NotNull
+    private String oneLiner;
+    @NotNull
+    private String keyword;
 }
diff --git a/src/main/java/com/postgraduate/domain/senior/application/mapper/SeniorMapper.java b/src/main/java/com/postgraduate/domain/senior/application/mapper/SeniorMapper.java
@@ -46,7 +46,6 @@ public static Account mapToAccount(SeniorProfileAndAccountRequest profileAndAcco
         return Account.builder()
                 .bank(profileAndAccountPageRequest.getBank())
                 .account(profileAndAccountPageRequest.getAccount())
-                .rrn(profileAndAccountPageRequest.getRrn())
                 .build();
     }
 
@@ -56,13 +55,17 @@ public static Profile mapToProfile(SeniorProfileAndAccountRequest profileAndAcco
                 .chatLink(profileAndAccountPageRequest.getChatLink())
                 .target(profileAndAccountPageRequest.getTarget())
                 .time(profileAndAccountPageRequest.getTime())
+                .oneLiner(profileAndAccountPageRequest.getOneLiner())
+                .keyword(profileAndAccountPageRequest.getKeyword())
                 .build();
     }
 
     public static Profile mapToProfile(SeniorProfileRequest profileRequest) {
         return Profile.builder()
                 .info(profileRequest.getInfo())
                 .chatLink(profileRequest.getChatLink())
+                .oneLiner(profileRequest.getOneLiner())
+                .keyword(profileRequest.getKeyword())
                 .target(profileRequest.getTarget())
                 .time(profileRequest.getTime())
                 .build();

diff --git a/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorSignUpUseCase.java b/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorSignUpUseCase.java
@@ -11,7 +11,6 @@
 import com.postgraduate.domain.user.domain.entity.User;
 import com.postgraduate.domain.user.domain.entity.constant.Role;
 import com.postgraduate.domain.user.domain.service.UserUpdateService;
-import com.postgraduate.global.config.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/src/main/java/com/postgraduate/domain/senior/domain/entity/Account.java b/src/main/java/com/postgraduate/domain/senior/domain/entity/Account.java
@@ -21,4 +21,9 @@ public class Account {
 
     @Column(nullable = false)
     private String rrn;
+
+    public void updateAccount(Account account) {
+        this.account = account.getAccount();
+        this.bank = account.getBank();
+    }
 }
diff --git a/src/main/java/com/postgraduate/domain/senior/domain/entity/Profile.java b/src/main/java/com/postgraduate/domain/senior/domain/entity/Profile.java
@@ -14,11 +14,16 @@
 public class Profile {
     private String info;
 
+    private String oneLiner;
+
+    private String keyword;
+
     private String target;
 
     private String chatLink;
 
     private String time;
 
-    private Integer term;
+    @Builder.Default
+    private Integer term = 40;
 }
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
@@ -51,7 +51,7 @@ public void updateProfile(Profile profile) {
 
     public void updateProfileAndAccount(Profile profile, Account account) {
         this.profile = profile;
-        this.account = account;
+        account.updateAccount(account);
     }
 
     public void updateCertification(String certification) {

diff --git a/...main/java/com/postgraduate/domain/senior/presentation/constant/SeniorResponseMessage.java b/...main/java/com/postgraduate/domain/senior/presentation/constant/SeniorResponseMessage.java
@@ -7,7 +7,7 @@
 @RequiredArgsConstructor
 public enum SeniorResponseMessage {
     CREATE_SENIOR("대학원생 가입에 성공하였습니다."),
-    UPDATE_PROFILE("대학원생 프로필 등록에 성공하였습니다"),
+    UPDATE_PROFILE("대학원생 프로필 수정에 성공하였습니다"),
     GET_SENIOR_INFO("대학원생 정보 조회에 성공하였습니다"),
     GET_SENIOR_PROFILE("대학원생 프로필 조회에 성공하였습니다"),
     UPDATE_CERTIFICATION("대학원생 인증사진 업로드에 성공하였습니다"),

diff --git a/src/main/java/com/postgraduate/domain/user/application/dto/req/UserHopeRequest.java b/src/main/java/com/postgraduate/domain/user/application/dto/req/UserHopeRequest.java
@@ -0,0 +1,12 @@
+package com.postgraduate.domain.user.application.dto.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class UserHopeRequest {
+    private String major;
+    private String field;
+    private boolean receive;
+}