refactor : api 경로 변경 및 필요없는 코드 정리

src/main/java/org/ezcode/codetest/application/chatting/service/ChattingUseCase.java

@@ -56,7 +56,7 @@ public void removeChatRoom(ChatRoomDeleteRequest request, String email) {
 
 		ChatRoom removedRoom = chattingDomainService.getChatRoom(request.roomId());
 
-		chattingDomainService.isChatRoomOwner(removedRoom, user.getId());
+		chattingDomainService.checkChatRoomOwnerOrAdmin(removedRoom, user);
 
 		chattingDomainService.removeChatRoom(removedRoom);
 

src/main/java/org/ezcode/codetest/application/game/management/GameAdminUseCase.java

@@ -20,13 +20,15 @@
 import org.ezcode.codetest.domain.game.model.item.Item;
 import org.ezcode.codetest.domain.game.model.skill.Skill;
 import org.ezcode.codetest.domain.game.service.GameManagementDomainService;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@PreAuthorize("hasRole('ADMIN')")
 public class GameAdminUseCase {
 
 	private final GameManagementDomainService managementService;

src/main/java/org/ezcode/codetest/domain/chat/repository/ChatRepository.java

@@ -8,8 +8,6 @@ public interface ChatRepository {
 
 	Chat save(Chat chat);
 
-	List<Chat> findAll();
-
 	List<Chat> findChatsFromLastHour(Long roomId);
 
 }

src/main/java/org/ezcode/codetest/domain/chat/service/ChattingDomainService.java

@@ -8,6 +8,8 @@
 import org.ezcode.codetest.domain.chat.model.ChatRoom;
 import org.ezcode.codetest.domain.chat.repository.ChatRepository;
 import org.ezcode.codetest.domain.chat.repository.ChatRoomRepository;
+import org.ezcode.codetest.domain.user.model.entity.User;
+import org.ezcode.codetest.domain.user.model.enums.UserRole;
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
@@ -29,9 +31,9 @@ public void removeChatRoom(ChatRoom room) {
 		chatRoomRepository.delete(room);
 	}
 
-	public void isChatRoomOwner(ChatRoom room, Long userId) {
+	public void checkChatRoomOwnerOrAdmin(ChatRoom room, User user) {
 
-		if(!room.isOwner(userId)) {
+		if (!room.isOwner(user.getId()) && user.getRole() != UserRole.ADMIN) {
 			throw new ChattingException(ChattingExceptionCode.CHATROOM_NOT_OWNER);
 		}
 	}

src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/chat/ChatRepositoryImpl.java

@@ -21,12 +21,6 @@ public Chat save(Chat chat) {
 		return chatRepository.save(chat);
 	}
 
-	@Override
-	public List<Chat> findAll() {
-
-		return chatRepository.findAll();
-	}
-
 	@Override
 	public List<Chat> findChatsFromLastHour(Long roomId) {
 

src/main/java/org/ezcode/codetest/presentation/chattingmanagement/chatting/config/ChatWebConfig.java → src/main/java/org/ezcode/codetest/presentation/chatting/chatting/config/ChatWebConfig.java

@@ -1,6 +1,6 @@
-package org.ezcode.codetest.presentation.chattingmanagement.chatting.config;
+package org.ezcode.codetest.presentation.chatting.chatting.config;
 
-import org.ezcode.codetest.presentation.chattingmanagement.chatting.interceptor.ChatLimitInterceptor;
+import org.ezcode.codetest.presentation.chatting.chatting.interceptor.ChatLimitInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -16,6 +16,6 @@ public class ChatWebConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(chatSpamInterceptor)
-			.addPathPatterns("/api/room/*/chat");
+			.addPathPatterns("/api/rooms/*/chat");
 	}
 }

src/main/java/org/ezcode/codetest/presentation/chattingmanagement/chatting/controller/ChatController.java → src/main/java/org/ezcode/codetest/presentation/chatting/chatting/controller/ChatController.java

@@ -1,4 +1,4 @@
-package org.ezcode.codetest.presentation.chattingmanagement.chatting.controller;
+package org.ezcode.codetest.presentation.chatting.chatting.controller;
 
 import org.ezcode.codetest.application.chatting.dto.request.ChatSaveRequest;
 import org.ezcode.codetest.application.chatting.service.ChattingUseCase;
@@ -14,7 +14,7 @@
 import lombok.RequiredArgsConstructor;
 
 @Controller
-@RequestMapping("/api/room/{roomId}/chat")
+@RequestMapping("/api/rooms/{roomId}/chat")
 @RequiredArgsConstructor
 public class ChatController {
 

src/main/java/org/ezcode/codetest/presentation/chattingmanagement/chatting/controller/ChatRoomController.java → src/main/java/org/ezcode/codetest/presentation/chatting/chatting/controller/ChatRoomController.java

@@ -1,4 +1,4 @@
-package org.ezcode.codetest.presentation.chattingmanagement.chatting.controller;
+package org.ezcode.codetest.presentation.chatting.chatting.controller;
 
 import org.ezcode.codetest.application.chatting.dto.request.ChatRoomDeleteRequest;
 import org.ezcode.codetest.application.chatting.dto.request.ChatRoomSaveRequest;
@@ -21,7 +21,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/chatrooms")
+@RequestMapping("/api/rooms")
 public class ChatRoomController {
 
 	private final ChattingUseCase chatUseCase;

src/main/java/org/ezcode/codetest/presentation/chattingmanagement/chatting/interceptor/ChatLimitInterceptor.java → src/main/java/org/ezcode/codetest/presentation/chatting/chatting/interceptor/ChatLimitInterceptor.java

@@ -1,4 +1,4 @@
-package org.ezcode.codetest.presentation.chattingmanagement.chatting.interceptor;
+package org.ezcode.codetest.presentation.chatting.chatting.interceptor;
 
 import java.util.Map;
 

src/main/java/org/ezcode/codetest/presentation/chattingmanagement/event/EventHandleController.java → src/main/java/org/ezcode/codetest/presentation/chatting/event/EventHandleController.java

@@ -1,4 +1,4 @@
-package org.ezcode.codetest.presentation.chattingmanagement.event;
+package org.ezcode.codetest.presentation.chatting.event;
 
 import java.security.Principal;
 
@@ -25,7 +25,7 @@ public void handleGetChatRoomList(
 		chatUseCase.getChatRoomList(principal.getName(), sessionId);
 	}
 
-	@MessageMapping("/room/{roomId}/enter")
+	@MessageMapping("/rooms/{roomId}/enter")
 	public void handleGetChattingHistory(
 		Principal principal,
 		@DestinationVariable Long roomId,
@@ -35,7 +35,7 @@ public void handleGetChattingHistory(
 		chatUseCase.getChattingHistory(sessionId, principal.getName(), principal.getName(), roomId);
 	}
 
-	@MessageMapping("/room/{roomId}/left")
+	@MessageMapping("/rooms/{roomId}/left")
 	public void handleChatRoomLeft(
 		Principal principal,
 		@DestinationVariable Long roomId,

src/main/java/org/ezcode/codetest/presentation/chattingmanagement/view/ChatViewController.java → src/main/java/org/ezcode/codetest/presentation/chatting/view/ChatViewController.java

@@ -1,4 +1,4 @@
-package org.ezcode.codetest.presentation.chattingmanagement.view;
+package org.ezcode.codetest.presentation.chatting.view;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/resources/templates/chat-page.html

@@ -308,7 +308,7 @@ <h2>채팅방 목록</h2>
                     const nr = li.dataset.roomId;
                     if (!nr || currentRoomId === nr) return;
                     if (chatSubscription && currentRoomId) {
-                        stompClient.send(`/chat/room/${currentRoomId}/left`, {}, currentRoomId);
+                        stompClient.send(`/chat/rooms/${currentRoomId}/left`, {}, currentRoomId);
                         chatSubscription.unsubscribe();
                     }
                     currentRoomId = nr;
@@ -337,7 +337,7 @@ <h2>채팅방 목록</h2>
                             }, 100);
                         });
                         setTimeout(() => {
-                            stompClient.send(`/chat/room/${nr}/enter`, {}, nr);
+                            stompClient.send(`/chat/rooms/${nr}/enter`, {}, nr);
                         }, 100);
                     }, 100);
                 });
@@ -352,7 +352,7 @@ <h2>채팅방 목록</h2>
                     if (!currentRoomId) return;
                     const m = msgInput.value.trim();
                     if (!m) return;
-                    fetch(`/api/room/${currentRoomId}/chat`, {
+                    fetch(`/api/rooms/${currentRoomId}/chat`, {
                         method: 'POST',
                         headers: {
                             'Content-Type': 'application/json',

src/test/java/org/ezcode/codetest/application/chatting/service/ChattingUseCaseTest.java

@@ -6,7 +6,6 @@
 import static org.mockito.Mockito.*;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 
 import org.ezcode.codetest.application.chatting.dto.request.ChatRoomDeleteRequest;
@@ -168,7 +167,7 @@ void removeChatRoom() {
 			// then
 			verify(userDomainService).getUser(TEST_EMAIL);
 			verify(chattingDomainService).getChatRoom(TEST_ROOM_ID);
-			verify(chattingDomainService).isChatRoomOwner(chatRoom1, user.getId());
+			verify(chattingDomainService).checkChatRoomOwnerOrAdmin(chatRoom1, user);
 			verify(chattingDomainService).removeChatRoom(chatRoom1);
 
 			ArgumentCaptor<ChatRoomCache> cacheCaptor = ArgumentCaptor.forClass(ChatRoomCache.class);

src/test/java/org/ezcode/codetest/domain/chat/service/ChattingDomainServiceTest.java

@@ -41,6 +41,7 @@ class ChattingDomainServiceTest {
 	private ChatRoom chatRoom;
 
 	private User user;
+	private User wrongUser;
 	private Chat chat;
 
 	private static final Long TEST_ROOM_ID = 1L;
@@ -61,8 +62,19 @@ void setUp() {
 			.age(22)
 			.build();
 
+		wrongUser = User.builder()
+			.email(TEST_EMAIL)
+			.username("익명2")
+			.password("P@ssw0rd12252")
+			.nickname("익명 닉네임22")
+			.tier(Tier.NEWBIE)
+			.age(22)
+			.build();
+
 		ReflectionTestUtils.setField(user, "id", TEST_ROOM_ID);
 
+		ReflectionTestUtils.setField(wrongUser, "id", WRONG_USER_ID);
+
 		chatRoom = ChatRoom.builder()
 			.title(TEMP_TITLE_1)
 			.user(user)
@@ -114,11 +126,11 @@ void isChatRoomOwner() {
 			doReturn(true).when(chatRoom).isOwner(user.getId());
 
 			// when
-			chattingDomainService.isChatRoomOwner(chatRoom, user.getId());
+			chattingDomainService.checkChatRoomOwnerOrAdmin(chatRoom, user);
 
 			// then
 			assertDoesNotThrow(() ->
-				chattingDomainService.isChatRoomOwner(chatRoom, user.getId())
+				chattingDomainService.checkChatRoomOwnerOrAdmin(chatRoom, user)
 			);
 		}
 
@@ -184,7 +196,7 @@ void isChatRoomOwner() {
 
 			// when
 			ChattingException exception = assertThrows(ChattingException.class,
-				() -> chattingDomainService.isChatRoomOwner(chatRoom, WRONG_USER_ID));
+				() -> chattingDomainService.checkChatRoomOwnerOrAdmin(chatRoom, wrongUser));
 
 			// then
 			assertAll(