-
Notifications
You must be signed in to change notification settings - Fork 4
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
(회원) 선호 카테고리 추가 기능 구현 #70
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
968526a
feat: (#66) 선호 카테고리 추가하는 API 기능 구현
aiaiaiai1 8c2cd7b
test: (#66) Repository 테스트 추가
aiaiaiai1 aa666cb
feat: (#66) Swagger 어노테이션 추가
aiaiaiai1 6bce9d2
refactor: (#66) 개행 제거
aiaiaiai1 c28b224
fix: (#66) 어노테이션 추가
aiaiaiai1 7fa1caf
feat: (#66) 이미 선호 카테고리 목록에 있는 카테고리를 추가하는 경우를 검증하는 로직 추가
aiaiaiai1 d85e3bc
refactor: (#66) 카테고리에 대한 자세한 검증 보충
aiaiaiai1 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
This file contains 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
This file contains 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
12 changes: 12 additions & 0 deletions
12
backend/src/main/java/com/votogether/domain/member/repository/MemberCategoryRepository.java
This file contains 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,12 @@ | ||
package com.votogether.domain.member.repository; | ||
|
||
import com.votogether.domain.category.entity.Category; | ||
import com.votogether.domain.member.entity.Member; | ||
import com.votogether.domain.member.entity.MemberCategory; | ||
import java.util.Optional; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
public interface MemberCategoryRepository extends JpaRepository<MemberCategory, Long> { | ||
Optional<MemberCategory> findByMemberAndCategory(final Member member, final Category category); | ||
|
||
} |
This file contains 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 |
---|---|---|
|
@@ -21,7 +21,7 @@ class CategoryRepositoryTest { | |
|
||
@Nested | ||
@DisplayName("카테고리 저장") | ||
class save { | ||
class Saving { | ||
|
||
@Test | ||
@DisplayName("카테고리를 저장한다.") | ||
|
@@ -57,28 +57,49 @@ void saveButException() { | |
|
||
} | ||
|
||
@Test | ||
@DisplayName("모든 카테고리를 조회한다.") | ||
void getAllCategories() { | ||
// given | ||
Category category1 = Category.builder() | ||
.name("개발") | ||
.build(); | ||
Category category2 = Category.builder() | ||
.name("음식") | ||
.build(); | ||
|
||
categoryRepository.save(category1); | ||
categoryRepository.save(category2); | ||
|
||
// when | ||
List<Category> categories = categoryRepository.findAll(); | ||
|
||
// then | ||
assertAll( | ||
() -> assertThat(categories).hasSize(2), | ||
() -> assertThat(categories.get(0).getName()).isEqualTo("개발"), | ||
() -> assertThat(categories.get(1).getName()).isEqualTo("음식")); | ||
@Nested | ||
@DisplayName("카테고리 조회") | ||
class Finding { | ||
|
||
@Test | ||
@DisplayName("모든 카테고리를 조회한다.") | ||
void findAllCategories() { | ||
// given | ||
Category category1 = Category.builder() | ||
.name("개발") | ||
.build(); | ||
Category category2 = Category.builder() | ||
.name("음식") | ||
.build(); | ||
|
||
categoryRepository.save(category1); | ||
categoryRepository.save(category2); | ||
|
||
// when | ||
List<Category> categories = categoryRepository.findAll(); | ||
|
||
// then | ||
assertAll( | ||
() -> assertThat(categories).hasSize(2), | ||
() -> assertThat(categories.get(0).getName()).isEqualTo("개발"), | ||
() -> assertThat(categories.get(1).getName()).isEqualTo("음식")); | ||
} | ||
|
||
@Test | ||
@DisplayName("아이디를 통해 카테고리를 조회한다.") | ||
void findById() { | ||
// given | ||
Category category = Category.builder() | ||
.name("개발") | ||
.build(); | ||
categoryRepository.save(category); | ||
|
||
// when | ||
Category findCategory = categoryRepository.findById(category.getId()).get(); | ||
|
||
// then | ||
assertThat(findCategory).isSameAs(category); | ||
} | ||
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.
|
||
} | ||
|
||
} |
97 changes: 97 additions & 0 deletions
97
...d/src/test/java/com/votogether/domain/member/repository/MemberCategoryRepositoryTest.java
This file contains 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,97 @@ | ||
package com.votogether.domain.member.repository; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
import com.votogether.domain.RepositoryTest; | ||
import com.votogether.domain.category.entity.Category; | ||
import com.votogether.domain.category.repository.CategoryRepository; | ||
import com.votogether.domain.member.entity.Gender; | ||
import com.votogether.domain.member.entity.Member; | ||
import com.votogether.domain.member.entity.MemberCategory; | ||
import com.votogether.domain.member.entity.SocialType; | ||
import java.time.LocalDateTime; | ||
import org.junit.jupiter.api.DisplayName; | ||
import org.junit.jupiter.api.Test; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
|
||
@RepositoryTest | ||
class MemberCategoryRepositoryTest { | ||
|
||
@Autowired | ||
CategoryRepository categoryRepository; | ||
|
||
@Autowired | ||
MemberRepository memberRepository; | ||
|
||
@Autowired | ||
MemberCategoryRepository memberCategoryRepository; | ||
|
||
@Test | ||
@DisplayName("멤버가 선호하는 카테고리를 저장한다.") | ||
void save() { | ||
// given | ||
Category category = Category.builder() | ||
.name("개발") | ||
.build(); | ||
|
||
Member member = Member.builder() | ||
.gender(Gender.MALE) | ||
.point(0) | ||
.socialType(SocialType.GOOGLE) | ||
.nickname("user1") | ||
.socialId("kakao@gmail.com") | ||
.birthDate( | ||
LocalDateTime.of(1995, 07, 12, 00, 00)) | ||
.build(); | ||
|
||
categoryRepository.save(category); | ||
memberRepository.save(member); | ||
|
||
MemberCategory memberCategory = MemberCategory.builder() | ||
.member(member) | ||
.category(category) | ||
.build(); | ||
|
||
// when | ||
memberCategoryRepository.save(memberCategory); | ||
|
||
// then | ||
assertThat(memberCategory.getId()).isNotNull(); | ||
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.
|
||
assertThat(memberCategory.getCategory().getName()).isEqualTo("개발"); | ||
} | ||
|
||
@Test | ||
@DisplayName("멤버와 카테고리를 통해 멤버 카테고리를 조회한다.") | ||
void findByMemberAndCategory() { | ||
// given | ||
Category category = Category.builder() | ||
.name("개발") | ||
.build(); | ||
|
||
Member member = Member.builder() | ||
.gender(Gender.MALE) | ||
.point(0) | ||
.socialType(SocialType.GOOGLE) | ||
.nickname("user1") | ||
.socialId("kakao@gmail.com") | ||
.birthDate( | ||
LocalDateTime.of(1995, 07, 12, 00, 00)) | ||
.build(); | ||
|
||
MemberCategory memberCategory = MemberCategory.builder() | ||
.member(member) | ||
.category(category) | ||
.build(); | ||
|
||
categoryRepository.save(category); | ||
memberRepository.save(member); | ||
memberCategoryRepository.save(memberCategory); | ||
|
||
// when | ||
MemberCategory findMemberCategory = memberCategoryRepository.findByMemberAndCategory(member, category).get(); | ||
|
||
// then | ||
assertThat(findMemberCategory).isSameAs(memberCategory); | ||
} | ||
|
||
} |
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.
P1
: 멤버가 동일한 카테고리를 추가할 때의 상황에 대한 검증도 필요할 것 같아요!