Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public class Mentor {
@Column
private long universityId;

@Column(length = 50, nullable = false)
private String term;

@BatchSize(size = 10)
@OrderBy("sequence ASC")
@OneToMany(mappedBy = "mentor", cascade = CascadeType.ALL, orphanRemoval = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.example.solidconnection.mentor.dto;

import com.example.solidconnection.mentor.domain.Mentor;
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
import com.example.solidconnection.siteuser.domain.SiteUser;
import java.util.List;

public record MentorDetailResponse(
long id,
String nickname,
String profileImageUrl,
ExchangeStatus exchangeStatus,
String country,
String universityName,
String term,
int menteeCount,
boolean hasBadge,
String introduction,
Expand All @@ -25,9 +24,9 @@ public static MentorDetailResponse of(Mentor mentor, SiteUser mentorUser, boolea
mentor.getId(),
mentorUser.getNickname(),
mentorUser.getProfileImageUrl(),
mentorUser.getExchangeStatus(),
"국가", // todo: 교환학생 기록이 인증되면 추가
"대학 이름", // todo: 교환학생 기록이 인증되면 추가
mentor.getTerm(),
mentor.getMenteeCount(),
mentor.isHasBadge(),
mentor.getIntroduction(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.example.solidconnection.mentor.dto;

import com.example.solidconnection.mentor.domain.Mentor;
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
import com.example.solidconnection.siteuser.domain.SiteUser;
import java.util.List;

public record MentorMyPageResponse(
long id,
String profileImageUrl,
String nickname,
ExchangeStatus exchangeStatus,
String country,
String universityName,
String term,
int menteeCount,
boolean hasBadge,
String introduction,
Expand All @@ -23,9 +22,9 @@ public static MentorMyPageResponse of(Mentor mentor, SiteUser siteUser) {
mentor.getId(),
siteUser.getProfileImageUrl(),
siteUser.getNickname(),
siteUser.getExchangeStatus(),
"국가", // todo: 교환학생 기록이 인증되면 추가
"대학 이름",
mentor.getTerm(),
mentor.getMenteeCount(),
mentor.isHasBadge(),
mentor.getIntroduction(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package com.example.solidconnection.mentor.dto;

import com.example.solidconnection.mentor.domain.Mentor;
import com.example.solidconnection.siteuser.domain.ExchangeStatus;
import com.example.solidconnection.siteuser.domain.SiteUser;
import java.util.List;

public record MentorPreviewResponse(
long id,
String nickname,
String profileImageUrl,
ExchangeStatus exchangeStatus,
String country,
String universityName,
String term,
int menteeCount,
boolean hasBadge,
String introduction,
Expand All @@ -24,9 +23,9 @@ public static MentorPreviewResponse of(Mentor mentor, SiteUser mentorUser, boole
mentor.getId(),
mentorUser.getNickname(),
mentorUser.getProfileImageUrl(),
mentorUser.getExchangeStatus(),
"국가", // todo: 교환학생 기록이 인증되면 추가
"대학 이름", // todo: 교환학생 기록이 인증되면 추가
mentor.getTerm(),
mentor.getMenteeCount(),
mentor.isHasBadge(),
mentor.getIntroduction(),
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE mentor
ADD COLUMN term varchar(50) NOT NULL;
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class MentorFixtureBuilder {
private String passTip;
private long siteUserId;
private long universityId;
private String term = "2025-1";

public MentorFixtureBuilder mentor() {
return new MentorFixtureBuilder(mentorRepository);
Expand Down Expand Up @@ -52,6 +53,11 @@ public MentorFixtureBuilder universityId(Long universityId) {
return this;
}

public MentorFixtureBuilder term(String term) {
this.term = term;
return this;
}

public Mentor create() {
Mentor mentor = new Mentor(
null,
Expand All @@ -61,6 +67,7 @@ public Mentor create() {
passTip,
siteUserId,
universityId,
term,
null
);
return mentorRepository.save(mentor);
Expand Down
Loading