-
Notifications
You must be signed in to change notification settings - Fork 1
[test] 스터디 가입 요청/수락/거절 API 인수 테스트 추가 #54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
crtEvent
wants to merge
16
commits into
feat/#25-impl-join-request-3
Choose a base branch
from
test/#25-add-join-request-test-2
base: feat/#25-impl-join-request-3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
ad677a8
rename: AcceptanceTest 패키지 위치 acceptance로 변경
crtEvent 3861e98
refactor: AcceptanceTest에 응답코드 검증 세분화
crtEvent ee46111
chore: AcceptanceTest에 Redis Test Container 설정 추가
crtEvent f718c6d
test: 테스트용 로그인 Step 메서드 추가
crtEvent bdf8a22
test: JoinRequestStep 추가
crtEvent f3cba4b
test: JoinRequestFixture 추가
crtEvent 9618f2f
test: 스터디 가입 요청 인수 테스트 추가
crtEvent e15ff41
test: 스터디 가입 요청 수락 인수 테스트 추가
crtEvent 9cc975b
test: 스터디 가입 요청 거절 인수 테스트 추가
crtEvent 0820ef5
fix: JoinRequestStep 스터디 가입 요청/거절 API 요청 patch 메서드로 수정
crtEvent bb3119c
chore: 테스트 설정 파일에 session-name 추가
crtEvent 0932f6f
chore: reset.sql에 join_request 테이블 추가
crtEvent 87cd02b
test: 스터디 가입 요청 수락/거절시 study_id 검증 케이스 추가
crtEvent 5c3a754
fix: 오타 수정
crtEvent 71f4877
rename: Fixture 분리 및 위치 변경
crtEvent 6108631
fix: EnableJpaAuditing 중복된 설정 제거
crtEvent File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
87 changes: 87 additions & 0 deletions
87
src/test/java/com/flytrap/venusplanner/acceptance/AcceptanceTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package com.flytrap.venusplanner.acceptance; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import com.flytrap.venusplanner.acceptance.common.SessionCookie; | ||
| import io.restassured.RestAssured; | ||
| import io.restassured.response.ExtractableResponse; | ||
| import io.restassured.response.Response; | ||
| import io.restassured.specification.RequestSpecification; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.TestInstance; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; | ||
| import org.springframework.boot.test.web.server.LocalServerPort; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.test.context.TestPropertySource; | ||
| import org.springframework.test.context.jdbc.Sql; | ||
| import org.testcontainers.containers.GenericContainer; | ||
| import org.testcontainers.utility.DockerImageName; | ||
|
|
||
| @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) | ||
| @TestInstance(TestInstance.Lifecycle.PER_CLASS) | ||
| @TestPropertySource(properties = {"auth.session.sessionName=login_session::"}) | ||
| @Sql("classpath:reset.sql") | ||
| public abstract class AcceptanceTest { | ||
|
|
||
| @LocalServerPort | ||
| private int port; | ||
|
|
||
| @Value("${server.servlet.session.cookie.name}") | ||
| protected String sessionCookieName; | ||
|
|
||
| static { | ||
| GenericContainer<?> redis = | ||
| new GenericContainer<>(DockerImageName.parse("redis:latest")).withExposedPorts(6379); | ||
| redis.start(); | ||
| System.setProperty("spring.data.redis.host", redis.getHost()); | ||
| System.setProperty("spring.data.redis.port", redis.getMappedPort(6379).toString()); | ||
| } | ||
|
|
||
| @BeforeAll | ||
| void setUp() { | ||
| RestAssured.port = port; | ||
| } | ||
|
|
||
| public SessionCookie 테스트_로그인(Long memberId) { | ||
| String sessionCookieValue = givenJsonRequest() | ||
| .body(memberId) | ||
| .when().post("/api/v1/test/sign-in") | ||
| .then().extract() | ||
| .cookie(sessionCookieName); | ||
|
|
||
| return new SessionCookie(sessionCookieName, sessionCookieValue); | ||
| } | ||
|
|
||
| protected static RequestSpecification givenJsonRequest() { | ||
| return RestAssured.given().log().all() | ||
| .accept(MediaType.APPLICATION_JSON_VALUE) | ||
| .contentType(MediaType.APPLICATION_JSON_VALUE); | ||
| } | ||
|
|
||
| protected void 응답_코드는_200_OK_를_반환한다(ExtractableResponse<Response> response) { | ||
| 응답_상태코드_검증(response, HttpStatus.OK); | ||
| } | ||
|
|
||
| protected void 응답_코드는_201_CREATED_를_반환한다(ExtractableResponse<Response> response) { | ||
| 응답_상태코드_검증(response, HttpStatus.CREATED); | ||
| } | ||
|
|
||
| protected void 응답_코드는_403_FORBIDDEN_를_반환한다(ExtractableResponse<Response> response) { | ||
| 응답_상태코드_검증(response, HttpStatus.FORBIDDEN); | ||
| } | ||
|
|
||
| protected void 응답_코드는_404_NOT_FOUND_를_반환한다(ExtractableResponse<Response> response) { | ||
| 응답_상태코드_검증(response, HttpStatus.NOT_FOUND); | ||
| } | ||
|
|
||
| protected void 응답_코드는_409_CONFLICT_를_반환한다(ExtractableResponse<Response> response) { | ||
| 응답_상태코드_검증(response, HttpStatus.CONFLICT); | ||
| } | ||
|
|
||
| private void 응답_상태코드_검증(ExtractableResponse<Response> response, HttpStatus httpStatus) { | ||
| assertThat(response.statusCode()).isEqualTo(httpStatus.value()); | ||
| } | ||
| } | ||
7 changes: 7 additions & 0 deletions
7
src/test/java/com/flytrap/venusplanner/acceptance/common/SessionCookie.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.flytrap.venusplanner.acceptance.common; | ||
|
|
||
| public record SessionCookie( | ||
| String name, | ||
| String value | ||
| ) { | ||
| } |
20 changes: 20 additions & 0 deletions
20
src/test/java/com/flytrap/venusplanner/acceptance/common/TestAuthMemberController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package com.flytrap.venusplanner.acceptance.common; | ||
|
|
||
| import com.flytrap.venusplanner.global.auth.dto.SessionMember; | ||
| import jakarta.servlet.http.HttpSession; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RestController | ||
| public class TestAuthMemberController { | ||
|
|
||
| @Value("${auth.session.sessionName}") | ||
| private String sessionName; | ||
|
|
||
| @PostMapping("/api/v1/test/sign-in") | ||
| public void signIn(@RequestBody Long memberId, HttpSession session) { | ||
| session.setAttribute(sessionName, new SessionMember(memberId)); | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
...est/java/com/flytrap/venusplanner/acceptance/join_request/fixture/JoinRequestFixture.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package com.flytrap.venusplanner.acceptance.join_request.fixture; | ||
|
|
||
| import com.flytrap.venusplanner.api.access.domain.Permission; | ||
| import com.flytrap.venusplanner.api.access.domain.Roll; | ||
| import com.flytrap.venusplanner.api.join_request.domain.JoinRequest; | ||
| import com.flytrap.venusplanner.api.join_request.domain.JoinRequestState; | ||
| import com.flytrap.venusplanner.api.member.domain.Member; | ||
| import com.flytrap.venusplanner.api.member.domain.OAuthPlatformType; | ||
| import com.flytrap.venusplanner.api.member_study.domain.MemberStudy; | ||
| import com.flytrap.venusplanner.api.study.domain.Study; | ||
|
|
||
| public class JoinRequestFixture { | ||
|
|
||
|
Comment on lines
+12
to
+13
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 흐음.. 에이프랑 저랑 사용하는 픽스쳐 형태가 달라서 fixture 를 어떻게 관리하면 좋을지 논의해보면 좋긴 할 것 같네요 |
||
| public static Member 리더() { | ||
| return Member.builder() | ||
| .oauthPk("00000") | ||
| .oauthPlatformId(OAuthPlatformType.GITHUB.getId()) | ||
| .email("[email protected]") | ||
| .nickname("leader") | ||
| .profileImageUrl("https://test.com") | ||
| .build(); | ||
| } | ||
|
|
||
| public static Member 멤버_01() { | ||
| return Member.builder() | ||
| .oauthPk("11111") | ||
| .oauthPlatformId(OAuthPlatformType.GITHUB.getId()) | ||
| .email("[email protected]") | ||
| .nickname("member01") | ||
| .profileImageUrl("https://test.com") | ||
| .build(); | ||
| } | ||
|
|
||
| public static Study 알고리즘_스터디() { | ||
| return new Study("알고리즘 챌린지", "알고리즘 실력을 쌓아갑니다."); | ||
| } | ||
|
|
||
| public static MemberStudy 리더_멤버_스터디(Study study, Member leader) { | ||
| return MemberStudy.fromLeader(leader.getId(), study); | ||
| } | ||
|
|
||
| public static MemberStudy 멤버_스터디(Study study, Member member) { | ||
| return MemberStudy.builder() | ||
| .memberId(member.getId()) | ||
| .study(study) | ||
| .rollId(Roll.MEMBER.getId()) | ||
| .permissionId(Permission.NONE.getId()) | ||
| .build(); | ||
| } | ||
|
|
||
| public static JoinRequest 신규_가입_요청(Study study, Member member) { | ||
| return JoinRequest.create(study.getId(), member.getId()); | ||
| } | ||
|
|
||
| public static JoinRequest 수락된_가입_요청(Study study, Member member) { | ||
| return JoinRequest.builder() | ||
| .studyId(study.getId()) | ||
| .memberId(member.getId()) | ||
| .state(JoinRequestState.ACCEPT) | ||
| .build(); | ||
| } | ||
|
|
||
| public static JoinRequest 거절된_가입_요청(Study study, Member member) { | ||
| return JoinRequest.builder() | ||
| .studyId(study.getId()) | ||
| .memberId(member.getId()) | ||
| .state(JoinRequestState.REJECT) | ||
| .build(); | ||
| } | ||
| } | ||
31 changes: 31 additions & 0 deletions
31
src/test/java/com/flytrap/venusplanner/acceptance/join_request/step/JoinRequestStep.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package com.flytrap.venusplanner.acceptance.join_request.step; | ||
|
|
||
| import com.flytrap.venusplanner.acceptance.AcceptanceTest; | ||
| import com.flytrap.venusplanner.acceptance.common.SessionCookie; | ||
| import io.restassured.response.ExtractableResponse; | ||
| import io.restassured.response.Response; | ||
|
|
||
| public class JoinRequestStep extends AcceptanceTest { | ||
|
|
||
| public static ExtractableResponse<Response> 스터디_가입_요청(Long studyId, SessionCookie sessionCookie) { | ||
| return givenJsonRequest() | ||
| .cookie(sessionCookie.name(), sessionCookie.value()) | ||
| .when().post("/api/v1/studies/{studyId}/join-requests", studyId) | ||
| .then().log().all().extract(); | ||
| } | ||
|
|
||
| public static ExtractableResponse<Response> 스터디_가입_요청_수락(Long studyId, Long requestId, SessionCookie sessionCookie) { | ||
| return givenJsonRequest() | ||
| .cookie(sessionCookie.name(), sessionCookie.value()) | ||
| .when().patch("/api/v1/studies/{studyId}/join-requests/{requestId}/accept", studyId, requestId) | ||
| .then().log().all().extract(); | ||
| } | ||
|
|
||
| public static ExtractableResponse<Response> 스터디_가입_요청_거절(Long studyId, Long requestId, SessionCookie sessionCookie) { | ||
| return givenJsonRequest() | ||
| .cookie(sessionCookie.name(), sessionCookie.value()) | ||
| .when().patch("/api/v1/studies/{studyId}/join-requests/{requestId}/reject", studyId, requestId) | ||
| .then().log().all().extract(); | ||
| } | ||
|
|
||
| } |
125 changes: 125 additions & 0 deletions
125
...est/java/com/flytrap/venusplanner/acceptance/join_request/test/AcceptJoinRequestTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package com.flytrap.venusplanner.acceptance.join_request.test; | ||
|
|
||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.거절된_가입_요청; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.리더; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.리더_멤버_스터디; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.멤버_01; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.수락된_가입_요청; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.신규_가입_요청; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.fixture.JoinRequestFixture.알고리즘_스터디; | ||
| import static com.flytrap.venusplanner.acceptance.join_request.step.JoinRequestStep.스터디_가입_요청_수락; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import com.flytrap.venusplanner.acceptance.AcceptanceTest; | ||
| import com.flytrap.venusplanner.api.join_request.domain.JoinRequest; | ||
| import com.flytrap.venusplanner.api.join_request.domain.JoinRequestState; | ||
| import com.flytrap.venusplanner.api.join_request.infrastructure.repository.JoinRequestRepository; | ||
| import com.flytrap.venusplanner.api.member.infrastructure.repository.MemberRepository; | ||
| import com.flytrap.venusplanner.api.member_study.infrastructure.repository.MemberStudyRepository; | ||
| import com.flytrap.venusplanner.api.study.infrastructure.repository.StudyRepository; | ||
| import io.restassured.response.ExtractableResponse; | ||
| import io.restassured.response.Response; | ||
| import org.junit.jupiter.api.DisplayName; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| @DisplayName("[인수테스트] 스터디 가입 요청 수락 케이스") | ||
| public class AcceptJoinRequestTest extends AcceptanceTest { | ||
|
|
||
| @Autowired | ||
| MemberRepository memberRepository; | ||
|
|
||
| @Autowired | ||
| StudyRepository studyRepository; | ||
|
|
||
| @Autowired | ||
| MemberStudyRepository memberStudyRepository; | ||
|
|
||
| @Autowired | ||
| JoinRequestRepository joinRequestRepository; | ||
|
|
||
| @Test | ||
| void 스터디_리더는_스터디_가입_요청을_수락_할_수_있다() { | ||
| // given | ||
| var leader = memberRepository.save(리더()); | ||
| var member = memberRepository.save(멤버_01()); | ||
| var study = studyRepository.save(알고리즘_스터디()); | ||
| var leaderMemberStudy = memberStudyRepository.save(리더_멤버_스터디(study, leader)); | ||
| var joinRequest = joinRequestRepository.save(신규_가입_요청(study, member)); | ||
| var sessionCookie = 테스트_로그인(leader.getId()); | ||
|
|
||
| // when | ||
| var response = 스터디_가입_요청_수락( | ||
| study.getId(), joinRequest.getId(), sessionCookie); | ||
|
|
||
| // then | ||
| 응답_코드는_200_OK_를_반환한다(response); | ||
| 응답_바디로_빈_응답을_반환한다(response); | ||
| 스터디_가입_요청이_수락_되었는지_검증(joinRequest); | ||
| } | ||
|
|
||
| @Test | ||
| void 스터디_리더가_아닌_멤버는_스터디_가입_요청을_수락_할_수_없다() { | ||
| // given | ||
| var leader = memberRepository.save(리더()); | ||
| var member = memberRepository.save(멤버_01()); | ||
| var study = studyRepository.save(알고리즘_스터디()); | ||
| var leaderMemberStudy = memberStudyRepository.save(리더_멤버_스터디(study, leader)); | ||
| var joinRequest = joinRequestRepository.save(신규_가입_요청(study, member)); | ||
| var sessionCookie = 테스트_로그인(member.getId()); | ||
|
|
||
| // when | ||
| var response = 스터디_가입_요청_수락( | ||
| study.getId(), joinRequest.getId(), sessionCookie); | ||
|
|
||
| // then | ||
| 응답_코드는_403_FORBIDDEN_를_반환한다(response); | ||
| } | ||
|
|
||
| @Test | ||
| void 이미_수락된_스터디_가입_요청은_수락_할_수_없다() { | ||
| // given | ||
| var leader = memberRepository.save(리더()); | ||
| var member = memberRepository.save(멤버_01()); | ||
| var study = studyRepository.save(알고리즘_스터디()); | ||
| var leaderMemberStudy = memberStudyRepository.save(리더_멤버_스터디(study, leader)); | ||
| var joinRequest = joinRequestRepository.save(수락된_가입_요청(study, member)); | ||
| var sessionCookie = 테스트_로그인(leader.getId()); | ||
|
|
||
| // when | ||
| var response = 스터디_가입_요청_수락( | ||
| study.getId(), joinRequest.getId(), sessionCookie); | ||
|
|
||
| // then | ||
| 응답_코드는_409_CONFLICT_를_반환한다(response); | ||
| } | ||
|
|
||
| @Test | ||
| void 이미_거절된_스터디_가입_요청은_수락_할_수_없다() { | ||
| // given | ||
| var leader = memberRepository.save(리더()); | ||
| var member = memberRepository.save(멤버_01()); | ||
| var study = studyRepository.save(알고리즘_스터디()); | ||
| var leaderMemberStudy = memberStudyRepository.save(리더_멤버_스터디(study, leader)); | ||
| var joinRequest = joinRequestRepository.save(거절된_가입_요청(study, member)); | ||
| var sessionCookie = 테스트_로그인(leader.getId()); | ||
|
|
||
| // when | ||
| var response = 스터디_가입_요청_수락( | ||
| study.getId(), joinRequest.getId(), sessionCookie); | ||
|
|
||
| // then | ||
| 응답_코드는_409_CONFLICT_를_반환한다(response); | ||
| } | ||
|
|
||
| private void 응답_바디로_빈_응답을_반환한다(ExtractableResponse<Response> response) { | ||
| assertThat(response.body().asString()).isEmpty(); | ||
| } | ||
|
|
||
| private void 스터디_가입_요청이_수락_되었는지_검증(JoinRequest joinRequest) { | ||
| var created = joinRequestRepository.findById(joinRequest.getId()).get(); | ||
|
|
||
| assertThat(created.getState()).isEqualTo(JoinRequestState.ACCEPT); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
테스트용 로그인 메서드입니다. 로그인 하면 쿠키 객체를 반환합니다.
쿠키 객체는 Step 메서드에서 다음과 같이 사용합니다.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
테스트 로그인할 때 어드민 로그인으로 안하고 별도의 테스트 로그인을 만드신건가요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네, 테스트 시나리오 상 어드민이 아니라 다른 Member가 로그인 할 수도 있을 것 같아서 만들었어요