Skip to content

Commit d8710a0

Browse files
authored
refactor: 멘토 조회 시, 파견 상태 대신 '파견 학기'를 응답하도록 (#412)
* refactor: 멘토 테이블에 '파견 학기' 컬럼을 추가 * refactor: 멘토 조회 시, 파견 상태 대신 '파견 학기'를 응답하도록 - 멘터 상세 페이지, 미리보기, 멘토 마이페이지에서 변경이 일어남 * refactor: 사용하지 않는 클래스 삭제 - sliceResponse 로 대체됨
1 parent 0c91030 commit d8710a0

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

src/main/java/com/example/solidconnection/mentor/domain/Mentor.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ public class Mentor {
4444
@Column
4545
private long universityId;
4646

47+
@Column(length = 50, nullable = false)
48+
private String term;
49+
4750
@BatchSize(size = 10)
4851
@OrderBy("sequence ASC")
4952
@OneToMany(mappedBy = "mentor", cascade = CascadeType.ALL, orphanRemoval = true)

src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package com.example.solidconnection.mentor.dto;
22

33
import com.example.solidconnection.mentor.domain.Mentor;
4-
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
54
import com.example.solidconnection.siteuser.domain.SiteUser;
65
import java.util.List;
76

87
public record MentorDetailResponse(
98
long id,
109
String nickname,
1110
String profileImageUrl,
12-
ExchangeStatus exchangeStatus,
1311
String country,
1412
String universityName,
13+
String term,
1514
int menteeCount,
1615
boolean hasBadge,
1716
String introduction,
@@ -25,9 +24,9 @@ public static MentorDetailResponse of(Mentor mentor, SiteUser mentorUser, boolea
2524
mentor.getId(),
2625
mentorUser.getNickname(),
2726
mentorUser.getProfileImageUrl(),
28-
mentorUser.getExchangeStatus(),
2927
"국가", // todo: 교환학생 기록이 인증되면 추가
3028
"대학 이름", // todo: 교환학생 기록이 인증되면 추가
29+
mentor.getTerm(),
3130
mentor.getMenteeCount(),
3231
mentor.isHasBadge(),
3332
mentor.getIntroduction(),

src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package com.example.solidconnection.mentor.dto;
22

33
import com.example.solidconnection.mentor.domain.Mentor;
4-
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
54
import com.example.solidconnection.siteuser.domain.SiteUser;
65
import java.util.List;
76

87
public record MentorMyPageResponse(
98
long id,
109
String profileImageUrl,
1110
String nickname,
12-
ExchangeStatus exchangeStatus,
1311
String country,
1412
String universityName,
13+
String term,
1514
int menteeCount,
1615
boolean hasBadge,
1716
String introduction,
@@ -23,9 +22,9 @@ public static MentorMyPageResponse of(Mentor mentor, SiteUser siteUser) {
2322
mentor.getId(),
2423
siteUser.getProfileImageUrl(),
2524
siteUser.getNickname(),
26-
siteUser.getExchangeStatus(),
2725
"국가", // todo: 교환학생 기록이 인증되면 추가
2826
"대학 이름",
27+
mentor.getTerm(),
2928
mentor.getMenteeCount(),
3029
mentor.isHasBadge(),
3130
mentor.getIntroduction(),

src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package com.example.solidconnection.mentor.dto;
22

33
import com.example.solidconnection.mentor.domain.Mentor;
4-
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
54
import com.example.solidconnection.siteuser.domain.SiteUser;
65
import java.util.List;
76

87
public record MentorPreviewResponse(
98
long id,
109
String nickname,
1110
String profileImageUrl,
12-
ExchangeStatus exchangeStatus,
1311
String country,
1412
String universityName,
13+
String term,
1514
int menteeCount,
1615
boolean hasBadge,
1716
String introduction,
@@ -24,9 +23,9 @@ public static MentorPreviewResponse of(Mentor mentor, SiteUser mentorUser, boole
2423
mentor.getId(),
2524
mentorUser.getNickname(),
2625
mentorUser.getProfileImageUrl(),
27-
mentorUser.getExchangeStatus(),
2826
"국가", // todo: 교환학생 기록이 인증되면 추가
2927
"대학 이름", // todo: 교환학생 기록이 인증되면 추가
28+
mentor.getTerm(),
3029
mentor.getMenteeCount(),
3130
mentor.isHasBadge(),
3231
mentor.getIntroduction(),

src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewsResponse.java

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE mentor
2+
ADD COLUMN term varchar(50) NOT NULL;

src/test/java/com/example/solidconnection/mentor/fixture/MentorFixtureBuilder.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public class MentorFixtureBuilder {
1717
private String passTip;
1818
private long siteUserId;
1919
private long universityId;
20+
private String term = "2025-1";
2021

2122
public MentorFixtureBuilder mentor() {
2223
return new MentorFixtureBuilder(mentorRepository);
@@ -52,6 +53,11 @@ public MentorFixtureBuilder universityId(Long universityId) {
5253
return this;
5354
}
5455

56+
public MentorFixtureBuilder term(String term) {
57+
this.term = term;
58+
return this;
59+
}
60+
5561
public Mentor create() {
5662
Mentor mentor = new Mentor(
5763
null,
@@ -61,6 +67,7 @@ public Mentor create() {
6167
passTip,
6268
siteUserId,
6369
universityId,
70+
term,
6471
null
6572
);
6673
return mentorRepository.save(mentor);

0 commit comments

Comments
 (0)