[FEAT] 모임 PENDING 목록 조회 구현

[FEAT] 모임 PENDING 목록 조회 구현

Author: LimdaeIl

src/main/java/team/wego/wegobackend/group/domain/exception/GroupErrorCode.java

@@ -9,6 +9,9 @@
 @RequiredArgsConstructor
 public enum GroupErrorCode implements ErrorCode {
 
+    NO_PERMISSION_TO_VIEW_JOIN_REQUESTS(HttpStatus.FORBIDDEN,
+            "모임: 참여 요청 목록 조회 권한이 없습니다. 모임 ID: %s 회원 ID: %s"),
+    JOIN_REQUEST_MESSAGE_TOO_LONG(HttpStatus.BAD_REQUEST, "모임: 모임 메시지는 300자 이하입니다."),
     // 이미지 검증 / 정렬 / 업로드
     INVALID_GROUP_IMAGE_ITEM(HttpStatus.BAD_REQUEST,
             "모임: images 항목이 올바르지 않습니다. 모임 ID: %s 회원 ID: %s"),

src/main/java/team/wego/wegobackend/group/v2/application/dto/common/JoinRequestItem.java

@@ -0,0 +1,18 @@
+package team.wego.wegobackend.group.v2.application.dto.common;
+
+import java.time.LocalDateTime;
+import team.wego.wegobackend.group.v2.domain.entity.GroupUserV2Status;
+
+public record JoinRequestItem(
+        Long userId,
+        String nickName,
+        String profileImage,
+        Long groupUserId,
+        GroupUserV2Status status,
+        LocalDateTime joinedAt,
+        String joinRequestMessage
+) {
+
+}
+
+

src/main/java/team/wego/wegobackend/group/v2/application/dto/request/AttendGroupV2Request.java

@@ -0,0 +1,11 @@
+package team.wego.wegobackend.group.v2.application.dto.request;
+
+import jakarta.validation.constraints.Size;
+
+public record AttendGroupV2Request(
+        @Size(max = 300, message = "모임: 모임 메시지는 최대 300자 이하입니다.")
+        String message
+) {
+
+}
+

src/main/java/team/wego/wegobackend/group/v2/application/dto/request/UpdateGroupV2Request.java

@@ -12,9 +12,9 @@
  * “이미지 변경 없음” 으로 가자 빈 리스트([])면 “이미지 전체 삭제”(정책 허용 시) 하자
  */
 public record UpdateGroupV2Request(
-        @Size(max = 50)
+        @Size(max = 50, message = "모임: 모임 제목은 50자 이하 입니다.")
         String title,
-        @Size(max = 300)
+        @Size(max = 300, message = "모임: 모임 설명은 300자 이하 입니다.")
         String description,
 
         String location,

src/main/java/team/wego/wegobackend/group/v2/application/dto/response/GroupJoinRequestsResponse.java

@@ -0,0 +1,28 @@
+package team.wego.wegobackend.group.v2.application.dto.response;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import team.wego.wegobackend.group.v2.application.dto.common.JoinRequestItem;
+import team.wego.wegobackend.group.v2.domain.entity.GroupUserV2Status;
+
+public record GroupJoinRequestsResponse(
+        Long groupId,
+        GroupUserV2Status status,
+        int count,
+        List<JoinRequestItem> items,
+        LocalDateTime serverTime
+) {
+    public static GroupJoinRequestsResponse of(
+            Long groupId,
+            GroupUserV2Status status,
+            List<JoinRequestItem> items
+    ) {
+        return new GroupJoinRequestsResponse(
+                groupId,
+                status,
+                items == null ? 0 : items.size(),
+                items,
+                LocalDateTime.now()
+        );
+    }
+}

src/main/java/team/wego/wegobackend/group/v2/application/service/GroupJoinRequestService.java

@@ -0,0 +1,72 @@
+package team.wego.wegobackend.group.v2.application.service;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import team.wego.wegobackend.common.security.CustomUserDetails;
+import team.wego.wegobackend.group.domain.exception.GroupErrorCode;
+import team.wego.wegobackend.group.domain.exception.GroupException;
+import team.wego.wegobackend.group.v2.application.dto.common.JoinRequestItem;
+import team.wego.wegobackend.group.v2.application.dto.response.GroupJoinRequestsResponse;
+import team.wego.wegobackend.group.v2.domain.entity.GroupUserV2Status;
+import team.wego.wegobackend.group.v2.domain.entity.GroupV2;
+import team.wego.wegobackend.group.v2.domain.repository.GroupUserV2QueryRepository;
+import team.wego.wegobackend.group.v2.domain.repository.GroupUserV2Repository;
+import team.wego.wegobackend.group.v2.domain.repository.GroupV2Repository;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class GroupJoinRequestService {
+
+    private final GroupV2Repository groupV2Repository;
+    private final GroupUserV2QueryRepository groupUserV2QueryRepository;
+
+
+    @Transactional(readOnly = true)
+    public GroupJoinRequestsResponse getJoinRequests(
+            Long groupId,
+            CustomUserDetails userDetails,
+            GroupUserV2Status status
+    ) {
+        if (userDetails == null || userDetails.getId() == null) {
+            throw new GroupException(GroupErrorCode.USER_ID_NULL);
+        }
+
+        // 모임 조회
+        GroupV2 groupV2 = groupV2Repository.findById(groupId)
+                .orElseThrow(
+                        () -> new GroupException(GroupErrorCode.GROUP_NOT_FOUND_BY_ID, groupId));
+
+        // HOST 확인
+        if (!groupV2.getHost().getId().equals(userDetails.getId())) {
+            throw new GroupException(
+                    GroupErrorCode.NO_PERMISSION_TO_VIEW_JOIN_REQUESTS,
+                    groupId,
+                    userDetails.getId()
+            );
+        }
+
+        // status 기본값 방어
+        GroupUserV2Status targetStatus = (status == null) ? GroupUserV2Status.PENDING : status;
+
+        // QueryDSL 조회
+        List<JoinRequestItem> items = groupUserV2QueryRepository
+                .fetchJoinRequests(groupId, targetStatus)
+                .stream()
+                .map(joinRequestRow -> new JoinRequestItem(
+                        joinRequestRow.userId(),
+                        joinRequestRow.nickName(),
+                        joinRequestRow.profileImage(),
+                        joinRequestRow.groupUserId(),
+                        joinRequestRow.status(),
+                        joinRequestRow.joinedAt(),
+                        joinRequestRow.joinRequestMessage()
+                ))
+                .toList();
+
+        return GroupJoinRequestsResponse.of(groupId, targetStatus, items);
+    }
+}

src/main/java/team/wego/wegobackend/group/v2/application/service/GroupV2AttendanceService.java

@@ -49,7 +49,7 @@ public class GroupV2AttendanceService {
 
     // TODO: 참석, 취소 동시성 해결 필요.
     @Transactional
-    public AttendanceGroupV2Response attend(Long userId, Long groupId) {
+    public AttendanceGroupV2Response attend(Long userId, Long groupId, String message) {
         // 회원 체크
         if (userId == null) {
             throw new GroupException(GroupErrorCode.USER_ID_NULL);
@@ -141,7 +141,8 @@ public AttendanceGroupV2Response attend(Long userId, Long groupId) {
             } else {
                 groupUserV2 = GroupUserV2.createPending(
                         group,
-                        userRepository.getReferenceById(userId)
+                        userRepository.getReferenceById(userId),
+                        message
                 );
                 groupUserV2Repository.save(groupUserV2);
             }

src/main/java/team/wego/wegobackend/group/v2/domain/entity/GroupUserV2.java

@@ -58,6 +58,9 @@ public class GroupUserV2 extends BaseTimeEntity {
     @Column(name = "group_user_status", nullable = false, length = 20)
     private GroupUserV2Status status;
 
+    @Column(name = "join_request_message", length = 300)
+    private String joinRequestMessage;
+
     private GroupUserV2(User user, GroupUserV2Role groupRole, GroupUserV2Status status) {
         this.user = user;
         this.groupRole = groupRole;
@@ -144,6 +147,13 @@ public static GroupUserV2 createPending(GroupV2 group, User user) {
         return groupUser;
     }
 
+    public static GroupUserV2 createPending(GroupV2 group, User user, String message) {
+        GroupUserV2 groupUser = new GroupUserV2(user, GroupUserV2Role.MEMBER, GroupUserV2Status.PENDING);
+        groupUser.applyJoinRequestMessage(message);
+        group.addUser(groupUser);
+        return groupUser;
+    }
+
     public void requestJoin() {
         if (this.status == GroupUserV2Status.BANNED) {
             throw new GroupException(GroupErrorCode.GROUP_BANNED_USER);
@@ -154,6 +164,16 @@ public void requestJoin() {
         this.leftAt = null;
     }
 
+    public void requestJoin(String message) {
+        if (this.status == GroupUserV2Status.BANNED) {
+            throw new GroupException(GroupErrorCode.GROUP_BANNED_USER);
+        }
+        this.status = GroupUserV2Status.PENDING;
+        this.joinedAt = LocalDateTime.now();
+        this.leftAt = null;
+        applyJoinRequestMessage(message); // 여기서 갱신
+    }
+
     public void leaveOrCancel() {
         switch (this.status) {
             case ATTEND -> this.leave();
@@ -227,5 +247,19 @@ public void unban() {
         this.status = GroupUserV2Status.KICKED; //  재참여는 스스로 가능
         this.leftAt = LocalDateTime.now();
     }
+
+    public void applyJoinRequestMessage(String message) {
+        // 정책: null/blank 허용 여부 결정
+        if (message == null || message.isBlank()) {
+            this.joinRequestMessage = null;
+            return;
+        }
+
+        String trimmed = message.trim();
+        if (trimmed.length() > 300) {
+            throw new GroupException(GroupErrorCode.JOIN_REQUEST_MESSAGE_TOO_LONG); // 신규 에러코드 추천
+        }
+        this.joinRequestMessage = trimmed;
+    }
 }
 

src/main/java/team/wego/wegobackend/group/v2/domain/repository/GroupUserV2QueryRepository.java

@@ -1,12 +1,16 @@
 package team.wego.wegobackend.group.v2.domain.repository;
 
 import java.util.List;
+import team.wego.wegobackend.group.v2.domain.entity.GroupUserV2Status;
 import team.wego.wegobackend.group.v2.infrastructure.querydsl.projection.AttendanceTargetRow;
+import team.wego.wegobackend.group.v2.infrastructure.querydsl.projection.JoinRequestRow;
 
 public interface GroupUserV2QueryRepository {
 
     List<AttendanceTargetRow> fetchAttendMembersExceptHost(Long groupId);
 
     List<AttendanceTargetRow> fetchBannedMembersExceptHost(Long groupId);
+
+    List<JoinRequestRow> fetchJoinRequests(Long groupId, GroupUserV2Status status);
 }
 

src/main/java/team/wego/wegobackend/group/v2/infrastructure/querydsl/GroupUserV2QueryRepositoryImpl.java

@@ -8,9 +8,11 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
+import team.wego.wegobackend.group.v2.domain.entity.GroupUserV2Role;
 import team.wego.wegobackend.group.v2.domain.entity.GroupUserV2Status;
 import team.wego.wegobackend.group.v2.domain.repository.GroupUserV2QueryRepository;
 import team.wego.wegobackend.group.v2.infrastructure.querydsl.projection.AttendanceTargetRow;
+import team.wego.wegobackend.group.v2.infrastructure.querydsl.projection.JoinRequestRow;
 
 @RequiredArgsConstructor
 @Repository
@@ -67,4 +69,29 @@ public List<AttendanceTargetRow> fetchBannedMembersExceptHost(Long groupId) {
                 .orderBy(groupUserV2.leftAt.desc().nullsLast())
                 .fetch();
     }
+
+    @Override
+    public List<JoinRequestRow> fetchJoinRequests(Long groupId, GroupUserV2Status status) {
+        return queryFactory
+                .select(Projections.constructor(
+                        JoinRequestRow.class,
+                        user.id,
+                        user.nickName,
+                        user.profileImage,
+                        groupUserV2.id,
+                        groupUserV2.status,
+                        groupUserV2.joinedAt,
+                        groupUserV2.joinRequestMessage
+                ))
+                .from(groupUserV2)
+                .join(groupUserV2.user, user)
+                .where(
+                        groupUserV2.group.id.eq(groupId),
+                        groupUserV2.status.eq(status),
+                        groupUserV2.groupRole.ne(GroupUserV2Role.HOST) // HOST 제외
+                )
+                // joinRequest는 최신 신청이 위로 오도록
+                .orderBy(groupUserV2.joinedAt.desc())
+                .fetch();
+    }
 }