Merge pull request #176 from prgrms-web-devcourse-final-project/develop

chore: develop → main 브랜치 머지

Author: endorsement0912

build.gradle

@@ -91,6 +91,9 @@ dependencies {
 
     // WebSocket + STOMP 통신용
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
+
+	// 이메일 전송 의존성
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 }
 
 tasks.named('test') {

src/main/java/grep/neogul_coder/domain/admin/controller/dto/response/AdminStudyResponse.java

@@ -22,7 +22,7 @@ public class AdminStudyResponse {
     private Category category;
 
     @Schema(description = "스터디 종료 여부", example = "false")
-    private boolean isFinished;
+    private boolean finished;
 
     @Schema(description = "활성화 여부", example = "true")
     private boolean activated;
@@ -33,7 +33,7 @@ private AdminStudyResponse(Long id, String name, Category category, boolean isFi
         this.id = id;
         this.name = name;
         this.category = category;
-        this.isFinished = isFinished;
+        this.finished = isFinished;
         this.activated = activated;
     }
 
@@ -42,7 +42,7 @@ public static AdminStudyResponse from(Study study) {
             .id(study.getId())
             .name(study.getName())
             .category(study.getCategory())
-            .isFinished(study.getEndDate().toLocalDate().isBefore(LocalDate.now()))
+            .isFinished(study.isFinished())
             .activated(study.getActivated())
             .build();
     }

src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/requset/GroupChatMessageRequestDto.java

@@ -1,6 +1,9 @@
 package grep.neogul_coder.domain.groupchat.controller.dto.requset;
 
+import grep.neogul_coder.domain.groupchat.entity.GroupChatMessage;
+import grep.neogul_coder.domain.groupchat.entity.GroupChatRoom;
 import io.swagger.v3.oas.annotations.Hidden;
+import java.time.LocalDateTime;
 import lombok.Getter;
 
 @Hidden
@@ -18,15 +21,12 @@ public GroupChatMessageRequestDto(Long roomId, Long senderId, String message) {
         this.message = message;
     }
 
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setSenderId(Long senderId) {
-        this.senderId = senderId;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
+    public GroupChatMessage toEntity(GroupChatRoom room, Long senderId) {
+        return new GroupChatMessage(
+            room,
+            senderId,
+            this.message,
+            LocalDateTime.now()
+        );
     }
 }

src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/requset/GroupChatSwaggerRequest.java

@@ -15,11 +15,4 @@ public class GroupChatSwaggerRequest {
 
     @Schema(description = "보낼 메시지", example = "안녕하세요!")
     private String message;
-
-
-    public void setSenderId(Long senderId) { this.senderId = senderId; }
-
-    public void setRoomId(Long roomId) { this.roomId = roomId; }
-
-    public void setMessage(String message) { this.message = message; }
 }

src/main/java/grep/neogul_coder/domain/groupchat/controller/dto/response/GroupChatMessageResponseDto.java

@@ -1,5 +1,7 @@
 package grep.neogul_coder.domain.groupchat.controller.dto.response;
 
+import grep.neogul_coder.domain.groupchat.entity.GroupChatMessage;
+import grep.neogul_coder.domain.users.entity.User;
 import io.swagger.v3.oas.annotations.Hidden;
 import java.time.LocalDateTime;
 import lombok.Getter;
@@ -16,10 +18,7 @@ public class GroupChatMessageResponseDto {
     private String message;             // 메시지 내용
     private LocalDateTime sentAt;       // 보낸 시간
 
-    public GroupChatMessageResponseDto() {
-    }
-
-    public GroupChatMessageResponseDto(Long id, Long roomId, Long senderId,
+    private GroupChatMessageResponseDto(Long id, Long roomId, Long senderId,
         String senderNickname, String profileImageUrl,
         String message, LocalDateTime sentAt) {
         this.id = id;
@@ -31,31 +30,15 @@ public GroupChatMessageResponseDto(Long id, Long roomId, Long senderId,
         this.sentAt = sentAt;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setRoomId(Long roomId) {
-        this.roomId = roomId;
-    }
-
-    public void setSenderId(Long senderId) {
-        this.senderId = senderId;
-    }
-
-    public void setSenderNickname(String senderNickname) {
-        this.senderNickname = senderNickname;
-    }
-
-    public void setProfileImageUrl(String profileImageUrl) {
-        this.profileImageUrl = profileImageUrl;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setSentAt(LocalDateTime sentAt) {
-        this.sentAt = sentAt;
+    public static GroupChatMessageResponseDto from(GroupChatMessage message, User sender) {
+        return new GroupChatMessageResponseDto(
+            message.getMessageId(),
+            message.getGroupChatRoom().getRoomId(),
+            sender.getId(),
+            sender.getNickname(),
+            sender.getProfileImageUrl(),
+            message.getMessage(),
+            message.getSentAt()
+        );
     }
 }

src/main/java/grep/neogul_coder/domain/groupchat/entity/GroupChatMessage.java

@@ -27,23 +27,14 @@ public class GroupChatMessage extends BaseEntity {
 
     private LocalDateTime sentAt;
 
-    public void setMessageId(Long messageId) {
-        this.messageId = messageId;
-    }
-
-    public void setGroupChatRoom(GroupChatRoom groupChatRoom) {
-        this.groupChatRoom = groupChatRoom;
-    }
-
-    public void setUserId(Long userId) {
+    public GroupChatMessage(GroupChatRoom room, Long userId, String message, LocalDateTime sentAt) {
+        this.groupChatRoom = room;
         this.userId = userId;
-    }
-
-    public void setMessage(String message) {
         this.message = message;
+        this.sentAt = sentAt;
     }
 
-    public void setSentAt(LocalDateTime sentAt) {
-        this.sentAt = sentAt;
+    protected GroupChatMessage() {
+
     }
 }

src/main/java/grep/neogul_coder/domain/groupchat/repository/GroupChatMessageRepository.java

@@ -9,11 +9,10 @@
 
 public interface GroupChatMessageRepository extends JpaRepository<GroupChatMessage, Long> {
 
-
     // 채팅방(roomId)에 속한 메시지를 전송 시간 내림차순으로 페이징 조회
     @Query("SELECT m FROM GroupChatMessage m " +
         "WHERE m.groupChatRoom.roomId = :roomId " +
         "ORDER BY m.sentAt ASC")
     Page<GroupChatMessage> findMessagesByRoomIdAsc(@Param("roomId") Long roomId, Pageable pageable);
 
-}
+}

src/main/java/grep/neogul_coder/domain/groupchat/service/GroupChatService.java

@@ -10,13 +10,15 @@
 import grep.neogul_coder.domain.users.entity.User;
 import grep.neogul_coder.domain.users.repository.UserRepository;
 import grep.neogul_coder.global.response.PageResponse;
+import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 
+@RequiredArgsConstructor
 @Service
 public class GroupChatService {
 
@@ -25,17 +27,6 @@ public class GroupChatService {
     private final UserRepository userRepository;
     private final StudyMemberRepository studyMemberRepository;
 
-    // 생성자 주입을 통한 의존성 주입
-    public GroupChatService(GroupChatMessageRepository messageRepository,
-        GroupChatRoomRepository roomRepository,
-        UserRepository userRepository,
-        StudyMemberRepository studyMemberRepository) {
-        this.messageRepository = messageRepository;
-        this.roomRepository = roomRepository;
-        this.userRepository = userRepository;
-        this.studyMemberRepository = studyMemberRepository;
-    }
-
     public GroupChatMessageResponseDto saveMessage(GroupChatMessageRequestDto requestDto) {
         // 채팅방 존재 여부 확인
         GroupChatRoom room = roomRepository.findById(requestDto.getRoomId())
@@ -51,26 +42,14 @@ public GroupChatMessageResponseDto saveMessage(GroupChatMessageRequestDto reques
             throw new IllegalArgumentException("해당 스터디에 참가한 사용자만 채팅할 수 있습니다.");
         }
 
-        // 메시지 생성 및 저장
-        GroupChatMessage message = new GroupChatMessage();
-        message.setGroupChatRoom(room);                      // 엔티티에 있는 필드명 맞게 사용
-        message.setUserId(sender.getId());                   // 연관관계 없이 userId만 저장
-        message.setMessage(requestDto.getMessage());
-        message.setSentAt(LocalDateTime.now());
+        // 메시지 생성
+        GroupChatMessage message = requestDto.toEntity(room, sender.getId());
 
         // 메시지 저장
         messageRepository.save(message);
 
-        // 저장된 메시지를 dto로 변환
-        return new GroupChatMessageResponseDto(
-            message.getMessageId(),
-            message.getGroupChatRoom().getRoomId(),   // ← roomId 필드가 필요하면 여기서 꺼내야 함
-            sender.getId(),
-            sender.getNickname(),
-            sender.getProfileImageUrl(),
-            message.getMessage(),
-            message.getSentAt()
-        );
+        // 응답 dto 생성
+        return GroupChatMessageResponseDto.from(message, sender);
     }
 
     // 과거 채팅 메시지 페이징 조회 (무한 스크롤용)
@@ -86,15 +65,7 @@ public PageResponse<GroupChatMessageResponseDto> getMessages(Long roomId, int pa
             User sender = userRepository.findById(message.getUserId())
                 .orElseThrow(() -> new IllegalArgumentException("사용자가 존재하지 않습니다."));
 
-            return new GroupChatMessageResponseDto(
-                message.getMessageId(),
-                message.getGroupChatRoom().getRoomId(),
-                sender.getId(),
-                sender.getNickname(),
-                sender.getProfileImageUrl(),
-                message.getMessage(),
-                message.getSentAt()
-            );
+            return GroupChatMessageResponseDto.from(message, sender);
         });
 
         // PageResponse로 감싸서 반환

src/main/java/grep/neogul_coder/domain/recruitment/post/service/RecruitmentPostService.java

@@ -15,7 +15,7 @@
 import grep.neogul_coder.domain.study.Study;
 import grep.neogul_coder.domain.study.repository.StudyRepository;
 import grep.neogul_coder.domain.studyapplication.StudyApplication;
-import grep.neogul_coder.domain.studyapplication.repository.StudyApplicationRepository;
+import grep.neogul_coder.domain.studyapplication.repository.ApplicationRepository;
 import grep.neogul_coder.global.exception.business.BusinessException;
 import grep.neogul_coder.global.exception.business.NotFoundException;
 import lombok.RequiredArgsConstructor;
@@ -40,7 +40,7 @@ public class RecruitmentPostService {
     private final RecruitmentPostRepository postRepository;
     private final RecruitmentPostQueryRepository postQueryRepository;
 
-    private final StudyApplicationRepository studyApplicationRepository;
+    private final ApplicationRepository applicationRepository;
     private final RecruitmentPostCommentQueryRepository commentQueryRepository;
 
     public RecruitmentPostInfo get(long recruitmentPostId) {
@@ -49,7 +49,7 @@ public RecruitmentPostInfo get(long recruitmentPostId) {
 
         RecruitmentPostWithStudyInfo postInfo = postQueryRepository.findPostWithStudyInfo(post.getId());
         List<CommentsWithWriterInfo> comments = findCommentsWithWriterInfo(post);
-        List<StudyApplication> applications = studyApplicationRepository.findByRecruitmentPostId(post.getId());
+        List<StudyApplication> applications = applicationRepository.findByRecruitmentPostId(post.getId());
 
         return new RecruitmentPostInfo(postInfo, comments, applications.size());
     }

src/main/java/grep/neogul_coder/domain/study/Study.java

@@ -43,6 +43,8 @@ public class Study extends BaseEntity {
 
     private boolean extended;
 
+    private boolean finished;
+
     protected Study() {}
 
     @Builder
@@ -60,6 +62,7 @@ private Study(Long originStudyId, String name, Category category, int capacity,
         this.introduction = introduction;
         this.imageUrl = imageUrl;
         this.extended = false;
+        this.finished = false;
     }
 
     public void update(String name, Category category, int capacity, StudyType studyType,
@@ -86,6 +89,10 @@ public long calculateRemainSlots(long currentCount) {
         return this.capacity - currentCount;
     }
 
+    public void increaseMemberCount() {
+        currentCount++;
+    }
+
     public void decreaseMemberCount() {
         currentCount--;
     }
@@ -97,4 +104,8 @@ public boolean alreadyExtended() {
     public void extend() {
         this.extended = true;
     }
+
+    public void finish() {
+        this.finished = true;
+    }
 }