From 6b88f418103e26f2080ffe279bff551f121c8922 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Tue, 29 Jul 2025 06:07:44 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=EB=A9=98=ED=86=A0=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=EC=97=90=20'=ED=8C=8C=EA=B2=AC=20=ED=95=99?= =?UTF-8?q?=EA=B8=B0'=20=EC=BB=AC=EB=9F=BC=EC=9D=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/solidconnection/mentor/domain/Mentor.java | 3 +++ .../db/migration/V26__add_term_column_to_mentor.sql | 2 ++ .../mentor/fixture/MentorFixtureBuilder.java | 7 +++++++ 3 files changed, 12 insertions(+) create mode 100644 src/main/resources/db/migration/V26__add_term_column_to_mentor.sql diff --git a/src/main/java/com/example/solidconnection/mentor/domain/Mentor.java b/src/main/java/com/example/solidconnection/mentor/domain/Mentor.java index 1a5012015..d97f6a895 100644 --- a/src/main/java/com/example/solidconnection/mentor/domain/Mentor.java +++ b/src/main/java/com/example/solidconnection/mentor/domain/Mentor.java @@ -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) diff --git a/src/main/resources/db/migration/V26__add_term_column_to_mentor.sql b/src/main/resources/db/migration/V26__add_term_column_to_mentor.sql new file mode 100644 index 000000000..dbf061090 --- /dev/null +++ b/src/main/resources/db/migration/V26__add_term_column_to_mentor.sql @@ -0,0 +1,2 @@ +ALTER TABLE mentor + ADD COLUMN term varchar(50) NOT NULL; diff --git a/src/test/java/com/example/solidconnection/mentor/fixture/MentorFixtureBuilder.java b/src/test/java/com/example/solidconnection/mentor/fixture/MentorFixtureBuilder.java index d499ecc2a..7eaaefa94 100644 --- a/src/test/java/com/example/solidconnection/mentor/fixture/MentorFixtureBuilder.java +++ b/src/test/java/com/example/solidconnection/mentor/fixture/MentorFixtureBuilder.java @@ -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); @@ -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, @@ -61,6 +67,7 @@ public Mentor create() { passTip, siteUserId, universityId, + term, null ); return mentorRepository.save(mentor); From 1d12b58d0b6ec4e80d562a0da1af1ae184924418 Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Tue, 29 Jul 2025 06:15:19 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=EB=A9=98=ED=86=A0=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C,=20=ED=8C=8C=EA=B2=AC=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EB=8C=80=EC=8B=A0=20'=ED=8C=8C=EA=B2=AC=20?= =?UTF-8?q?=ED=95=99=EA=B8=B0'=EB=A5=BC=20=EC=9D=91=EB=8B=B5=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 멘터 상세 페이지, 미리보기, 멘토 마이페이지에서 변경이 일어남 --- .../solidconnection/mentor/dto/MentorDetailResponse.java | 5 ++--- .../solidconnection/mentor/dto/MentorMyPageResponse.java | 5 ++--- .../solidconnection/mentor/dto/MentorPreviewResponse.java | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java index 63255799e..3fc042aa7 100644 --- a/src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java +++ b/src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java @@ -1,7 +1,6 @@ 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; @@ -9,9 +8,9 @@ public record MentorDetailResponse( long id, String nickname, String profileImageUrl, - ExchangeStatus exchangeStatus, String country, String universityName, + String term, int menteeCount, boolean hasBadge, String introduction, @@ -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(), diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java index 46012f068..95bb26506 100644 --- a/src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java +++ b/src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java @@ -1,7 +1,6 @@ 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; @@ -9,9 +8,9 @@ public record MentorMyPageResponse( long id, String profileImageUrl, String nickname, - ExchangeStatus exchangeStatus, String country, String universityName, + String term, int menteeCount, boolean hasBadge, String introduction, @@ -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(), diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java index 70695b462..dd590c179 100644 --- a/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java +++ b/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java @@ -1,7 +1,6 @@ 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; @@ -9,9 +8,9 @@ public record MentorPreviewResponse( long id, String nickname, String profileImageUrl, - ExchangeStatus exchangeStatus, String country, String universityName, + String term, int menteeCount, boolean hasBadge, String introduction, @@ -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(), From 35ac57c0d2fbde591852b141d3c80eef7c709ced Mon Sep 17 00:00:00 2001 From: nayonsoso Date: Tue, 29 Jul 2025 06:16:11 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - sliceResponse 로 대체됨 --- .../mentor/dto/MentorPreviewsResponse.java | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewsResponse.java diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewsResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewsResponse.java deleted file mode 100644 index d322e22f9..000000000 --- a/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewsResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.solidconnection.mentor.dto; - -import java.util.List; - -public record MentorPreviewsResponse( - List content, - int nextPageNumber -) { - -}