[Refactor] 모임, 후기 관련패키지 구조 변경

src/main/java/com/manchui/domain/entity/Attendance.java → src/main/java/com/manchui/domain/attendance/entity/Attendance.java

@@ -1,5 +1,6 @@
-package com.manchui.domain.entity;
+package com.manchui.domain.attendance.entity;
 
+import com.manchui.domain.gathering.entity.Gathering;
 import com.manchui.domain.user.entity.User;
 import com.manchui.global.entity.Timestamped;
 import jakarta.persistence.*;

src/main/java/com/manchui/domain/repository/AttendanceRepository.java → src/main/java/com/manchui/domain/attendance/repository/AttendanceRepository.java

@@ -1,7 +1,7 @@
-package com.manchui.domain.repository;
+package com.manchui.domain.attendance.repository;
 
-import com.manchui.domain.entity.Attendance;
-import com.manchui.domain.entity.Gathering;
+import com.manchui.domain.attendance.entity.Attendance;
+import com.manchui.domain.gathering.entity.Gathering;
 import com.manchui.domain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/manchui/domain/auth/service/Oauth2Service.java

@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.manchui.domain.entity.Image;
-import com.manchui.domain.service.ImageServiceImpl;
+import com.manchui.domain.image.entity.Image;
+import com.manchui.domain.image.repository.ImageRepository;
+import com.manchui.domain.image.service.ImageServiceImpl;
 import com.manchui.domain.user.entity.User;
-import com.manchui.domain.repository.ImageRepository;
 import com.manchui.domain.user.repository.UserRepository;
 import com.manchui.global.exception.CustomException;
 import com.manchui.global.exception.ErrorCode;

src/main/java/com/manchui/domain/chat/service/ChatRoomService.java

@@ -5,13 +5,15 @@
 import com.manchui.domain.chat.repository.ChatRoomRepository;
 import com.manchui.domain.chat.repository.ChatRoomUserRepository;
 import com.manchui.domain.auth.dto.CustomUserDetails;
+import com.manchui.domain.gathering.entity.Gathering;
+import com.manchui.domain.gathering.repository.GatheringRepository;
+import com.manchui.domain.image.entity.Image;
+import com.manchui.domain.image.repository.ImageRepository;
 import com.manchui.domain.user.dto.UserInfo;
 import com.manchui.domain.chat.dto.ChatRoomListDetail;
 import com.manchui.domain.chat.dto.ChatRoomListResponse;
 import com.manchui.domain.chat.dto.ChatRoomUserListResponse;
-import com.manchui.domain.entity.*;
 import com.manchui.domain.chat.entity.mongodb.ChatMessage;
-import com.manchui.domain.repository.*;
 import com.manchui.domain.chat.repository.mongodb.ChatMessageRepository;
 import com.manchui.domain.user.entity.User;
 import com.manchui.domain.user.repository.UserRepository;
@@ -80,7 +82,7 @@ public ChatRoomListResponse chatRoomList(CustomUserDetails customUserDetails) {
 
     // 채팅방에 속한 사용자 softDelete
     @Transactional
-    public void chatRoomQuite(String email, String roomId){
+    public void chatRoomQuite(String email, String roomId) {
 
         User user = userRepository.findByEmail(email);
         ChatRoom chatRoom = chatRoomRepository.findByRoomId(roomId);
@@ -89,4 +91,5 @@ public void chatRoomQuite(String email, String roomId){
         );
         chatRoomUser.softDelete();
     }
+
 }

src/main/java/com/manchui/domain/controller/GatheringController.java → src/main/java/com/manchui/domain/gathering/controller/GatheringController.java

@@ -1,8 +1,8 @@
-package com.manchui.domain.controller;
+package com.manchui.domain.gathering.controller;
 
 import com.manchui.domain.auth.dto.CustomUserDetails;
-import com.manchui.domain.dto.gathering.*;
-import com.manchui.domain.service.GatheringService;
+import com.manchui.domain.gathering.dto.*;
+import com.manchui.domain.gathering.service.GatheringService;
 import com.manchui.global.response.SuccessResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;

src/main/java/com/manchui/domain/dto/gathering/ClosedGathering.java → src/main/java/com/manchui/domain/gathering/dto/ClosedGathering.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/manchui/domain/dto/gathering/ClosedGatheringInfoResponse.java → src/main/java/com/manchui/domain/gathering/dto/ClosedGatheringInfoResponse.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/manchui/domain/dto/gathering/ClosedGatheringResponse.java → src/main/java/com/manchui/domain/gathering/dto/ClosedGatheringResponse.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/manchui/domain/dto/gathering/GatheringCreateRequest.java → src/main/java/com/manchui/domain/gathering/dto/GatheringCreateRequest.java

@@ -1,7 +1,7 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import com.manchui.domain.chat.entity.mysql.ChatRoom;
-import com.manchui.domain.entity.Gathering;
+import com.manchui.domain.gathering.entity.Gathering;
 import com.manchui.domain.user.entity.User;
 import jakarta.validation.constraints.*;
 import lombok.AllArgsConstructor;

src/main/java/com/manchui/domain/dto/gathering/GatheringCreateResponse.java → src/main/java/com/manchui/domain/gathering/dto/GatheringCreateResponse.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/manchui/domain/dto/gathering/GatheringCursorPagingResponse.java → src/main/java/com/manchui/domain/gathering/dto/GatheringCursorPagingResponse.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/manchui/domain/dto/gathering/GatheringInfoResponse.java → src/main/java/com/manchui/domain/gathering/dto/GatheringInfoResponse.java

@@ -1,8 +1,8 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
+import com.manchui.domain.gathering.entity.Gathering;
+import com.manchui.domain.review.dto.ReviewDetailPagingResponse;
 import com.manchui.domain.user.dto.UserInfo;
-import com.manchui.domain.dto.review.ReviewDetailPagingResponse;
-import com.manchui.domain.entity.Gathering;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/manchui/domain/dto/gathering/GatheringListResponse.java → src/main/java/com/manchui/domain/gathering/dto/GatheringListResponse.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/manchui/domain/dto/gathering/GatheringPagingResponse.java → src/main/java/com/manchui/domain/gathering/dto/GatheringPagingResponse.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.dto.gathering;
+package com.manchui.domain.gathering.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/manchui/domain/entity/Gathering.java → src/main/java/com/manchui/domain/gathering/entity/Gathering.java

@@ -1,8 +1,8 @@
-package com.manchui.domain.entity;
+package com.manchui.domain.gathering.entity;
 
 import com.manchui.domain.chat.entity.mysql.ChatRoom;
-import com.manchui.domain.dto.gathering.ClosedGatheringInfoResponse;
-import com.manchui.domain.dto.gathering.GatheringCreateResponse;
+import com.manchui.domain.gathering.dto.ClosedGatheringInfoResponse;
+import com.manchui.domain.gathering.dto.GatheringCreateResponse;
 import com.manchui.domain.user.entity.User;
 import com.manchui.global.entity.Timestamped;
 import jakarta.persistence.*;

src/main/java/com/manchui/domain/repository/GatheringRepository.java → src/main/java/com/manchui/domain/gathering/repository/GatheringRepository.java

@@ -1,10 +1,10 @@
-package com.manchui.domain.repository;
+package com.manchui.domain.gathering.repository;
 
 import com.manchui.domain.chat.entity.mysql.ChatRoom;
-import com.manchui.domain.entity.Gathering;
+import com.manchui.domain.gathering.entity.Gathering;
 import com.manchui.domain.user.entity.User;
-import com.manchui.domain.repository.querydsl.GatheringCursorQueryDsl;
-import com.manchui.domain.repository.querydsl.GatheringQueryDsl;
+import com.manchui.domain.gathering.repository.querydsl.GatheringCursorQueryDsl;
+import com.manchui.domain.gathering.repository.querydsl.GatheringQueryDsl;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/manchui/domain/repository/querydsl/GatheringCursorQueryDsl.java → src/main/java/com/manchui/domain/gathering/repository/querydsl/GatheringCursorQueryDsl.java

@@ -1,6 +1,6 @@
-package com.manchui.domain.repository.querydsl;
+package com.manchui.domain.gathering.repository.querydsl;
 
-import com.manchui.domain.dto.gathering.GatheringCursorPagingResponse;
+import com.manchui.domain.gathering.dto.GatheringCursorPagingResponse;
 
 public interface GatheringCursorQueryDsl {
 

src/main/java/com/manchui/domain/repository/querydsl/GatheringCursorQueryDslImpl.java → src/main/java/com/manchui/domain/gathering/repository/querydsl/GatheringCursorQueryDslImpl.java

@@ -1,7 +1,8 @@
-package com.manchui.domain.repository.querydsl;
+package com.manchui.domain.gathering.repository.querydsl;
 
-import com.manchui.domain.dto.gathering.GatheringCursorPagingResponse;
-import com.manchui.domain.dto.gathering.GatheringListResponse;
+import com.manchui.domain.gathering.dto.GatheringCursorPagingResponse;
+import com.manchui.domain.gathering.dto.GatheringListResponse;
+import com.manchui.domain.gathering.entity.Gathering;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.ConstructorExpression;
 import com.querydsl.core.types.Projections;
@@ -17,10 +18,10 @@
 import java.util.List;
 import java.util.Optional;
 
-import static com.manchui.domain.entity.QAttendance.attendance;
-import static com.manchui.domain.entity.QGathering.gathering;
-import static com.manchui.domain.entity.QHeart.heart;
-import static com.manchui.domain.entity.QImage.image;
+import static com.manchui.domain.attendance.entity.QAttendance.attendance;
+import static com.manchui.domain.gathering.entity.QGathering.gathering;
+import static com.manchui.domain.heart.entity.QHeart.heart;
+import static com.manchui.domain.image.entity.QImage.image;
 import static com.manchui.domain.user.entity.QUser.user;
 import static com.querydsl.jpa.JPAExpressions.select;
 
@@ -69,10 +70,28 @@ private GatheringCursorPagingResponse getGatheringList(String email, Long cursor
             ));
         }
 
-        // 1. 목록 조회 쿼리 (커서 조건 포함)
+        // 1. 목록 조회 쿼리 (커서 조건 포함, 마감임박순 조회 시 조건 추가)
         BooleanBuilder listConditions = new BooleanBuilder(baseConditions);
         if (cursor != null) {
-            listConditions.and(gathering.id.lt(cursor));
+            Gathering targetGathering = queryFactory
+                    .selectFrom(gathering)
+                    .where(gathering.id.eq(cursor))
+                    .fetchOne();
+            if (targetGathering != null) {
+                LocalDateTime cursorCloseDate = targetGathering.getDueDate();
+
+                if (sortField.equals("closeDate")) {
+                    listConditions.and(
+                            gathering.dueDate.gt(cursorCloseDate) // 현재 커서 이후의 마감일 데이터
+                                    .or(
+                                            gathering.dueDate.eq(cursorCloseDate)
+                                                    .and(gathering.id.gt(cursor)) // 마감일자가 같으면 gatheringId 기준 정렬
+                                    )
+                    );
+                } else {
+                    listConditions.and(gathering.id.lt(cursor));
+                }
+            }
         }
 
         List<GatheringListResponse> gatheringList = queryFactory

src/main/java/com/manchui/domain/repository/querydsl/GatheringQueryDsl.java → src/main/java/com/manchui/domain/gathering/repository/querydsl/GatheringQueryDsl.java

@@ -1,6 +1,6 @@
-package com.manchui.domain.repository.querydsl;
+package com.manchui.domain.gathering.repository.querydsl;
 
-import com.manchui.domain.dto.gathering.GatheringListResponse;
+import com.manchui.domain.gathering.dto.GatheringListResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/manchui/domain/repository/querydsl/GatheringQueryDslImpl.java → src/main/java/com/manchui/domain/gathering/repository/querydsl/GatheringQueryDslImpl.java

@@ -1,6 +1,6 @@
-package com.manchui.domain.repository.querydsl;
+package com.manchui.domain.gathering.repository.querydsl;
 
-import com.manchui.domain.dto.gathering.GatheringListResponse;
+import com.manchui.domain.gathering.dto.GatheringListResponse;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQuery;
@@ -17,10 +17,10 @@
 import java.util.List;
 import java.util.Optional;
 
-import static com.manchui.domain.entity.QAttendance.attendance;
-import static com.manchui.domain.entity.QGathering.gathering;
-import static com.manchui.domain.entity.QHeart.heart;
-import static com.manchui.domain.entity.QImage.image;
+import static com.manchui.domain.attendance.entity.QAttendance.attendance;
+import static com.manchui.domain.gathering.entity.QGathering.gathering;
+import static com.manchui.domain.heart.entity.QHeart.heart;
+import static com.manchui.domain.image.entity.QImage.image;
 import static com.manchui.domain.user.entity.QUser.user;
 import static com.querydsl.jpa.JPAExpressions.select;
 

src/main/java/com/manchui/domain/service/GatheringDateUtils.java → src/main/java/com/manchui/domain/gathering/service/GatheringDateUtils.java

@@ -1,4 +1,4 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
 import com.manchui.global.exception.CustomException;
 import jakarta.annotation.PostConstruct;

src/main/java/com/manchui/domain/service/GatheringReader.java → src/main/java/com/manchui/domain/gathering/service/GatheringReader.java

@@ -1,7 +1,7 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
+import com.manchui.domain.gathering.entity.Gathering;
 import com.manchui.domain.user.dto.UserInfo;
-import com.manchui.domain.entity.Gathering;
 import com.manchui.domain.user.entity.User;
 
 import java.util.List;

src/main/java/com/manchui/domain/service/GatheringReaderImpl.java → src/main/java/com/manchui/domain/gathering/service/GatheringReaderImpl.java

@@ -1,11 +1,11 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
+import com.manchui.domain.attendance.entity.Attendance;
+import com.manchui.domain.attendance.repository.AttendanceRepository;
+import com.manchui.domain.gathering.entity.Gathering;
+import com.manchui.domain.gathering.repository.GatheringRepository;
 import com.manchui.domain.user.dto.UserInfo;
-import com.manchui.domain.entity.Attendance;
-import com.manchui.domain.entity.Gathering;
 import com.manchui.domain.user.entity.User;
-import com.manchui.domain.repository.AttendanceRepository;
-import com.manchui.domain.repository.GatheringRepository;
 import com.manchui.global.exception.CustomException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -101,5 +101,4 @@ public List<Gathering> findClosedGathering(User user) {
                 .toList();
     }
 
-
 }

src/main/java/com/manchui/domain/service/GatheringService.java → src/main/java/com/manchui/domain/gathering/service/GatheringService.java

@@ -1,7 +1,7 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
 import com.manchui.domain.auth.dto.CustomUserDetails;
-import com.manchui.domain.dto.gathering.*;
+import com.manchui.domain.gathering.dto.*;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 

src/main/java/com/manchui/domain/service/GatheringServiceImpl.java → src/main/java/com/manchui/domain/gathering/service/GatheringServiceImpl.java

@@ -1,21 +1,29 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
+import com.manchui.domain.attendance.entity.Attendance;
+import com.manchui.domain.attendance.repository.AttendanceRepository;
+import com.manchui.domain.auth.dto.CustomUserDetails;
+import com.manchui.domain.chat.dto.ChatMessageRequest;
 import com.manchui.domain.chat.entity.mysql.ChatRoom;
 import com.manchui.domain.chat.entity.mysql.ChatRoomUser;
 import com.manchui.domain.chat.repository.ChatRoomRepository;
 import com.manchui.domain.chat.repository.ChatRoomUserRepository;
 import com.manchui.domain.chat.service.ChatMessageService;
-import com.manchui.domain.auth.dto.CustomUserDetails;
-import com.manchui.domain.user.dto.UserInfo;
-import com.manchui.domain.chat.dto.ChatMessageRequest;
-import com.manchui.domain.dto.gathering.*;
-import com.manchui.domain.dto.review.ReviewDetailPagingResponse;
-import com.manchui.domain.dto.review.ReviewInfo;
-import com.manchui.domain.dto.review.ReviewScoreInfo;
-import com.manchui.domain.entity.*;
+import com.manchui.domain.gathering.dto.*;
+import com.manchui.domain.gathering.entity.Gathering;
+import com.manchui.domain.gathering.repository.GatheringRepository;
+import com.manchui.domain.heart.entity.Heart;
+import com.manchui.domain.heart.repository.HeartRepository;
+import com.manchui.domain.image.entity.Image;
 import com.manchui.domain.notification.entity.NotificationType;
 import com.manchui.domain.notification.service.NotificationServiceImpl;
-import com.manchui.domain.repository.*;
+import com.manchui.domain.image.repository.ImageRepository;
+import com.manchui.domain.review.dto.ReviewDetailPagingResponse;
+import com.manchui.domain.review.dto.ReviewInfo;
+import com.manchui.domain.review.dto.ReviewScoreInfo;
+import com.manchui.domain.review.repository.ReviewRepository;
+import com.manchui.domain.image.service.ImageServiceImpl;
+import com.manchui.domain.user.dto.UserInfo;
 import com.manchui.domain.user.entity.User;
 import com.manchui.domain.user.service.UserService;
 import com.manchui.global.exception.CustomException;

src/main/java/com/manchui/domain/service/GatheringStore.java → src/main/java/com/manchui/domain/gathering/service/GatheringStore.java

@@ -1,8 +1,8 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
-import com.manchui.domain.dto.gathering.GatheringCreateRequest;
+import com.manchui.domain.gathering.dto.GatheringCreateRequest;
 import com.manchui.domain.chat.entity.mysql.ChatRoom;
-import com.manchui.domain.entity.Gathering;
+import com.manchui.domain.gathering.entity.Gathering;
 import com.manchui.domain.user.entity.User;
 
 import java.time.LocalDateTime;

src/main/java/com/manchui/domain/service/GatheringStoreImpl.java → src/main/java/com/manchui/domain/gathering/service/GatheringStoreImpl.java

@@ -1,12 +1,12 @@
-package com.manchui.domain.service;
+package com.manchui.domain.gathering.service;
 
-import com.manchui.domain.dto.gathering.GatheringCreateRequest;
-import com.manchui.domain.entity.Attendance;
+import com.manchui.domain.attendance.entity.Attendance;
+import com.manchui.domain.attendance.repository.AttendanceRepository;
+import com.manchui.domain.gathering.dto.GatheringCreateRequest;
 import com.manchui.domain.chat.entity.mysql.ChatRoom;
-import com.manchui.domain.entity.Gathering;
+import com.manchui.domain.gathering.entity.Gathering;
+import com.manchui.domain.gathering.repository.GatheringRepository;
 import com.manchui.domain.user.entity.User;
-import com.manchui.domain.repository.AttendanceRepository;
-import com.manchui.domain.repository.GatheringRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;