Skip to content

Commit 2bdd0bd

Browse files
authored
Merge pull request #367 from DKU-Dgaja/BE]-refactor(#364)-스터디-등록요청-DTO수정
2 parents a271a8f + 9bb271b commit 2bdd0bd

File tree

4 files changed

+27
-20
lines changed

4 files changed

+27
-20
lines changed

backend/src/main/java/com/example/backend/study/api/controller/info/request/StudyInfoRegisterRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class StudyInfoRegisterRequest {
3131

3232
private String profileImageUrl; // 스터디 프로필 사진
3333

34-
private String branchName; // 브랜치 이름
34+
private RepositoryInfo repositoryInfo; // 레포지토리 정보
3535

3636
private StudyPeriodType periodType; // 스터디 커밋 규칙(주기)
3737

@@ -44,7 +44,7 @@ public static StudyInfoRegisterRequest of(StudyInfo request) {
4444
.status(request.getStatus())
4545
.maximumMember(request.getMaximumMember())
4646
.profileImageUrl(request.getProfileImageUrl())
47-
.branchName(request.getRepositoryInfo().getBranchName())
47+
.repositoryInfo(request.getRepositoryInfo())
4848
.build();
4949
}
5050
}

backend/src/main/java/com/example/backend/study/api/service/info/StudyInfoService.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,7 @@ private StudyInfo saveStudyInfo(StudyInfoRegisterRequest request, UserInfoRespon
240240
.lastCommitDay(null)
241241
.profileImageUrl(request.getProfileImageUrl())
242242
.notice(null)
243-
.repositoryInfo(RepositoryInfo.builder()
244-
.owner(userInfo.getGithubId())
245-
.name(userInfo.getName())
246-
.branchName(request.getBranchName())
247-
.build())
243+
.repositoryInfo(request.getRepositoryInfo())
248244
.periodType(request.getPeriodType())
249245
.build();
250246
return studyInfoRepository.save(studyInfo);

backend/src/test/java/com/example/backend/domain/define/study/info/StudyInfoFixture.java

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ public static StudyInfoRegisterRequest generateStudyInfoRegisterRequest(List<Stu
9898
.status(StudyStatus.STUDY_PUBLIC)
9999
.maximumMember(5)
100100
.profileImageUrl("https://example.com/profile.jpg")
101-
.branchName("BRANCH_NAME")
101+
.repositoryInfo(RepositoryInfo.builder()
102+
.owner("소유자이름")
103+
.name("레포 이름")
104+
.branchName("main")
105+
.build())
102106
.periodType(StudyPeriodType.STUDY_PERIOD_EVERYDAY)
103107
.categoriesId(categoriesId)
104108
.build();
@@ -114,7 +118,11 @@ public static StudyInfoRegisterRequest generateStudyInfoRegisterRequestWhenMaxim
114118
.status(StudyStatus.STUDY_PUBLIC)
115119
.maximumMember(11)
116120
.profileImageUrl("https://example.com/profile.jpg")
117-
.branchName("BRANCH_NAME")
121+
.repositoryInfo(RepositoryInfo.builder()
122+
.owner("소유자이름")
123+
.name("레포 이름")
124+
.branchName("main")
125+
.build())
118126
.periodType(StudyPeriodType.STUDY_PERIOD_EVERYDAY)
119127
.categoriesId(categoriesId)
120128
.build();
@@ -127,10 +135,14 @@ public static StudyInfoRegisterRequest generateStudyInfoRegisterRequestWhenMaxim
127135
return StudyInfoRegisterRequest.builder()
128136
.topic("Sample Study")
129137
.info("This is a sample study.")
130-
.status(StudyStatus.STUDY_PUBLIC)
138+
.status(STUDY_PUBLIC)
131139
.maximumMember(-1)
132140
.profileImageUrl("https://example.com/profile.jpg")
133-
.branchName("BRANCH_NAME")
141+
.repositoryInfo(RepositoryInfo.builder()
142+
.owner("소유자이름")
143+
.name("레포 이름")
144+
.branchName("main")
145+
.build())
134146
.periodType(StudyPeriodType.STUDY_PERIOD_EVERYDAY)
135147
.categoriesId(categoriesId)
136148
.build();
@@ -146,7 +158,11 @@ public static StudyInfoRegisterRequest generateStudyInfoRegisterRequestWithCateg
146158
.status(StudyStatus.STUDY_PUBLIC)
147159
.maximumMember(5)
148160
.profileImageUrl("https://example.com/profile.jpg")
149-
.branchName("BRANCH_NAME")
161+
.repositoryInfo(RepositoryInfo.builder()
162+
.owner("소유자이름")
163+
.name("레포 이름")
164+
.branchName("main")
165+
.build())
150166
.periodType(StudyPeriodType.STUDY_PERIOD_EVERYDAY)
151167
.categoriesId(categoriesId)
152168
.build();

backend/src/test/java/com/example/backend/study/api/service/info/StudyInfoServiceTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,13 @@ void tearDown() {
9898
() -> assertEquals(studyInfoRegisterRequest.getStatus(), registeredStudy.getStatus()),
9999
() -> assertEquals(studyInfoRegisterRequest.getMaximumMember(), registeredStudy.getMaximumMember()),
100100
() -> assertEquals(studyInfoRegisterRequest.getProfileImageUrl(), registeredStudy.getProfileImageUrl()),
101-
() -> assertEquals(studyInfoRegisterRequest.getBranchName(), registeredStudy.getRepositoryInfo().getBranchName()),
101+
() -> assertEquals(studyInfoRegisterRequest.getRepositoryInfo().getOwner(), registeredStudy.getRepositoryInfo().getOwner()),
102+
() -> assertEquals(studyInfoRegisterRequest.getRepositoryInfo().getName(), registeredStudy.getRepositoryInfo().getName()),
103+
() -> assertEquals(studyInfoRegisterRequest.getRepositoryInfo().getBranchName(), registeredStudy.getRepositoryInfo().getBranchName()),
102104
() -> assertEquals(studyInfoRegisterRequest.getPeriodType(), registeredStudy.getPeriodType()),
103105
() -> assertIterableEquals(studyInfoRegisterRequest.getCategoriesId(), registeredStudy.getCategoriesId())
104106
);
105107

106-
// 스터디 등록 시 자동 초기화 검증
107-
List<StudyInfo> studyInfo = studyInfoRepository.findAll();
108-
assertEquals(studyInfo.size(), 1);
109-
assertEquals(studyInfo.get(0).getUserId(), user.getId());
110-
assertEquals(studyInfo.get(0).getRepositoryInfo().getOwner(), user.getGithubId());
111-
assertEquals(studyInfo.get(0).getRepositoryInfo().getName(), user.getName());
112-
113108
// joinCode 10자리가 잘 생성되었는지 검증
114109
assertEquals(registeredStudy.getJoinCode().length(), JOIN_CODE_LENGTH);
115110

0 commit comments

Comments
 (0)