Merge pull request #263 from prgrms-web-devcourse-final-project/refactor/EA3-199-groupchat-refactor

endorsement0912 · web-flow · commit 0c748d4e9b52 · 2025-07-28T17:01:48.000+09:00
[EA3-199] refactor : 도메인명 수정 및 그룹채팅 로직 리팩터링
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/PersonalCalendarController.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/PersonalCalendarController.java
@@ -1,8 +1,8 @@
-package grep.neogulcoder.domain.calender.controller;
+package grep.neogulcoder.domain.calendar.controller;
 
-import grep.neogulcoder.domain.calender.controller.dto.requset.PersonalCalendarRequest;
-import grep.neogulcoder.domain.calender.controller.dto.response.PersonalCalendarResponse;
-import grep.neogulcoder.domain.calender.service.PersonalCalendarService;
+import grep.neogulcoder.domain.calendar.controller.dto.requset.PersonalCalendarRequest;
+import grep.neogulcoder.domain.calendar.controller.dto.response.PersonalCalendarResponse;
+import grep.neogulcoder.domain.calendar.service.PersonalCalendarService;
 import grep.neogulcoder.global.response.ApiResponse;
 
 import jakarta.validation.Valid;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/PersonalCalendarSpecification.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/PersonalCalendarSpecification.java
@@ -1,7 +1,7 @@
-package grep.neogulcoder.domain.calender.controller;
+package grep.neogulcoder.domain.calendar.controller;
 
-import grep.neogulcoder.domain.calender.controller.dto.requset.PersonalCalendarRequest;
-import grep.neogulcoder.domain.calender.controller.dto.response.PersonalCalendarResponse;
+import grep.neogulcoder.domain.calendar.controller.dto.requset.PersonalCalendarRequest;
+import grep.neogulcoder.domain.calendar.controller.dto.response.PersonalCalendarResponse;
 import grep.neogulcoder.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/TeamCalendarController.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/TeamCalendarController.java
@@ -1,8 +1,8 @@
-package grep.neogulcoder.domain.calender.controller;
+package grep.neogulcoder.domain.calendar.controller;
 
-import grep.neogulcoder.domain.calender.controller.dto.requset.TeamCalendarRequest;
-import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
-import grep.neogulcoder.domain.calender.service.TeamCalendarService;
+import grep.neogulcoder.domain.calendar.controller.dto.requset.TeamCalendarRequest;
+import grep.neogulcoder.domain.calendar.controller.dto.response.TeamCalendarResponse;
+import grep.neogulcoder.domain.calendar.service.TeamCalendarService;
 import grep.neogulcoder.global.response.ApiResponse;
 
 import jakarta.validation.Valid;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/TeamCalendarSpecification.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/TeamCalendarSpecification.java
@@ -1,7 +1,7 @@
-package grep.neogulcoder.domain.calender.controller;
+package grep.neogulcoder.domain.calendar.controller;
 
-import grep.neogulcoder.domain.calender.controller.dto.requset.TeamCalendarRequest;
-import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
+import grep.neogulcoder.domain.calendar.controller.dto.requset.TeamCalendarRequest;
+import grep.neogulcoder.domain.calendar.controller.dto.response.TeamCalendarResponse;
 import grep.neogulcoder.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/requset/PersonalCalendarRequest.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/requset/PersonalCalendarRequest.java
@@ -1,6 +1,6 @@
-package grep.neogulcoder.domain.calender.controller.dto.requset;
+package grep.neogulcoder.domain.calendar.controller.dto.requset;
 
-import grep.neogulcoder.domain.calender.entity.Calendar;
+import grep.neogulcoder.domain.calendar.entity.Calendar;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/requset/TeamCalendarRequest.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/requset/TeamCalendarRequest.java
@@ -1,6 +1,6 @@
-package grep.neogulcoder.domain.calender.controller.dto.requset;
+package grep.neogulcoder.domain.calendar.controller.dto.requset;
 
-import grep.neogulcoder.domain.calender.entity.Calendar;
+import grep.neogulcoder.domain.calendar.entity.Calendar;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/response/PersonalCalendarResponse.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/response/PersonalCalendarResponse.java
@@ -1,7 +1,7 @@
-package grep.neogulcoder.domain.calender.controller.dto.response;
+package grep.neogulcoder.domain.calendar.controller.dto.response;
 
-import grep.neogulcoder.domain.calender.entity.Calendar;
-import grep.neogulcoder.domain.calender.entity.PersonalCalendar;
+import grep.neogulcoder.domain.calendar.entity.Calendar;
+import grep.neogulcoder.domain.calendar.entity.PersonalCalendar;
 import grep.neogulcoder.domain.users.entity.User;
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/response/TeamCalendarResponse.java b/src/main/java/grep/neogulcoder/domain/calendar/controller/dto/response/TeamCalendarResponse.java
@@ -1,7 +1,7 @@
-package grep.neogulcoder.domain.calender.controller.dto.response;
+package grep.neogulcoder.domain.calendar.controller.dto.response;
 
-import grep.neogulcoder.domain.calender.entity.Calendar;
-import grep.neogulcoder.domain.calender.entity.TeamCalendar;
+import grep.neogulcoder.domain.calendar.entity.Calendar;
+import grep.neogulcoder.domain.calendar.entity.TeamCalendar;
 import grep.neogulcoder.domain.users.entity.User;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDateTime;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/entity/Calendar.java b/src/main/java/grep/neogulcoder/domain/calendar/entity/Calendar.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.calender.entity;
+package grep.neogulcoder.domain.calendar.entity;
 
 import grep.neogulcoder.global.entity.BaseEntity;
 import jakarta.persistence.*;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/entity/PersonalCalendar.java b/src/main/java/grep/neogulcoder/domain/calendar/entity/PersonalCalendar.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.calender.entity;
+package grep.neogulcoder.domain.calendar.entity;
 
 import grep.neogulcoder.global.entity.BaseEntity;
 import jakarta.persistence.*;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/entity/TeamCalendar.java b/src/main/java/grep/neogulcoder/domain/calendar/entity/TeamCalendar.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.calender.entity;
+package grep.neogulcoder.domain.calendar.entity;
 
 
 import grep.neogulcoder.global.entity.BaseEntity;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/exception/CalendarNotFoundException.java b/src/main/java/grep/neogulcoder/domain/calendar/exception/CalendarNotFoundException.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.calender.exception;
+package grep.neogulcoder.domain.calendar.exception;
 
 import grep.neogulcoder.global.exception.business.NotFoundException;
 import grep.neogulcoder.global.response.code.ErrorCode;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/exception/CalendarValidationException.java b/src/main/java/grep/neogulcoder/domain/calendar/exception/CalendarValidationException.java
@@ -1,6 +1,6 @@
-package grep.neogulcoder.domain.calender.exception;
+package grep.neogulcoder.domain.calendar.exception;
 
-import grep.neogulcoder.domain.calender.exception.code.CalendarErrorCode;
+import grep.neogulcoder.domain.calendar.exception.code.CalendarErrorCode;
 import grep.neogulcoder.global.exception.validation.ValidationException;
 
 public class CalendarValidationException extends ValidationException {
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/exception/code/CalendarErrorCode.java b/src/main/java/grep/neogulcoder/domain/calendar/exception/code/CalendarErrorCode.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.calender.exception.code;
+package grep.neogulcoder.domain.calendar.exception.code;
 
 import grep.neogulcoder.global.response.code.ErrorCode;
 import lombok.Getter;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/repository/PersonalCalendarQueryRepository.java b/src/main/java/grep/neogulcoder/domain/calendar/repository/PersonalCalendarQueryRepository.java
@@ -1,12 +1,12 @@
-package grep.neogulcoder.domain.calender.repository;
+package grep.neogulcoder.domain.calendar.repository;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import grep.neogulcoder.domain.calender.entity.PersonalCalendar;
-import grep.neogulcoder.domain.calender.entity.QPersonalCalendar;
+import grep.neogulcoder.domain.calendar.entity.PersonalCalendar;
+import grep.neogulcoder.domain.calendar.entity.QPersonalCalendar;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
-import static grep.neogulcoder.domain.calender.entity.QCalendar.calendar;
+import static grep.neogulcoder.domain.calendar.entity.QCalendar.calendar;
 
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/repository/PersonalCalendarRepository.java b/src/main/java/grep/neogulcoder/domain/calendar/repository/PersonalCalendarRepository.java
@@ -1,6 +1,6 @@
-package grep.neogulcoder.domain.calender.repository;
+package grep.neogulcoder.domain.calendar.repository;
 
-import grep.neogulcoder.domain.calender.entity.PersonalCalendar;
+import grep.neogulcoder.domain.calendar.entity.PersonalCalendar;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/repository/TeamCalendarQueryRepository.java b/src/main/java/grep/neogulcoder/domain/calendar/repository/TeamCalendarQueryRepository.java
@@ -1,15 +1,15 @@
-package grep.neogulcoder.domain.calender.repository;
+package grep.neogulcoder.domain.calendar.repository;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import grep.neogulcoder.domain.calender.entity.QTeamCalendar;
-import grep.neogulcoder.domain.calender.entity.TeamCalendar;
+import grep.neogulcoder.domain.calendar.entity.QTeamCalendar;
+import grep.neogulcoder.domain.calendar.entity.TeamCalendar;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
-import static grep.neogulcoder.domain.calender.entity.QCalendar.calendar;
+import static grep.neogulcoder.domain.calendar.entity.QCalendar.calendar;
 
 @Repository
 @RequiredArgsConstructor
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/repository/TeamCalendarRepository.java b/src/main/java/grep/neogulcoder/domain/calendar/repository/TeamCalendarRepository.java
@@ -1,6 +1,6 @@
-package grep.neogulcoder.domain.calender.repository;
+package grep.neogulcoder.domain.calendar.repository;
 
-import grep.neogulcoder.domain.calender.entity.TeamCalendar;
+import grep.neogulcoder.domain.calendar.entity.TeamCalendar;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/service/PersonalCalendarService.java b/src/main/java/grep/neogulcoder/domain/calendar/service/PersonalCalendarService.java
@@ -1,12 +1,12 @@
-package grep.neogulcoder.domain.calender.service;
+package grep.neogulcoder.domain.calendar.service;
 
-import grep.neogulcoder.domain.calender.controller.dto.requset.PersonalCalendarRequest;
-import grep.neogulcoder.domain.calender.controller.dto.response.PersonalCalendarResponse;
-import grep.neogulcoder.domain.calender.entity.Calendar;
-import grep.neogulcoder.domain.calender.entity.PersonalCalendar;
-import grep.neogulcoder.domain.calender.exception.code.CalendarErrorCode;
-import grep.neogulcoder.domain.calender.repository.PersonalCalendarQueryRepository;
-import grep.neogulcoder.domain.calender.repository.PersonalCalendarRepository;
+import grep.neogulcoder.domain.calendar.controller.dto.requset.PersonalCalendarRequest;
+import grep.neogulcoder.domain.calendar.controller.dto.response.PersonalCalendarResponse;
+import grep.neogulcoder.domain.calendar.entity.Calendar;
+import grep.neogulcoder.domain.calendar.entity.PersonalCalendar;
+import grep.neogulcoder.domain.calendar.exception.code.CalendarErrorCode;
+import grep.neogulcoder.domain.calendar.repository.PersonalCalendarQueryRepository;
+import grep.neogulcoder.domain.calendar.repository.PersonalCalendarRepository;
 import grep.neogulcoder.domain.users.entity.User;
 import grep.neogulcoder.domain.users.service.UserService;
 import grep.neogulcoder.global.exception.business.NotFoundException;
@@ -19,7 +19,7 @@
 import java.util.List;
 import org.springframework.transaction.annotation.Transactional;
 
-import static grep.neogulcoder.domain.calender.exception.code.CalendarErrorCode.CALENDAR_NOT_FOUND;
+import static grep.neogulcoder.domain.calendar.exception.code.CalendarErrorCode.CALENDAR_NOT_FOUND;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/grep/neogulcoder/domain/calendar/service/TeamCalendarService.java b/src/main/java/grep/neogulcoder/domain/calendar/service/TeamCalendarService.java
@@ -1,12 +1,12 @@
-package grep.neogulcoder.domain.calender.service;
-
-import grep.neogulcoder.domain.calender.controller.dto.requset.TeamCalendarRequest;
-import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
-import grep.neogulcoder.domain.calender.entity.Calendar;
-import grep.neogulcoder.domain.calender.entity.TeamCalendar;
-import grep.neogulcoder.domain.calender.exception.code.CalendarErrorCode;
-import grep.neogulcoder.domain.calender.repository.TeamCalendarQueryRepository;
-import grep.neogulcoder.domain.calender.repository.TeamCalendarRepository;
+package grep.neogulcoder.domain.calendar.service;
+
+import grep.neogulcoder.domain.calendar.controller.dto.requset.TeamCalendarRequest;
+import grep.neogulcoder.domain.calendar.controller.dto.response.TeamCalendarResponse;
+import grep.neogulcoder.domain.calendar.entity.Calendar;
+import grep.neogulcoder.domain.calendar.entity.TeamCalendar;
+import grep.neogulcoder.domain.calendar.exception.code.CalendarErrorCode;
+import grep.neogulcoder.domain.calendar.repository.TeamCalendarQueryRepository;
+import grep.neogulcoder.domain.calendar.repository.TeamCalendarRepository;
 import grep.neogulcoder.domain.users.entity.User;
 import grep.neogulcoder.domain.users.service.UserService;
 import grep.neogulcoder.global.exception.validation.ValidationException;
@@ -18,7 +18,7 @@
 import java.time.LocalDate;
 import java.util.List;
 
-import static grep.neogulcoder.domain.calender.exception.code.CalendarErrorCode.NOT_CALENDAR_OWNER;
+import static grep.neogulcoder.domain.calendar.exception.code.CalendarErrorCode.NOT_CALENDAR_OWNER;
 
 @Service
 @RequiredArgsConstructor
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatSwaggerController.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatSwaggerController.java
@@ -1,6 +1,6 @@
 package grep.neogulcoder.domain.groupchat.controller;
 
-import grep.neogulcoder.domain.groupchat.controller.dto.requset.GroupChatSwaggerRequest;
+import grep.neogulcoder.domain.groupchat.controller.dto.request.GroupChatSwaggerRequest;
 import grep.neogulcoder.domain.groupchat.controller.dto.response.GroupChatSwaggerResponse;
 import grep.neogulcoder.global.response.ApiResponse;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatSwaggerSpecification.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatSwaggerSpecification.java
@@ -1,6 +1,6 @@
 package grep.neogulcoder.domain.groupchat.controller;
 
-import grep.neogulcoder.domain.groupchat.controller.dto.requset.GroupChatSwaggerRequest;
+import grep.neogulcoder.domain.groupchat.controller.dto.request.GroupChatSwaggerRequest;
 import grep.neogulcoder.domain.groupchat.controller.dto.response.GroupChatSwaggerResponse;
 import grep.neogulcoder.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatWebSocketController.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatWebSocketController.java
@@ -1,6 +1,6 @@
 package grep.neogulcoder.domain.groupchat.controller;
 
-import grep.neogulcoder.domain.groupchat.controller.dto.requset.GroupChatMessageRequestDto;
+import grep.neogulcoder.domain.groupchat.controller.dto.request.GroupChatMessageRequestDto;
 import grep.neogulcoder.domain.groupchat.controller.dto.response.GroupChatMessageResponseDto;
 import grep.neogulcoder.domain.groupchat.service.GroupChatService;
 import io.swagger.v3.oas.annotations.Hidden;
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/dto/request/GroupChatMessageRequestDto.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/dto/request/GroupChatMessageRequestDto.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.groupchat.controller.dto.requset;
+package grep.neogulcoder.domain.groupchat.controller.dto.request;
 
 import grep.neogulcoder.domain.groupchat.entity.GroupChatMessage;
 import grep.neogulcoder.domain.groupchat.entity.GroupChatRoom;
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/dto/request/GroupChatSwaggerRequest.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/dto/request/GroupChatSwaggerRequest.java
@@ -1,4 +1,4 @@
-package grep.neogulcoder.domain.groupchat.controller.dto.requset;
+package grep.neogulcoder.domain.groupchat.controller.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/exception/GroupChatNotFoundException.java b/src/main/java/grep/neogulcoder/domain/groupchat/exception/GroupChatNotFoundException.java
@@ -0,0 +1,10 @@
+package grep.neogulcoder.domain.groupchat.exception;
+
+import grep.neogulcoder.global.exception.business.NotFoundException;
+import grep.neogulcoder.global.response.code.ErrorCode;
+
+public class GroupChatNotFoundException extends NotFoundException {
+  public GroupChatNotFoundException(ErrorCode errorCode) {
+    super(errorCode);
+  }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/exception/GroupChatValidationException.java b/src/main/java/grep/neogulcoder/domain/groupchat/exception/GroupChatValidationException.java
@@ -0,0 +1,10 @@
+package grep.neogulcoder.domain.groupchat.exception;
+
+import grep.neogulcoder.global.exception.validation.ValidationException;
+import grep.neogulcoder.global.response.code.ErrorCode;
+
+public class GroupChatValidationException extends ValidationException {
+  public GroupChatValidationException(ErrorCode errorCode) {
+    super(errorCode);
+  }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/exception/code/GroupChatErrorCode.java b/src/main/java/grep/neogulcoder/domain/groupchat/exception/code/GroupChatErrorCode.java
@@ -0,0 +1,23 @@
+package grep.neogulcoder.domain.groupchat.exception.code;
+
+import grep.neogulcoder.global.response.code.ErrorCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum GroupChatErrorCode implements ErrorCode {
+
+    CHAT_ROOM_NOT_FOUND("G01", HttpStatus.NOT_FOUND, "채팅방을 찾을 수 없습니다."),
+    USER_NOT_FOUND("G02", HttpStatus.NOT_FOUND, "사용자를 찾을 수 없습니다."),
+    USER_NOT_IN_STUDY("G03", HttpStatus.FORBIDDEN, "해당 스터디에 참가한 사용자만 채팅할 수 있습니다.");
+
+    private final String code;
+    private final HttpStatus status;
+    private final String message;
+
+    GroupChatErrorCode(String code, HttpStatus status, String message) {
+        this.code = code;
+        this.status = status;
+        this.message = message;
+    }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/service/GroupChatService.java b/src/main/java/grep/neogulcoder/domain/groupchat/service/GroupChatService.java
diff --git a/src/main/java/grep/neogulcoder/domain/study/controller/dto/response/StudyResponse.java b/src/main/java/grep/neogulcoder/domain/study/controller/dto/response/StudyResponse.java
diff --git a/src/main/java/grep/neogulcoder/domain/study/service/StudyService.java b/src/main/java/grep/neogulcoder/domain/study/service/StudyService.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package grep.neogulcoder.domain.calender.entity;`
	`1`	`+package grep.neogulcoder.domain.calendar.entity;`
`2`	`2`
`3`	`3`	`import grep.neogulcoder.global.entity.BaseEntity;`
`4`	`4`	`import jakarta.persistence.*;`