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

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

@@ -4,6 +4,7 @@
 import com.woowacourse.friendogly.club.dto.request.FindSearchingClubRequest;
 import com.woowacourse.friendogly.club.dto.request.SaveClubMemberRequest;
 import com.woowacourse.friendogly.club.dto.request.SaveClubRequest;
+import com.woowacourse.friendogly.club.dto.response.FindClubResponse;
 import com.woowacourse.friendogly.club.dto.response.FindSearchingClubResponse;
 import com.woowacourse.friendogly.club.dto.response.SaveClubMemberResponse;
 import com.woowacourse.friendogly.club.dto.response.SaveClubResponse;
@@ -34,9 +35,18 @@ public ClubController(ClubCommandService clubCommandService, ClubQueryService cl
         this.clubQueryService = clubQueryService;
     }
 
+    @GetMapping("/{id}")
+    public ApiResponse<FindClubResponse> findById(@Auth Long memberId, @PathVariable Long id) {
+        return ApiResponse.ofSuccess(clubQueryService.findById(memberId, id));
+    }
+
+    // TODO: @ModelAttribute
     @GetMapping("/searching")
-    public ApiResponse<List<FindSearchingClubResponse>> findSearching(@Valid FindSearchingClubRequest request) {
-        return ApiResponse.ofSuccess(clubQueryService.findSearching(request));
+    public ApiResponse<List<FindSearchingClubResponse>> findSearching(
+            @Auth Long memberId,
+            @Valid FindSearchingClubRequest request
+    ) {
+        return ApiResponse.ofSuccess(clubQueryService.findSearching(memberId, request));
     }
 
     @PostMapping

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

@@ -137,12 +137,16 @@ public void addClubMember(Member member) {
     }
 
     private void validateAlreadyExists(Member member) {
-        if (clubMembers.stream()
-                .anyMatch(clubMember -> clubMember.isSameMember(member))) {
+        if (isAlreadyJoined(member)) {
             throw new FriendoglyException("이미 참여 중인 모임입니다.");
         }
     }
 
+    public boolean isAlreadyJoined(Member member) {
+        return clubMembers.stream()
+                .anyMatch(clubMember -> clubMember.isSameMember(member));
+    }
+
     private void validateMemberCapacity() {
         if (memberCapacity.isCapacityReached(countClubMember())) {
             throw new FriendoglyException("최대 인원을 초과하여 모임에 참여할 수 없습니다.");
@@ -158,11 +162,23 @@ public void addClubPet(List<Pet> pets) {
     }
 
     private void validateParticipatePet(Pet pet) {
-        if (!allowedGenders.contains(pet.getGender()) || !allowedSizes.contains(pet.getSizeType())) {
+        if (canNotJoin(pet)) {
             throw new FriendoglyException("모임에 데려갈 수 없는 강아지가 있습니다.");
         }
     }
 
+    private boolean canNotJoin(Pet pet) {
+        return !allowedGenders.contains(pet.getGender()) || !allowedSizes.contains(pet.getSizeType());
+    }
+
+    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 void removeClubMember(Member member) {
         ClubMember targetClubMember = findTargetClubMember(member);
         clubMembers.remove(targetClubMember);
@@ -197,14 +213,22 @@ public boolean isEmpty() {
         return clubMembers.isEmpty();
     }
 
-    public boolean isOwner(ClubMember target) {
-        return findOwner().isSameMember(target.getClubMemberPk().getMember());
+    public boolean isOpen() {
+        return this.status == Status.OPEN;
+    }
+
+    public boolean isOwner(Member targetMember) {
+        return findOwner().isSameMember(targetMember);
     }
 
     public Name findOwnerName() {
         return findOwner().getClubMemberPk().getMember().getName();
     }
 
+    public String findOwnerImageUrl() {
+        return findOwner().getClubMemberPk().getMember().getImageUrl();
+    }
+
     private ClubMember findOwner() {
         return clubMembers.stream()
                 .min(Comparator.comparing(ClubMember::getCreatedAt))

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

@@ -0,0 +1,18 @@
+package com.woowacourse.friendogly.club.domain;
+
+import com.woowacourse.friendogly.exception.FriendoglyException;
+
+public enum FilterCondition {
+
+    ALL,
+    OPEN,
+    ABLE_TO_JOIN;
+
+    public static FilterCondition toFilterCondition(String filterCondition) {
+        try {
+            return valueOf(filterCondition);
+        } catch (IllegalArgumentException e) {
+            throw new FriendoglyException("존재하지 않는 FilterCondition 입니다.");
+        }
+    }
+}

backend/src/main/java/com/woowacourse/friendogly/club/dto/request/FindSearchingClubRequest.java

@@ -7,6 +7,9 @@
 import java.util.Set;
 
 public record FindSearchingClubRequest(
+        @NotBlank(message = "필터링 조건은 필수입니다.")
+        String filterCondition,
+
         @NotBlank(message = "주소 정보는 필수입니다.")
         String address,
 

backend/src/main/java/com/woowacourse/friendogly/club/dto/response/ClubMemberDetailResponse.java

@@ -0,0 +1,14 @@
+package com.woowacourse.friendogly.club.dto.response;
+
+import com.woowacourse.friendogly.member.domain.Member;
+
+public record ClubMemberDetailResponse(
+        Long id,
+        String name,
+        String imageUrl
+) {
+
+    public ClubMemberDetailResponse(Member member) {
+        this(member.getId(), member.getName().getValue(), member.getImageUrl());
+    }
+}

backend/src/main/java/com/woowacourse/friendogly/club/dto/response/ClubPetDetailResponse.java

@@ -0,0 +1,15 @@
+package com.woowacourse.friendogly.club.dto.response;
+
+import com.woowacourse.friendogly.pet.domain.Pet;
+
+public record ClubPetDetailResponse(
+        Long id,
+        String name,
+        String imageUrl,
+        boolean isMine
+){
+
+    public ClubPetDetailResponse(Pet pet, boolean isMine) {
+        this(pet.getId(),pet.getName().getValue(), pet.getImageUrl(), isMine);
+    }
+}

backend/src/main/java/com/woowacourse/friendogly/club/dto/response/FindClubResponse.java

@@ -0,0 +1,62 @@
+package com.woowacourse.friendogly.club.dto.response;
+
+import com.woowacourse.friendogly.club.domain.Club;
+import com.woowacourse.friendogly.club.domain.Status;
+import com.woowacourse.friendogly.member.domain.Member;
+import com.woowacourse.friendogly.pet.domain.Gender;
+import com.woowacourse.friendogly.pet.domain.Pet;
+import com.woowacourse.friendogly.pet.domain.SizeType;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+public record FindClubResponse(
+        Long id,
+        String title,
+        String content,
+        String ownerMemberName,
+        String address,
+        Status status,
+        LocalDateTime createdAt,
+        Set<Gender> allowedGender,
+        Set<SizeType> allowedSize,
+        int memberCapacity,
+        int currentMemberCount,
+        String imageUrl,
+        String ownerImageUrl,
+        boolean isMine,
+        boolean alreadyParticipate,
+        boolean canParticipate,
+        List<ClubMemberDetailResponse> memberDetails,
+        List<ClubPetDetailResponse> petDetails
+) {
+
+    public FindClubResponse(Club club, Member member, List<Pet> myPets) {
+        this(
+                club.getId(),
+                club.getTitle().getValue(),
+                club.getContent().getValue(),
+                club.findOwnerName().getValue(),
+                club.getAddress().getValue(),
+                club.getStatus(),
+                club.getCreatedAt(),
+                club.getAllowedGenders(),
+                club.getAllowedSizes(),
+                club.getMemberCapacity().getValue(),
+                club.countClubMember(),
+                club.getImageUrl(),
+                club.findOwnerImageUrl(),
+                club.isOwner(member),
+                club.isAlreadyJoined(member),
+                club.isJoinable(member, myPets),
+                club.getClubMembers().stream()
+                        .map(clubMember -> clubMember.getClubMemberPk().getMember())
+                        .map(ClubMemberDetailResponse::new)
+                        .toList(),
+                club.getClubPets().stream()
+                        .map(clubPet -> clubPet.getClubPetPk().getPet())
+                        .map(pet -> new ClubPetDetailResponse(pet, pet.isOwner(member)))
+                        .toList()
+        );
+    }
+}

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

@@ -1,11 +1,16 @@
 package com.woowacourse.friendogly.club.service;
 
 import com.woowacourse.friendogly.club.domain.Club;
+import com.woowacourse.friendogly.club.domain.FilterCondition;
 import com.woowacourse.friendogly.club.dto.request.FindSearchingClubRequest;
+import com.woowacourse.friendogly.club.dto.response.FindClubResponse;
 import com.woowacourse.friendogly.club.dto.response.FindSearchingClubResponse;
 import com.woowacourse.friendogly.club.repository.ClubRepository;
 import com.woowacourse.friendogly.club.repository.ClubSpecification;
+import com.woowacourse.friendogly.member.domain.Member;
+import com.woowacourse.friendogly.member.repository.MemberRepository;
 import com.woowacourse.friendogly.pet.domain.Pet;
+import com.woowacourse.friendogly.pet.repository.PetRepository;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -18,23 +23,56 @@
 public class ClubQueryService {
 
     private final ClubRepository clubRepository;
+    private final MemberRepository memberRepository;
+    private final PetRepository petRepository;
 
-    public ClubQueryService(ClubRepository clubRepository) {
+    public ClubQueryService(
+            ClubRepository clubRepository,
+            MemberRepository memberRepository,
+            PetRepository petRepository
+    ) {
         this.clubRepository = clubRepository;
+        this.memberRepository = memberRepository;
+        this.petRepository = petRepository;
     }
 
-    public List<FindSearchingClubResponse> findSearching(FindSearchingClubRequest request) {
+    public List<FindSearchingClubResponse> findSearching(Long memberId, FindSearchingClubRequest request) {
+        Member member = memberRepository.getById(memberId);
+        List<Pet> pets = petRepository.findByMemberId(memberId);
+
         Specification<Club> spec = ClubSpecification.where()
                 .equalsAddress(request.address())
                 .hasGenders(request.genderParams())
                 .hasSizeTypes(request.sizeParams())
                 .build();
 
-        return clubRepository.findAll(spec).stream()
+        List<Club> clubs = clubRepository.findAll(spec);
+
+        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.toFilterCondition(request.filterCondition()) == FilterCondition.OPEN) {
+            return clubs.stream()
+                    .filter(Club::isOpen)
+                    .map(club -> new FindSearchingClubResponse(club, collectOverviewPetImages(club)))
+                    .toList();
+        }
+        return clubs.stream()
                 .map(club -> new FindSearchingClubResponse(club, collectOverviewPetImages(club)))
                 .toList();
     }
 
+    public FindClubResponse findById(Long memberId, Long id) {
+        Club club = clubRepository.getById(id);
+        Member member = memberRepository.getById(memberId);
+        List<Pet> pets = petRepository.findByMemberId(memberId);
+
+        return new FindClubResponse(club, member, pets);
+    }
+
     private List<String> collectOverviewPetImages(Club club) {
         Map<Long, List<Pet>> groupPetsByMemberId = club.getClubPets()
                 .stream()

backend/src/main/java/com/woowacourse/friendogly/pet/domain/Pet.java

@@ -76,4 +76,8 @@ private void validateMember(Member member) {
             throw new FriendoglyException("member는 null일 수 없습니다.");
         }
     }
+
+    public boolean isOwner(Member member) {
+        return this.member.getId().equals(member.getId());
+    }
 }

backend/src/main/resources/data.sql

@@ -34,3 +34,28 @@ VALUES (1, '부', '곰돌이 컷 원조가 저에요~!', '2010-04-01', 'SMALL',
         'https://mblogthumb-phinf.pstatic.net/MjAxNzA0MjhfMjg5/MDAxNDkzMzQzOTgxMDQy.4u283s2rrib7xSWR5IdL1r_yiipEITnM6VofjaJsZPUg.oTUM6w8LeF-orpapq_S8j45mjRxjofwrpq8jhQ5LC5Eg.PNG.fjvfeewt/20170428_104509.png?type=w800'),
        (8, '초코', '매일 저녁에 나와요!', '2017-12-01', 'MEDIUM', 'FEMALE',
         'https://cdn.pixabay.com/photo/2019/12/08/21/09/animal-4682251_960_720.jpg');
+
+INSERT INTO club (title, content, member_capacity, address, image_url, created_at, status)
+VALUES ('전국구 강아지 모임', '주먹이 가장 매운 강이지 모임', 3, '서울 송파구 신천동', 'http://example.com/image.jpg', '2023-08-01 12:00:00', 'OPEN'),
+       ('미녀 강아지 모임', '예쁜 강아지 모임', 5, '서울 송파구 신천동', 'http://example.com/image.jpg', '2023-07-31 01:00:00', 'OPEN');
+
+INSERT INTO club_gender (club_id, allowed_gender)
+VALUES (1, 'MALE'),
+       (1, 'FEMALE'),
+       (2, 'MALE_NEUTERED'),
+       (2, 'FEMALE_NEUTERED');
+
+INSERT INTO club_size (club_id, allowed_size)
+VALUES (1, 'LARGE'),
+       (2, 'SMALL'),
+       (2, 'MEDIUM');
+
+INSERT INTO club_member (club_id, member_id, created_at)
+VALUES (1, 6, '2023-07-31 01:00:00'),
+       (2, 5, '2023-07-31 01:00:00'),
+       (2, 7, '2023-07-31 02:00:00');
+
+INSERT INTO club_pet (club_id, pet_id)
+VALUES (1, 6),
+       (2, 5),
+       (2, 7);

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

@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import com.woowacourse.friendogly.club.domain.Club;
-import com.woowacourse.friendogly.club.domain.ClubMember;
 import com.woowacourse.friendogly.club.dto.request.SaveClubMemberRequest;
 import com.woowacourse.friendogly.club.dto.request.SaveClubRequest;
 import com.woowacourse.friendogly.club.dto.response.SaveClubResponse;
@@ -166,7 +165,7 @@ void deleteClubMember() {
 
         assertAll(
                 () -> assertThat(savedClub.countClubMember()).isEqualTo(1),
-                () -> assertThat(savedClub.isOwner(ClubMember.create(savedClub, savedNewMember))).isTrue()
+                () -> assertThat(savedClub.isOwner(savedNewMember)).isTrue()
         );
     }
 

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

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import com.woowacourse.friendogly.club.domain.Club;
+import com.woowacourse.friendogly.club.domain.FilterCondition;
 import com.woowacourse.friendogly.club.dto.request.FindSearchingClubRequest;
 import com.woowacourse.friendogly.club.dto.response.FindSearchingClubResponse;
 import com.woowacourse.friendogly.member.domain.Member;
@@ -43,12 +44,13 @@ void findSearching() {
         );
 
         FindSearchingClubRequest request = new FindSearchingClubRequest(
+                FilterCondition.ALL.name(),
                 address,
                 Set.of(Gender.FEMALE),
                 Set.of(SizeType.SMALL)
         );
 
-        List<FindSearchingClubResponse> responses = clubQueryService.findSearching(request);
+        List<FindSearchingClubResponse> responses = clubQueryService.findSearching(savedMember.getId(), request);
         List<FindSearchingClubResponse> expectedResponses = List.of(
                 new FindSearchingClubResponse(club, List.of(petImageUrl))
         );
@@ -82,12 +84,13 @@ void findSearching_Nothing() {
         );
 
         FindSearchingClubRequest request = new FindSearchingClubRequest(
+                FilterCondition.ALL.name(),
                 address,
                 Set.of(Gender.MALE),
                 Set.of(SizeType.SMALL)
         );
 
-        List<FindSearchingClubResponse> responses = clubQueryService.findSearching(request);
+        List<FindSearchingClubResponse> responses = clubQueryService.findSearching(savedMember.getId(), request);
 
         assertThat(responses.isEmpty()).isTrue();
     }