[Release] 골룸 대시보드 내의 노드 반환 데이터 추가 및 골룸 목록 조회 시 모든 상태의 골룸을 조회하도록 수정한다. (…

…#188)

* feat: 골룸 노드 목록 조회 시 노드 설명과 이미지 반환하도록 수정

* [feat/CK-227] 로드맵 골룸 조회 시 최신순일때는 모든 상태를, 마감임박 순일 땐 모집 중인 상태만 반환한다 (#185)

* chore: 패키지 경로 수정

* feat: 조건에 따른 로드맵 골룸 조회 시 쿼리 수정

* refactor: 1:N 문제 방지를 위해 @batchsize 설정

* feat: 로드맵 골룸 응답에 골룸 상태 추가

* chore: 서브모듈 업데이트

* chore: 패키지 경로 수정

* refactor: 메서드 네이밍 수정

---------

Co-authored-by: Ohjintaek <[email protected]>

backend/kirikiri/src/main/java/co/kirikiri/common/interceptor/AuthInterceptor.java

@@ -1,7 +1,7 @@
 package co.kirikiri.common.interceptor;
 
 import co.kirikiri.exception.AuthenticationException;
-import co.kirikiri.service.AuthService;
+import co.kirikiri.service.auth.AuthService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;

backend/kirikiri/src/main/java/co/kirikiri/common/resolver/MemberIdentifierArgumentResolver.java

@@ -1,7 +1,7 @@
 package co.kirikiri.common.resolver;
 
 import co.kirikiri.exception.AuthenticationException;
-import co.kirikiri.service.AuthService;
+import co.kirikiri.service.auth.AuthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpHeaders;

backend/kirikiri/src/main/java/co/kirikiri/controller/AuthController.java

@@ -1,7 +1,7 @@
 package co.kirikiri.controller;
 
-import co.kirikiri.service.AuthService;
-import co.kirikiri.service.NaverOauthService;
+import co.kirikiri.service.auth.AuthService;
+import co.kirikiri.service.auth.NaverOauthService;
 import co.kirikiri.service.dto.auth.OauthRedirectResponse;
 import co.kirikiri.service.dto.auth.request.LoginRequest;
 import co.kirikiri.service.dto.auth.request.ReissueTokenRequest;

backend/kirikiri/src/main/java/co/kirikiri/controller/GoalRoomController.java

@@ -2,8 +2,8 @@
 
 import co.kirikiri.common.interceptor.Authenticated;
 import co.kirikiri.common.resolver.MemberIdentifier;
-import co.kirikiri.service.GoalRoomCreateService;
-import co.kirikiri.service.GoalRoomReadService;
+import co.kirikiri.service.goalroom.GoalRoomCreateService;
+import co.kirikiri.service.goalroom.GoalRoomReadService;
 import co.kirikiri.service.dto.goalroom.GoalRoomMemberSortTypeDto;
 import co.kirikiri.service.dto.goalroom.request.CheckFeedRequest;
 import co.kirikiri.service.dto.goalroom.request.GoalRoomCreateRequest;
@@ -13,12 +13,14 @@
 import co.kirikiri.service.dto.goalroom.response.GoalRoomCheckFeedResponse;
 import co.kirikiri.service.dto.goalroom.response.GoalRoomMemberResponse;
 import co.kirikiri.service.dto.goalroom.response.GoalRoomResponse;
-import co.kirikiri.service.dto.goalroom.response.GoalRoomRoadmapNodeResponse;
+import co.kirikiri.service.dto.goalroom.response.GoalRoomRoadmapNodeDetailResponse;
 import co.kirikiri.service.dto.goalroom.response.GoalRoomToDoCheckResponse;
 import co.kirikiri.service.dto.goalroom.response.GoalRoomTodoResponse;
 import co.kirikiri.service.dto.member.response.MemberGoalRoomForListResponse;
 import co.kirikiri.service.dto.member.response.MemberGoalRoomResponse;
 import jakarta.validation.Valid;
+import java.net.URI;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -31,8 +33,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.net.URI;
-import java.util.List;
 
 @RestController
 @RequestMapping("/goal-rooms")
@@ -162,12 +162,12 @@ public ResponseEntity<List<GoalRoomTodoResponse>> findAllTodos(
 
     @Authenticated
     @GetMapping("/{goalRoomId}/nodes")
-    public ResponseEntity<List<GoalRoomRoadmapNodeResponse>> findAllNodes(
+    public ResponseEntity<List<GoalRoomRoadmapNodeDetailResponse>> findAllNodes(
             @PathVariable final Long goalRoomId,
             @MemberIdentifier final String identifier
     ) {
-        final List<GoalRoomRoadmapNodeResponse> nodeResponses = goalRoomReadService.findAllGoalRoomNodes(goalRoomId,
-                identifier);
+        final List<GoalRoomRoadmapNodeDetailResponse> nodeResponses = goalRoomReadService.findAllGoalRoomNodes(
+                goalRoomId, identifier);
         return ResponseEntity.ok(nodeResponses);
     }
 

backend/kirikiri/src/main/java/co/kirikiri/controller/MemberController.java

@@ -2,7 +2,7 @@
 
 import co.kirikiri.common.interceptor.Authenticated;
 import co.kirikiri.common.resolver.MemberIdentifier;
-import co.kirikiri.service.MemberService;
+import co.kirikiri.service.member.MemberService;
 import co.kirikiri.service.dto.member.request.MemberJoinRequest;
 import co.kirikiri.service.dto.member.response.MemberInformationForPublicResponse;
 import co.kirikiri.service.dto.member.response.MemberInformationResponse;

backend/kirikiri/src/main/java/co/kirikiri/controller/RoadmapController.java

@@ -2,8 +2,8 @@
 
 import co.kirikiri.common.interceptor.Authenticated;
 import co.kirikiri.common.resolver.MemberIdentifier;
-import co.kirikiri.service.RoadmapCreateService;
-import co.kirikiri.service.RoadmapReadService;
+import co.kirikiri.service.roadmap.RoadmapCreateService;
+import co.kirikiri.service.roadmap.RoadmapReadService;
 import co.kirikiri.service.dto.CustomScrollRequest;
 import co.kirikiri.service.dto.roadmap.RoadmapGoalRoomsOrderTypeDto;
 import co.kirikiri.service.dto.roadmap.request.RoadmapCategorySaveRequest;

backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomMembers.java

@@ -8,6 +8,8 @@
 import jakarta.persistence.OneToMany;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -19,6 +21,7 @@ public class GoalRoomMembers {
 
     private static final int MIN_SIZE_TO_FIND_NEXT_LEADER = 1;
 
+    @BatchSize(size = 20)
     @OneToMany(fetch = FetchType.LAZY,
             cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE},
             orphanRemoval = true, mappedBy = "goalRoom")

backend/kirikiri/src/main/java/co/kirikiri/domain/goalroom/GoalRoomPendingMembers.java

@@ -8,6 +8,8 @@
 import jakarta.persistence.OneToMany;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -19,6 +21,7 @@ public class GoalRoomPendingMembers {
 
     private static final int MIN_SIZE_TO_FIND_NEXT_LEADER = 1;
 
+    @BatchSize(size = 20)
     @OneToMany(fetch = FetchType.LAZY,
             cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE},
             orphanRemoval = true, mappedBy = "goalRoom")

backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomQueryRepository.java

@@ -15,10 +15,10 @@ public interface GoalRoomQueryRepository {
 
     Optional<GoalRoom> findByIdWithContentAndTodos(final Long goalRoomId);
 
-    List<GoalRoom> findGoalRoomsWithPendingMembersByRoadmapAndCond(final Roadmap roadmap,
-                                                                   final RoadmapGoalRoomsOrderType filterType,
-                                                                   final Long lastId,
-                                                                   final int pageSize);
+    List<GoalRoom> findGoalRoomsByRoadmapAndCond(final Roadmap roadmap,
+                                                 final RoadmapGoalRoomsOrderType filterType,
+                                                 final Long lastId,
+                                                 final int pageSize);
 
     Optional<GoalRoom> findByIdWithTodos(final Long goalRoomId);
 

backend/kirikiri/src/main/java/co/kirikiri/persistence/goalroom/GoalRoomQueryRepositoryImpl.java

@@ -5,8 +5,6 @@
 import static co.kirikiri.domain.goalroom.QGoalRoomPendingMember.goalRoomPendingMember;
 import static co.kirikiri.domain.goalroom.QGoalRoomRoadmapNode.goalRoomRoadmapNode;
 import static co.kirikiri.domain.goalroom.QGoalRoomToDo.goalRoomToDo;
-import static co.kirikiri.domain.member.QMember.member;
-import static co.kirikiri.domain.member.QMemberProfile.memberProfile;
 import static co.kirikiri.domain.roadmap.QRoadmapContent.roadmapContent;
 
 import co.kirikiri.domain.goalroom.GoalRoom;
@@ -50,21 +48,15 @@ public Optional<GoalRoom> findByIdWithContentAndTodos(final Long goalRoomId) {
     }
 
     @Override
-    public List<GoalRoom> findGoalRoomsWithPendingMembersByRoadmapAndCond(final Roadmap roadmap,
-                                                                          final RoadmapGoalRoomsOrderType orderType,
-                                                                          final Long lastId,
-                                                                          final int pageSize) {
+    public List<GoalRoom> findGoalRoomsByRoadmapAndCond(final Roadmap roadmap,
+                                                        final RoadmapGoalRoomsOrderType orderType,
+                                                        final Long lastId,
+                                                        final int pageSize) {
         return selectFrom(goalRoom)
                 .innerJoin(goalRoom.roadmapContent, roadmapContent)
                 .on(roadmapContent.roadmap.eq(roadmap))
-                .innerJoin(goalRoom.goalRoomPendingMembers.values, goalRoomPendingMember)
-                .fetchJoin()
-                .innerJoin(goalRoomPendingMember.member, member)
-                .fetchJoin()
-                .innerJoin(member.memberProfile, memberProfile)
-                .fetchJoin()
                 .where(
-                        statusCond(GoalRoomStatus.RECRUITING),
+                        statusCond(orderType),
                         lessThanLastId(lastId, orderType),
                         roadmapCond(roadmap))
                 .limit(pageSize + LIMIT_OFFSET)
@@ -107,6 +99,8 @@ public Optional<GoalRoom> findByIdWithNodes(final Long goalRoomId) {
         return Optional.ofNullable(selectFrom(goalRoom)
                 .innerJoin(goalRoom.goalRoomRoadmapNodes.values, goalRoomRoadmapNode)
                 .fetchJoin()
+                .innerJoin(goalRoom.roadmapContent, roadmapContent)
+                .fetchJoin()
                 .where(goalRoomIdCond(goalRoomId))
                 .fetchOne());
     }
@@ -135,6 +129,13 @@ private BooleanExpression statusCond(final GoalRoomStatus status) {
         return goalRoom.status.eq(status);
     }
 
+    private BooleanExpression statusCond(final RoadmapGoalRoomsOrderType orderType) {
+        if (orderType == RoadmapGoalRoomsOrderType.CLOSE_TO_DEADLINE) {
+            return statusCond(GoalRoomStatus.RECRUITING);
+        }
+        return null;
+    }
+
     private OrderSpecifier<?> sortCond(final RoadmapGoalRoomsOrderType orderType) {
         if (orderType == RoadmapGoalRoomsOrderType.CLOSE_TO_DEADLINE) {
             return goalRoom.startDate.asc();

backend/kirikiri/src/main/java/co/kirikiri/service/AuthService.java → backend/kirikiri/src/main/java/co/kirikiri/service/auth/AuthService.java

@@ -1,4 +1,4 @@
-package co.kirikiri.service;
+package co.kirikiri.service.auth;
 
 import co.kirikiri.domain.auth.EncryptedToken;
 import co.kirikiri.domain.auth.RefreshToken;

backend/kirikiri/src/main/java/co/kirikiri/service/JwtTokenProvider.java → backend/kirikiri/src/main/java/co/kirikiri/service/auth/JwtTokenProvider.java

@@ -1,4 +1,4 @@
-package co.kirikiri.service;
+package co.kirikiri.service.auth;
 
 import co.kirikiri.exception.AuthenticationException;
 import io.jsonwebtoken.Claims;

backend/kirikiri/src/main/java/co/kirikiri/service/NaverOauthService.java → backend/kirikiri/src/main/java/co/kirikiri/service/auth/NaverOauthService.java

@@ -1,6 +1,7 @@
-package co.kirikiri.service;
+package co.kirikiri.service.auth;
 
 import co.kirikiri.domain.member.Member;
+import co.kirikiri.service.OauthNetworkService;
 import co.kirikiri.persistence.member.MemberRepository;
 import co.kirikiri.service.dto.auth.NaverMemberProfileDto;
 import co.kirikiri.service.dto.auth.NaverMemberProfileResponseDto;
@@ -10,6 +11,7 @@
 import co.kirikiri.service.dto.member.OauthMemberJoinDto;
 import co.kirikiri.service.dto.member.request.GenderType;
 import co.kirikiri.service.mapper.OauthMapper;
+import co.kirikiri.service.member.MemberService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpHeaders;

backend/kirikiri/src/main/java/co/kirikiri/service/TokenProvider.java → backend/kirikiri/src/main/java/co/kirikiri/service/auth/TokenProvider.java

@@ -1,4 +1,4 @@
-package co.kirikiri.service;
+package co.kirikiri.service.auth;
 
 import java.time.LocalDateTime;
 import java.util.Map;

backend/kirikiri/src/main/java/co/kirikiri/service/dto/goalroom/GoalRoomRoadmapNodeDetailDto.java

@@ -0,0 +1,16 @@
+package co.kirikiri.service.dto.goalroom;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public record GoalRoomRoadmapNodeDetailDto(
+        Long id,
+        String title,
+        String description,
+        List<String> imageUrls,
+        LocalDate startDate,
+        LocalDate endDate,
+        Integer checkCount
+) {
+
+}

backend/kirikiri/src/main/java/co/kirikiri/service/dto/goalroom/RoadmapGoalRoomDto.java

@@ -1,12 +1,15 @@
 package co.kirikiri.service.dto.goalroom;
 
+import co.kirikiri.domain.goalroom.GoalRoomStatus;
 import co.kirikiri.service.dto.member.MemberDto;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 public record RoadmapGoalRoomDto(
         Long goalRoomId,
         String name,
+        GoalRoomStatus status,
         Integer currentMemberCount,
         Integer limitedMemberCount,
         LocalDateTime createdAt,

backend/kirikiri/src/main/java/co/kirikiri/service/dto/goalroom/response/GoalRoomRoadmapNodeDetailResponse.java

@@ -0,0 +1,16 @@
+package co.kirikiri.service.dto.goalroom.response;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public record GoalRoomRoadmapNodeDetailResponse(
+        Long id,
+        String title,
+        String description,
+        List<String> imageUrls,
+        LocalDate startDate,
+        LocalDate endDate,
+        Integer checkCount
+) {
+
+}

backend/kirikiri/src/main/java/co/kirikiri/service/dto/roadmap/response/RoadmapGoalRoomResponse.java

@@ -1,12 +1,14 @@
 package co.kirikiri.service.dto.roadmap.response;
 
+import co.kirikiri.domain.goalroom.GoalRoomStatus;
 import co.kirikiri.service.dto.member.response.MemberResponse;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 public record RoadmapGoalRoomResponse(
         Long goalRoomId,
         String name,
+        GoalRoomStatus status,
         Integer currentMemberCount,
         Integer limitedMemberCount,
         LocalDateTime createdAt,

backend/kirikiri/src/main/java/co/kirikiri/service/GoalRoomCreateService.java → backend/kirikiri/src/main/java/co/kirikiri/service/goalroom/GoalRoomCreateService.java

@@ -1,4 +1,4 @@
-package co.kirikiri.service;
+package co.kirikiri.service.goalroom;
 
 import co.kirikiri.domain.ImageContentType;
 import co.kirikiri.domain.goalroom.CheckFeed;
@@ -23,6 +23,9 @@
 import co.kirikiri.persistence.goalroom.GoalRoomToDoCheckRepository;
 import co.kirikiri.persistence.member.MemberRepository;
 import co.kirikiri.persistence.roadmap.RoadmapContentRepository;
+import co.kirikiri.service.FilePathGenerator;
+import co.kirikiri.service.FileService;
+import co.kirikiri.service.ImageDirType;
 import co.kirikiri.service.dto.FileInformation;
 import co.kirikiri.service.dto.goalroom.GoalRoomCreateDto;
 import co.kirikiri.service.dto.goalroom.GoalRoomRoadmapNodeDto;