[BE] feat: Club 페이징 적용 및 batch size 설정

backend/src/main/java/com/happy/friendogly/chat/dto/response/FindClubDetailsResponse.java

@@ -4,6 +4,7 @@
 import com.happy.friendogly.pet.domain.Gender;
 import com.happy.friendogly.pet.domain.SizeType;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public record FindClubDetailsResponse(
         Long clubId,
@@ -13,6 +14,15 @@ public record FindClubDetailsResponse(
 ) {
 
     public FindClubDetailsResponse(Long myMemberId, Club club) {
-        this(club.getId(), myMemberId, club.getAllowedSizes(), club.getAllowedGenders());
+        this(
+                club.getId(),
+                myMemberId,
+                club.getAllowedSizes().stream()
+                        .map(clubSize -> clubSize.getClubSizeId().getAllowedSize())
+                        .collect(Collectors.toSet()),
+                club.getAllowedGenders().stream()
+                        .map(clubGender -> clubGender.getClubGenderId().getAllowedGender())
+                        .collect(Collectors.toSet())
+        );
     }
 }

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

@@ -5,8 +5,8 @@
 import com.happy.friendogly.club.dto.request.SaveClubMemberRequest;
 import com.happy.friendogly.club.dto.request.SaveClubRequest;
 import com.happy.friendogly.club.dto.request.UpdateClubRequest;
-import com.happy.friendogly.club.dto.response.FindClubByFilterResponse;
 import com.happy.friendogly.club.dto.response.FindClubOwningResponse;
+import com.happy.friendogly.club.dto.response.FindClubPageByFilterResponse;
 import com.happy.friendogly.club.dto.response.FindClubParticipatingResponse;
 import com.happy.friendogly.club.dto.response.FindClubResponse;
 import com.happy.friendogly.club.dto.response.SaveClubMemberResponse;
@@ -49,7 +49,7 @@ public ApiResponse<FindClubResponse> findById(@Auth Long memberId, @PathVariable
     }
 
     @GetMapping("/searching")
-    public ApiResponse<List<FindClubByFilterResponse>> findByFilter(
+    public ApiResponse<FindClubPageByFilterResponse> findByFilter(
             @Auth Long memberId,
             @Valid @ModelAttribute FindClubByFilterRequest request
     ) {
@@ -105,5 +105,4 @@ public ResponseEntity<ApiResponse<UpdateClubResponse>> update(
         UpdateClubResponse response = clubCommandService.update(clubId, memberId, request);
         return ResponseEntity.ok(ApiResponse.ofSuccess(response));
     }
-
 }

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

@@ -8,9 +8,7 @@
 import com.happy.friendogly.pet.domain.Pet;
 import com.happy.friendogly.pet.domain.SizeType;
 import jakarta.persistence.CascadeType;
-import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -19,15 +17,12 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.NamedAttributeNode;
-import jakarta.persistence.NamedEntityGraph;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.OrderBy;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import lombok.AccessLevel;
@@ -36,15 +31,6 @@
 import lombok.NoArgsConstructor;
 
 @Entity
-@NamedEntityGraph(
-        name = "graph.Club",
-        attributeNodes = {
-                @NamedAttributeNode("clubMembers"),
-                @NamedAttributeNode("clubPets"),
-                @NamedAttributeNode("allowedSizes"),
-                @NamedAttributeNode("allowedGenders"),
-        }
-)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Getter
 public class Club {
@@ -62,18 +48,6 @@ public class Club {
     @Embedded
     private MemberCapacity memberCapacity;
 
-    @ElementCollection
-    @Enumerated(EnumType.STRING)
-    @CollectionTable(name = "club_gender", joinColumns = @JoinColumn(name = "club_id"))
-    @Column(name = "allowed_gender", nullable = false)
-    private Set<Gender> allowedGenders;
-
-    @ElementCollection
-    @Enumerated(EnumType.STRING)
-    @CollectionTable(name = "club_size", joinColumns = @JoinColumn(name = "club_id"))
-    @Column(name = "allowed_size", nullable = false)
-    private Set<SizeType> allowedSizes;
-
     @Embedded
     private Address address;
 
@@ -87,13 +61,18 @@ public class Club {
     @Column(name = "status", nullable = false)
     private Status status;
 
+    @OneToMany(mappedBy = "clubGenderId.club", orphanRemoval = true, cascade = CascadeType.ALL)
+    private List<ClubGender> allowedGenders = new ArrayList<>();
+
+    @OneToMany(mappedBy = "clubSizeId.club", orphanRemoval = true, cascade = CascadeType.ALL)
+    private List<ClubSize> allowedSizes = new ArrayList<>();
+
     @OneToMany(mappedBy = "clubMemberId.club", orphanRemoval = true, cascade = CascadeType.ALL)
     @OrderBy("createdAt")
-    private Set<ClubMember> clubMembers = new HashSet<>();
+    private List<ClubMember> clubMembers = new ArrayList<>();
 
     @OneToMany(mappedBy = "clubPetId.club", orphanRemoval = true, cascade = CascadeType.ALL)
-    @OrderBy
-    private Set<ClubPet> clubPets = new HashSet<>();
+    private List<ClubPet> clubPets = new ArrayList<>();
 
     @OneToOne(fetch = FetchType.LAZY, orphanRemoval = true, cascade = CascadeType.ALL)
     private ChatRoom chatRoom;
@@ -117,8 +96,8 @@ private Club(
         this.content = new Content(content);
         this.address = new Address(province, city, village);
         this.memberCapacity = new MemberCapacity(memberCapacity);
-        this.allowedGenders = allowedGenders;
-        this.allowedSizes = allowedSizes;
+        this.allowedGenders = allowedGenders.stream().map(gender -> new ClubGender(this, gender)).toList();
+        this.allowedSizes = allowedSizes.stream().map(sizeType -> new ClubSize(this, sizeType)).toList();
         this.imageUrl = imageUrl;
         this.status = status;
         this.createdAt = createdAt;
@@ -209,15 +188,19 @@ private void validateParticipatePet(Pet pet) {
     }
 
     private boolean canJoinWith(Pet pet) {
-        return allowedGenders.contains(pet.getGender()) && allowedSizes.contains(pet.getSizeType());
+        boolean isGenderMatch = allowedGenders.stream()
+                .anyMatch(clubGender -> clubGender.isSameGenderWith(pet.getGender()));
+        boolean isSizeMatch = allowedSizes.stream()
+                .anyMatch(clubSize -> clubSize.isSameSizeWith(pet.getSizeType()));
+
+        return isGenderMatch && isSizeMatch;
     }
 
     public boolean isJoinable(Member member, List<Pet> pets) {
         boolean hasJoinablePet = pets.stream()
                 .anyMatch(this::canJoinWith);
-        boolean isNotFull = !this.memberCapacity.isCapacityReached(countClubMember());
 
-        return hasJoinablePet && isNotFull && !isAlreadyJoined(member) && isOpen();
+        return hasJoinablePet && !isAlreadyJoined(member) && isOpen();
     }
 
     public void removeClubMember(Member member) {

backend/src/main/java/com/happy/friendogly/club/domain/ClubGender.java

@@ -0,0 +1,40 @@
+package com.happy.friendogly.club.domain;
+
+import com.happy.friendogly.exception.FriendoglyException;
+import com.happy.friendogly.pet.domain.Gender;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class ClubGender {
+
+    @EmbeddedId
+    private ClubGenderId clubGenderId;
+
+    public ClubGender(Club club, Gender gender) {
+        validateClub(club);
+        validateGender(gender);
+        this.clubGenderId = new ClubGenderId(club, gender);
+    }
+
+    private void validateClub(Club club) {
+        if (club == null) {
+            throw new FriendoglyException("모임 정보는 필수입니다.");
+        }
+    }
+
+    private void validateGender(Gender gender) {
+        if (gender == null) {
+            throw new FriendoglyException("모임에 참여하는 반려견의 성별 정보는 필수입니다.");
+        }
+    }
+
+    public boolean isSameGenderWith(Gender gender) {
+        return this.getClubGenderId().getAllowedGender() == gender;
+    }
+}

backend/src/main/java/com/happy/friendogly/club/domain/ClubGenderId.java

@@ -0,0 +1,33 @@
+package com.happy.friendogly.club.domain;
+
+import com.happy.friendogly.pet.domain.Gender;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.io.Serializable;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Embeddable
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+@EqualsAndHashCode
+public class ClubGenderId implements Serializable {
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "club_id", nullable = false)
+    private Club club;
+
+    @Enumerated(EnumType.STRING)
+    private Gender allowedGender;
+
+    public ClubGenderId(Club club, Gender allowedGender) {
+        this.club = club;
+        this.allowedGender = allowedGender;
+    }
+}

backend/src/main/java/com/happy/friendogly/club/domain/ClubPet.java

@@ -27,7 +27,7 @@ public ClubPet(Club club, Pet pet) {
 
     private void validateClub(Club club) {
         if (club == null) {
-            throw new FriendoglyException("모임에 참여하는 회원 정보는 필수입니다.");
+            throw new FriendoglyException("모임 정보는 필수입니다.");
         }
     }
 

backend/src/main/java/com/happy/friendogly/club/domain/ClubSize.java

@@ -0,0 +1,40 @@
+package com.happy.friendogly.club.domain;
+
+import com.happy.friendogly.exception.FriendoglyException;
+import com.happy.friendogly.pet.domain.SizeType;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class ClubSize {
+
+    @EmbeddedId
+    private ClubSizeId clubSizeId;
+
+    public ClubSize(Club club, SizeType sizeType) {
+        validateClub(club);
+        validateSizeType(sizeType);
+        this.clubSizeId = new ClubSizeId(club, sizeType);
+    }
+
+    private void validateClub(Club club) {
+        if (club == null) {
+            throw new FriendoglyException("모임 정보는 필수입니다.");
+        }
+    }
+
+    private void validateSizeType(SizeType sizeType) {
+        if (sizeType == null) {
+            throw new FriendoglyException("모임에 참여하는 반려견의 크기 정보는 필수입니다.");
+        }
+    }
+
+    public boolean isSameSizeWith(SizeType sizeType) {
+        return this.getClubSizeId().getAllowedSize() == sizeType;
+    }
+}

backend/src/main/java/com/happy/friendogly/club/domain/ClubSizeId.java

@@ -0,0 +1,33 @@
+package com.happy.friendogly.club.domain;
+
+import com.happy.friendogly.pet.domain.SizeType;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.io.Serializable;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Embeddable
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+@EqualsAndHashCode
+public class ClubSizeId implements Serializable {
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "club_id", nullable = false)
+    private Club club;
+
+    @Enumerated(EnumType.STRING)
+    private SizeType allowedSize;
+
+    public ClubSizeId(Club club, SizeType allowedSize) {
+        this.club = club;
+        this.allowedSize = allowedSize;
+    }
+}

backend/src/main/java/com/happy/friendogly/club/dto/request/FindClubByFilterRequest.java

@@ -2,6 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
 import java.util.Set;
 
 public record FindClubByFilterRequest(
@@ -19,7 +20,20 @@ public record FindClubByFilterRequest(
         Set<String> genderParams,
 
         @NotEmpty(message = "반려견 크기 검색 조건은 필수입니다.")
-        Set<String> sizeParams
+        Set<String> sizeParams,
+
+        /**
+         * TODO: 일단 nullable 하게 변경.
+         *       안드로이드 페이징 코드 머지됐을 때 non-nullable하게 바꾸기 (일부러 타입도 wrapper 타입으로 변경해둠)
+         */
+//        @Positive(message = "페이지 사이즈는 1 이상의 정수 입니다.")
+        Integer pageSize,
+
+//        @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+        LocalDateTime lastFoundCreatedAt,
+
+//        @PositiveOrZero(message = "마지막으로 조회한 모임 ID는 0 이상의 정수 입니다.")
+        Long lastFoundId
 ) {
 
 }

backend/src/main/java/com/happy/friendogly/club/dto/response/FindClubByFilterResponse.java

@@ -7,6 +7,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public record FindClubByFilterResponse(
         Long id,
@@ -22,7 +23,6 @@ public record FindClubByFilterResponse(
         int currentMemberCount,
         String imageUrl,
         List<String> petImageUrls
-
 ) {
 
     public FindClubByFilterResponse(
@@ -37,8 +37,12 @@ public FindClubByFilterResponse(
                 new AddressDetailResponse(club.getAddress()),
                 club.getStatus(),
                 club.getCreatedAt(),
-                club.getAllowedGenders(),
-                club.getAllowedSizes(),
+                club.getAllowedGenders().stream()
+                        .map(clubGender -> clubGender.getClubGenderId().getAllowedGender())
+                        .collect(Collectors.toSet()),
+                club.getAllowedSizes().stream()
+                        .map(clubSize -> clubSize.getClubSizeId().getAllowedSize())
+                        .collect(Collectors.toSet()),
                 club.getMemberCapacity().getValue(),
                 club.countClubMember(),
                 club.getImageUrl(),