[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 #269

J-I-H-O · 2024-07-31T08:59:15Z

이슈

개발 사항

모임 상세 조회 API 구현
모임 검색 API에 필터링 조건 추가
모임 더미데이터 추가
모임 상세에 isMine 필드 추가
모임 도메인 이미지 적용

전달 사항

테스트는 아직 작성하지 않았습니다.
- 필터 조건이 ABLE_TO_JOIN, OPEN 인 경우의 테스트 미작성
- Club 도메인 로직 테스트 미작성
ClubQueryServie#findSeaching() 의 분기문을 어떻게 리팩토링 할지 함께 고민 부탁드립니다.

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

github-actions · 2024-07-31T09:00:24Z

Unit Test Results

111 tests 111 ✔️ 6s ⏱️
  23 suites     0 💤
  23 files     0 ❌

Results for commit 0119032.

♻️ This comment has been updated with latest results.

takoyakimchi

고생하셨습니다~~ 잘 안 읽히는 부분 코멘트 남겨봤어요!

takoyakimchi · 2024-08-01T01:02:37Z

backend/src/main/java/com/woowacourse/friendogly/club/controller/ClubController.java

+        return ApiResponse.ofSuccess(clubQueryService.findById(memberId, id));
+    }
+
+    // TODO: @ModelAttribute


@ModelAttribute 이건 어디에 쓸 예정인가요??

현재 여러 개의 쿼리 파라미터를 DTO 객체로 한 번에 받고 있습니다.
이 경우 @ModelAttribute 를 생략할 수 있지만, 해당 요청에 필요한 값을 path parameter로 받는지, query parameter로 받는지, 혹은 body로 받는지 혼동이 있을 수 있다고 생각했어요. 실제로 저희도 개발 중에 헷갈리기도 했구요 ㅎㅎ;

쿼리 파라미터로 요청 받음을 명확하게 표현하기 위해 해당 어노테이션을 붙이는 것을 고려하고 있어요! 트레와 도도의 의견도 궁금합니다~

굿입니다~~!!

takoyakimchi · 2024-08-01T01:03:14Z

backend/src/main/java/com/woowacourse/friendogly/club/domain/Club.java

+        if (isAlreadyJoined(member)) {
            throw new FriendoglyException("이미 참여 중인 모임입니다.");
        }


메서드 분리 좋네요

takoyakimchi · 2024-08-01T01:04:17Z

backend/src/main/java/com/woowacourse/friendogly/club/domain/Club.java

+        if (canNotJoin(pet)) {
            throw new FriendoglyException("모임에 데려갈 수 없는 강아지가 있습니다.");
        }
    }

+    private boolean canNotJoin(Pet pet) {
+        return !allowedGenders.contains(pet.getGender()) || !allowedSizes.contains(pet.getSizeType());
+    }


Suggested change

if (canNotJoin(pet)) {

throw new FriendoglyException("모임에 데려갈 수 없는 강아지가 있습니다.");

}

}

private boolean canNotJoin(Pet pet) {

return !allowedGenders.contains(pet.getGender()) || !allowedSizes.contains(pet.getSizeType());

}

if (!canJoin(pet)) {

throw new FriendoglyException("모임에 데려갈 수 없는 강아지가 있습니다.");

}

}

private boolean canJoin(Pet pet) {

return allowedGenders.contains(pet.getGender()) && allowedSizes.contains(pet.getSizeType());

}

not 절이 많아서 읽기 어려울 수 있겠네요
not이 2개인 것 보다는 하나인 게 나을 것 같은데, 이렇게 바꾸는 건 어떨까요?

이건 그냥 제안인데
자연어에 가까운 메서드 네이밍을 해보자면
club.canBeJoinedBy(pet) 이런 이름도 괜찮을 것 같아요

canJoinWith로 변경했습니다.

takoyakimchi · 2024-08-01T02:14:14Z

backend/src/main/java/com/woowacourse/friendogly/club/domain/FilterCondition.java

+    public static FilterCondition toFilterCondition(String filterCondition) {
+        try {
+            return valueOf(filterCondition);
+        } catch (IllegalArgumentException e) {
+            throw new FriendoglyException("존재하지 않는 FilterCondition 입니다.");
+        }
+    }


간단하게 가도 좋을듯요

Suggested change

public static FilterCondition toFilterCondition(String filterCondition) {

try {

return valueOf(filterCondition);

} catch (IllegalArgumentException e) {

throw new FriendoglyException("존재하지 않는 FilterCondition 입니다.");

}

}

public static FilterCondition from(String filterCondition) {

try {

return valueOf(filterCondition);

} catch (IllegalArgumentException e) {

throw new FriendoglyException("존재하지 않는 FilterCondition 입니다.");

}

}

DTO 컨밴션이랑 헷갈렸습니다. 반영완료요

takoyakimchi · 2024-08-01T02:16:34Z

backend/src/main/java/com/woowacourse/friendogly/club/service/ClubQueryService.java

+        if (FilterCondition.toFilterCondition(request.filterCondition()) == FilterCondition.ABLE_TO_JOIN) {
+            return clubs.stream()
+                    .filter(club -> club.isJoinable(member, pets))
+                    .map(club -> new FindSearchingClubResponse(club, collectOverviewPetImages(club)))
+                    .toList();
+        }


Suggested change

if (FilterCondition.toFilterCondition(request.filterCondition()) == FilterCondition.ABLE_TO_JOIN) {

return clubs.stream()

.filter(club -> club.isJoinable(member, pets))

.map(club -> new FindSearchingClubResponse(club, collectOverviewPetImages(club)))

.toList();

}

if (FilterCondition.from(request.filterCondition()) == ABLE_TO_JOIN) {

return clubs.stream()

.filter(club -> club.isJoinable(member, pets))

.map(club -> new FindSearchingClubResponse(club, collectOverviewPetImages(club)))

.toList();

}

filter condition이라는 말이 너무 많아서 헷갈리는데
메서드명 개선하고 static import 하면 어떨까요?

동일성 비교를 enum 내부로 보내면서 개선해봤습니다.

takoyakimchi · 2024-08-01T02:18:52Z

backend/src/main/java/com/woowacourse/friendogly/club/controller/ClubController.java

+    public ApiResponse<List<FindSearchingClubResponse>> findSearching(
+            @Auth Long memberId,
+            @Valid FindSearchingClubRequest request
+    ) {
+        return ApiResponse.ofSuccess(clubQueryService.findSearching(memberId, request));


이거 findByFilter 하면 안 되나요 (5트)
찾다 찾다
검색을 찾다
와닿으시는지...

수정 완료 했습니다.!!

takoyakimchi · 2024-08-01T02:20:14Z

backend/src/test/java/com/woowacourse/friendogly/club/service/ClubQueryServiceTest.java

        FindSearchingClubRequest request = new FindSearchingClubRequest(
+                FilterCondition.ALL.name(),
                address,


takoyakimchi · 2024-08-01T02:21:51Z

backend/src/main/java/com/woowacourse/friendogly/club/domain/Club.java

+    public boolean isJoinable(Member member, List<Pet> pets) {
+        boolean hasJoinablePet = pets.stream()
+                .anyMatch(pet -> !canNotJoin(pet));
+        boolean isNotFull = !this.memberCapacity.isCapacityReached(countClubMember());
+
+        return hasJoinablePet && isNotFull && isAlreadyJoined(member) && isOpen();
+    }


Suggested change

public boolean isJoinable(Member member, List<Pet> pets) {

boolean hasJoinablePet = pets.stream()

.anyMatch(pet -> !canNotJoin(pet));

boolean isNotFull = !this.memberCapacity.isCapacityReached(countClubMember());

return hasJoinablePet && isNotFull && isAlreadyJoined(member) && isOpen();

}

public boolean isJoinable(Member member, List<Pet> pets) {

boolean hasJoinablePet = pets.stream()

.anyMatch(pet -> canJoin(pet));

boolean isNotFull = !this.memberCapacity.isCapacityReached(countClubMember());

return hasJoinablePet && isNotFull && isAlreadyJoined(member) && isOpen();

}

아까 리뷰 반영하신다면 이렇게 쓸 수 있어서 더 깔끔할 것 같아요!

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

ehtjsv2

클럽 단건 조회에 내강아지인지가 빠진 것 같은데 수정하고 있다고하니 기다리겠습니다~!

ehtjsv2 · 2024-08-01T03:59:08Z

backend/src/main/java/com/woowacourse/friendogly/club/service/ClubQueryService.java

-        return clubRepository.findAll(spec).stream()
+        List<Club> clubs = clubRepository.findAll(spec);
+
+        if (FilterCondition.toFilterCondition(request.filterCondition()) == FilterCondition.ABLE_TO_JOIN) {


if문안에 많은 괄호가 있어서 if문의 조건이 흐려지는 것 같아요!

Suggested change

if (FilterCondition.toFilterCondition(request.filterCondition()) == FilterCondition.ABLE_TO_JOIN) {

FilterCondition filterConditon = FilterCondition.toFilterCondition(request.filterCondition());

if (filterCondition == FilterCondition.ABLE_TO_JOIN) {

// OR if (filterCondition.isJoinable()) {

오 enum class 안에 로직을 넣어버리는게 제일 깔끔하겠네요

오 트레 피드백 반영하면서, 적용했습니다.

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

takoyakimchi

👍 LGTM

takoyakimchi · 2024-08-01T07:39:37Z

backend/src/main/java/com/woowacourse/friendogly/club/service/ClubQueryService.java

@@ -36,7 +37,7 @@ public ClubQueryService(
        this.petRepository = petRepository;
    }

-    public List<FindSearchingClubResponse> findSearching(Long memberId, FindSearchingClubRequest request) {
+    public List<FindSearchingClubResponse> findFindByFilter(Long memberId, FindSearchingClubRequest request) {


Suggested change

public List<FindSearchingClubResponse> findFindByFilter(Long memberId, FindSearchingClubRequest request) {

public List<FindSearchingClubResponse> findByFilter(Long memberId, FindSearchingClubRequest request) {

😉

Co-authored-by: jimi567 <repday0609@gmail.com>

J-I-H-O and others added 2 commits July 31, 2024 16:33

feat: 모임 상세 정보 조회 API 구현

b7faadd

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

feat: 모임 검색 조건 필드 추가

5a34a16

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

J-I-H-O added 📝 docs docs 🖥 backend backend ✨ feat 기능 개발 labels Jul 31, 2024

J-I-H-O requested review from takoyakimchi and ehtjsv2 July 31, 2024 08:59

J-I-H-O assigned jimi567 and J-I-H-O Jul 31, 2024

takoyakimchi requested changes Aug 1, 2024

View reviewed changes

J-I-H-O and others added 2 commits August 1, 2024 11:48

feat: 모임 상세 조회 시 내 강아지 여부를 판별하는 필드 추가

18b1ae1

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

chore: 모임 더미 데이터 추가

ed753c1

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

ehtjsv2 requested changes Aug 1, 2024

View reviewed changes

J-I-H-O and others added 4 commits August 1, 2024 15:03

refactor: 메서드 분리 및 메서드명 명확히 변경

4437d46

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

refactor: @ModelAttribute 적용

be75fca

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

feat: 모임 이미지 등록 적용

05404ce

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

feat: 자신이 주인이 아닌 반려견과 모임에 참여하지 못하도록 검증 추가

0119032

Co-authored-by: J-I-H-O <jeongjiho0731@gmail.com> Co-authored-by: jimi567 <repday0609@gmail.com>

takoyakimchi approved these changes Aug 1, 2024

View reviewed changes

J-I-H-O requested review from jimi567 and removed request for jimi567 August 1, 2024 08:28

ehtjsv2 approved these changes Aug 1, 2024

View reviewed changes

J-I-H-O merged commit 7b372e4 into develop Aug 1, 2024
3 checks passed

J-I-H-O deleted the feature/club-find-api branch August 1, 2024 10:34

ehtjsv2 pushed a commit that referenced this pull request Aug 3, 2024

[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 (#269)

28a3581

Co-authored-by: jimi567 <repday0609@gmail.com>

takoyakimchi pushed a commit that referenced this pull request Oct 23, 2024

[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 (#269)

ade9e94

Co-authored-by: jimi567 <repday0609@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 #269

[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 #269

J-I-H-O commented Jul 31, 2024 •

edited

Loading

github-actions bot commented Jul 31, 2024 •

edited

Loading

takoyakimchi left a comment

takoyakimchi Aug 1, 2024 •

edited

Loading

J-I-H-O Aug 1, 2024

takoyakimchi Aug 1, 2024

takoyakimchi Aug 1, 2024

takoyakimchi Aug 1, 2024

takoyakimchi Aug 1, 2024

jimi567 Aug 1, 2024

takoyakimchi Aug 1, 2024

jimi567 Aug 1, 2024

takoyakimchi Aug 1, 2024

jimi567 Aug 1, 2024 •

edited

Loading

takoyakimchi Aug 1, 2024

jimi567 Aug 1, 2024

takoyakimchi Aug 1, 2024

takoyakimchi Aug 1, 2024

ehtjsv2 left a comment

ehtjsv2 Aug 1, 2024

takoyakimchi Aug 1, 2024

jimi567 Aug 1, 2024

takoyakimchi left a comment

takoyakimchi Aug 1, 2024

-        if (FilterCondition.toFilterCondition(request.filterCondition()) == FilterCondition.ABLE_TO_JOIN) {
+        FilterCondition filterConditon = FilterCondition.toFilterCondition(request.filterCondition());
+        if (filterCondition == FilterCondition.ABLE_TO_JOIN) {
+        // OR if (filterCondition.isJoinable()) {

	public List<FindSearchingClubResponse> findFindByFilter(Long memberId, FindSearchingClubRequest request) {
	public List<FindSearchingClubResponse> findByFilter(Long memberId, FindSearchingClubRequest request) {

[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 #269

[BE] feat: 모임 상세 조회 API 구현 및 검색 필터링 조건 추가 #269

Conversation

J-I-H-O commented Jul 31, 2024 • edited Loading

이슈

개발 사항

전달 사항

github-actions bot commented Jul 31, 2024 • edited Loading

Unit Test Results

takoyakimchi left a comment

Choose a reason for hiding this comment

takoyakimchi Aug 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jimi567 Aug 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ehtjsv2 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

takoyakimchi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

J-I-H-O commented Jul 31, 2024 •

edited

Loading

github-actions bot commented Jul 31, 2024 •

edited

Loading

takoyakimchi Aug 1, 2024 •

edited

Loading

jimi567 Aug 1, 2024 •

edited

Loading