From 76c76a927e2527418400532d50dbbd02d994f0ca Mon Sep 17 00:00:00 2001 From: HEE-GEON Date: Wed, 6 Sep 2023 17:24:06 +0900 Subject: [PATCH 01/32] =?UTF-8?q?[Feature]=20=EC=B1=84=ED=8C=85=EB=B0=A9?= =?UTF-8?q?=20=EC=9E=85=EC=9E=A5,=20=ED=87=B4=EC=9E=A5=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=B6=9C=EB=A0=A5=20+=20=EC=B0=B8?= =?UTF-8?q?=EC=97=AC=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20=EC=8B=A4=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EB=B3=80=EB=8F=99=20=EC=B6=94=EA=B0=80=20(#209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :sparkles: feat: 더미데이터 추가 * :sparkles: feat: 채팅방 정보 조회 API 추가 * :sparkles: feat: 채팅 입장 메시지, 퇴장 메시지 연동 --- .../config/WebSocketStompConfig.java | 6 +- .../controller/api/ChatRoomController.java | 9 + .../controller/message/MessageController.java | 22 +- .../dto/message/RoleExplainMessage.java | 29 + .../springles/game/GameSessionManager.java | 3 - src/main/resources/data.sql | 72 ++- src/main/resources/templates/chat-room.html | 505 ++++++++++-------- src/main/resources/templates/home/add.html | 4 +- 8 files changed, 422 insertions(+), 228 deletions(-) create mode 100644 src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java diff --git a/src/main/java/com/springles/config/WebSocketStompConfig.java b/src/main/java/com/springles/config/WebSocketStompConfig.java index 5d9ac073..f098cfaf 100644 --- a/src/main/java/com/springles/config/WebSocketStompConfig.java +++ b/src/main/java/com/springles/config/WebSocketStompConfig.java @@ -27,7 +27,7 @@ public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { - registry.addEndpoint("/chatting"); + registry.addEndpoint("/chatting").setAllowedOrigins("*"); } @@ -41,9 +41,9 @@ public void configureMessageBroker(MessageBrokerRegistry registry) { registry.enableSimpleBroker("/topic", "/sub/chat", "/sub/gameStart", - "/sub/player", "/sub/joinGame", - "/sub/exitGame" + "/sub/exitGame", + "/sub/gameRole" ); // 발신 diff --git a/src/main/java/com/springles/controller/api/ChatRoomController.java b/src/main/java/com/springles/controller/api/ChatRoomController.java index 2f82c324..12ae42aa 100644 --- a/src/main/java/com/springles/controller/api/ChatRoomController.java +++ b/src/main/java/com/springles/controller/api/ChatRoomController.java @@ -3,6 +3,7 @@ import com.springles.controller.ui.MemberUiController; import com.springles.domain.constants.ResponseCode; import com.springles.domain.dto.chatroom.ChatRoomReqDTO; +import com.springles.domain.dto.chatroom.ChatRoomResponseDto; import com.springles.domain.dto.chatroom.ChatRoomUpdateReqDto; import com.springles.domain.dto.member.MemberCreateRequest; import com.springles.domain.dto.member.MemberInfoResponse; @@ -109,4 +110,12 @@ public String deleteChatRoom( chatRoomService.deleteChatRoom(memberId, chatroomid); return "redirect:/v1/chatrooms"; } + + @GetMapping("/chatRooms/{roomId}") + public ChatRoomResponseDto findRoomInfo( + @PathVariable Long roomId + ) { + return chatRoomService.findChatRoomByChatRoomId(roomId); + } + } diff --git a/src/main/java/com/springles/controller/message/MessageController.java b/src/main/java/com/springles/controller/message/MessageController.java index b9017698..ed220a0f 100644 --- a/src/main/java/com/springles/controller/message/MessageController.java +++ b/src/main/java/com/springles/controller/message/MessageController.java @@ -4,6 +4,7 @@ import com.springles.domain.constants.GameRole; import com.springles.domain.constants.ResponseCode; import com.springles.domain.dto.chatroom.ChatRoomResponseDto; +import com.springles.domain.dto.message.RoleExplainMessage; import com.springles.domain.entity.ChatRoom; import com.springles.domain.entity.GameSession; import com.springles.domain.entity.Player; @@ -45,14 +46,14 @@ public void sendMessage(SimpMessageHeaderAccessor accessor, String message, Player player = gameSessionManager.findPlayerByMemberName(getMemberName(accessor)); // 관전자는 관전자들끼리만 채팅이 가능 if (player.getRole().equals(GameRole.OBSERVER)) { - messageManager.sendMessage("/sub/chat/" + roomId + "/" + "observer", message, roomId, + messageManager.sendMessage("/sub/chat/" + roomId + "/" + GameRole.OBSERVER, message, roomId, player.getMemberName()); return; } // 밤 투표시간에는 마피아끼리만 채팅 가능 if (gameSession.getGamePhase().equals(GamePhase.NIGHT_VOTE)) { if (player.getRole().equals(GameRole.MAFIA)) { - messageManager.sendMessage("/sub/chat/" + roomId + "/" + "mafia", message, roomId, + messageManager.sendMessage("/sub/chat/" + roomId + "/" + GameRole.MAFIA, message, roomId, player.getMemberName()); } return; @@ -75,9 +76,11 @@ public void sendMessage_GameJoin(SimpMessageHeaderAccessor accessor, @DestinationVariable Long roomId) { String memberName = getMemberName(accessor); + // 게임 참여자 목록 갱신 messageManager.sendMessage( "/sub/chat/" + roomId + "/" + "playerList", gameSessionManager.addUser(roomId, memberName)); + // 게임 참여 메시지 전송 messageManager.sendMessage( "/sub/chat/" + roomId, @@ -91,10 +94,14 @@ public void sendMessage_GameExit(SimpMessageHeaderAccessor accessor, @DestinationVariable Long roomId) { String memberName = getMemberName(accessor); gameSessionManager.removePlayer(roomId, memberName); + + // 게임 참여자 목록 갱신 messageManager.sendMessage( "/sub/chat/" + roomId + "/" + "playerList", gameSessionManager.findPlayersByRoomId(roomId) ); + + // 게임 퇴장 메시지 전송 messageManager.sendMessage( "/sub/chat/" + roomId, memberName + "님이 퇴장하셨습니다.", @@ -114,9 +121,8 @@ public void sendMessage_GameStart(SimpMessageHeaderAccessor accessor, List mafiaList = new ArrayList<>(); gameSessionManager.startGame(roomId, getMemberName(accessor)).forEach(p -> { messageManager.sendMessage( - "/sub/chat/" + roomId + "/" + p.getMemberId(), - "당신은 " + p.getRole() + "입니다.", - roomId, "admin" + "/sub/chat/" + roomId + "/gameRole/" + p.getMemberName(), + new RoleExplainMessage(p.getRole(), getTimeString()) ); if (p.getRole().equals(GameRole.MAFIA)) { mafiaList.add(p); @@ -129,7 +135,7 @@ public void sendMessage_GameStart(SimpMessageHeaderAccessor accessor, mafiaList.forEach(m -> { messageManager.sendMessage( - "/sub/chat/" + roomId + "/" + m.getMemberId(), + "/sub/chat/" + roomId + "/" + m.getMemberName(), "마피아 플레이어는" + " [" + mafiaListString + "] " + "입니다.", roomId, "admin" ); @@ -150,4 +156,8 @@ public void sendMessage_GameUpdate(SimpMessageHeaderAccessor accessor, public String getMemberName(SimpMessageHeaderAccessor accessor) { return accessor.getUser().getName().split(",")[1].split(":")[1].trim(); } + + public String getTimeString() { + return new SimpleDateFormat("HH:mm").format(new Date()); + } } diff --git a/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java b/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java new file mode 100644 index 00000000..766bf9e3 --- /dev/null +++ b/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java @@ -0,0 +1,29 @@ +package com.springles.domain.dto.message; + +import com.springles.domain.constants.GameRole; +import com.springles.domain.constants.Role; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.context.annotation.Bean; + +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class RoleExplainMessage { + + GameRole gameRole; + String message; + String sender; + String time; + + public RoleExplainMessage(GameRole gameRole, String time) { + this.gameRole = gameRole; + this.message = "당신의 직업은 " + gameRole + "입니다."; + this.sender = "admin"; + this.time = time; + } + +} diff --git a/src/main/java/com/springles/game/GameSessionManager.java b/src/main/java/com/springles/game/GameSessionManager.java index 8a58370c..241bfbd1 100644 --- a/src/main/java/com/springles/game/GameSessionManager.java +++ b/src/main/java/com/springles/game/GameSessionManager.java @@ -37,9 +37,6 @@ public class GameSessionManager { public void createGame(Long roomId) { ChatRoom chatRoom = chatRoomJpaRepository.findByIdCustom(roomId); gameSessionRedisRepository.save(GameSession.of(chatRoom)); - Member member = memberJpaRepository.findById(chatRoom.getOwnerId()) - .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND)); - addUser(chatRoom.getId(), member.getMemberName()); } /* 게임 시작 */ diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 60c29c01..875d9a22 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,3 +1,69 @@ -insert into member (email,is_deleted,member_name,password,role) values ('dsd2@naver.com',0,'ssssss','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); -insert into member_game_info (is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) values (0,'0','1','1','NONE','BEGINNER','ddd','PROFILE01'); -insert into chat_room (close, capacity, chatroom_id, head, owner_id, password, state, title) values (0, '7', '1', '1', '1', '', 'WAITING', 'dddd'); \ No newline at end of file +insert into member +(email,is_deleted,member_name,password,role) +values + ('admin@naver.com',0,'admin123','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); + +insert into member +(email,is_deleted,member_name,password,role) +values + ('test1@naver.com',0,'test1','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); +insert into member +(email,is_deleted,member_name,password,role) +values + ('test2@naver.com',0,'test2','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); +insert into member +(email,is_deleted,member_name,password,role) +values + ('test3@naver.com',0,'test3','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); +insert into member +(email,is_deleted,member_name,password,role) +values + ('test4@naver.com',0,'test4','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); +insert into member +(email,is_deleted,member_name,password,role) +values + ('test5@naver.com',0,'test5','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); +insert into member +(email,is_deleted,member_name,password,role) +values + ('test6@naver.com',0,'test6','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); +insert into member +(email,is_deleted,member_name,password,role) +values + ('test7@naver.com',0,'test7','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); + + +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','1','1','NONE','BEGINNER','admin','PROFILE01'); +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','2','2','NONE','BEGINNER','test1','PROFILE01'); +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','3','3','NONE','BEGINNER','test3','PROFILE01'); +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','4','4','NONE','BEGINNER','test4','PROFILE01'); +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','5','5','NONE','BEGINNER','test5','PROFILE01'); +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','6','6','NONE','BEGINNER','test6','PROFILE01'); +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) +values + (0,'0','7','7','NONE','BEGINNER','test7','PROFILE01'); + + +insert into chat_room +(close, capacity, chatroom_id, head, owner_id, password, state, title) +values + (0, '7', '1', '0', '1', '', 'WAITING', 'mafia'); \ No newline at end of file diff --git a/src/main/resources/templates/chat-room.html b/src/main/resources/templates/chat-room.html index 36c3f0b0..b98077de 100644 --- a/src/main/resources/templates/chat-room.html +++ b/src/main/resources/templates/chat-room.html @@ -6,240 +6,323 @@
-
-
-
- -

참여자

- / -
- -
사람 이름이 여기 나와야하눈뎅,,
-
-
-
-
-
-
- -
- -
-
- -

-
- -
- - -
-
+
+ +

참여자

+ / + +
+ + +
+
+ +
+ +
+
+ +

+ +
+ + +
+
+
- - - - + + + +
\ No newline at end of file diff --git a/src/main/resources/templates/home/add.html b/src/main/resources/templates/home/add.html index 32cc3b43..29cdb731 100644 --- a/src/main/resources/templates/home/add.html +++ b/src/main/resources/templates/home/add.html @@ -84,9 +84,9 @@ success: function(data) { stompClient.send(`/pub/gameCreate/${data.data.id}`) // response data에서 방장 이름 가져오기 - const nickName = response.data.nickName; + const nickName = data.data.nickName; // response data에서 roomId 가져오기 - const roomId = response.data.id; + const roomId = data.data.id; // 성공할 경우 해당 채팅방으로 바로 이동 location.replace('http://localhost:8080/chat/'+roomId+'/'+nickName); }, From a7ee7767b2c1aca8bcfc5661697d2c945fc6db35 Mon Sep 17 00:00:00 2001 From: Huisu <87214089+ranunclulus@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:56:51 +0900 Subject: [PATCH 02/32] =?UTF-8?q?Feat/#206=20vote=20connect=20=EC=A4=91?= =?UTF-8?q?=EA=B0=84=20pr=20(#210)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :truck: chore: * :sparkles: feat: <사용자 이름 수정과 mapping에서 convertandSend url 수정> * :rewind: revert: <되돌리기> * :sparkles: feat: * :sparkles: feat: <버튼 누르면 startVote 호출> * :sparkles: feat: <중간 커밋> --- .../config/WebSocketStompConfig.java | 31 +++++++++++++++++++ .../controller/message/VoteController.java | 7 ++--- .../repository/VoteRedisRepository.java | 18 ++++++++--- .../impl/GameSessionVoteServiceImpl.java | 3 +- src/main/resources/data.sql | 2 +- src/main/resources/templates/chat-room.html | 14 +++++++++ 6 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/springles/config/WebSocketStompConfig.java b/src/main/java/com/springles/config/WebSocketStompConfig.java index f098cfaf..ae9da995 100644 --- a/src/main/java/com/springles/config/WebSocketStompConfig.java +++ b/src/main/java/com/springles/config/WebSocketStompConfig.java @@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; @@ -71,5 +72,35 @@ public MessageListenerAdapter dayEliminationListener(DayEliminationManager subsc return new MessageListenerAdapter(subscriber, "sendMessage"); } + @Bean + public ChannelTopic topicStartFin() { + return new ChannelTopic("START_FIN"); + } + + @Bean + public ChannelTopic topicDayDiscussionFin() { + return new ChannelTopic("DAY_DISCUSSION_FIN"); + } + + @Bean + public ChannelTopic topicDayEliminationFin() { + return new ChannelTopic("DAY_ELIMINAION_FIN"); + } + + @Bean + public ChannelTopic topicDayToNightFin() { + return new ChannelTopic("DAY_TO_NIGHT_FIN"); + } + + @Bean + public ChannelTopic topicNightVoteFin() { + return new ChannelTopic("NIGHT_VOTE_FIN"); + } + + @Bean + public ChannelTopic topicEnd() { + return new ChannelTopic("END"); + } + } diff --git a/src/main/java/com/springles/controller/message/VoteController.java b/src/main/java/com/springles/controller/message/VoteController.java index 03ad44ce..aefbbeff 100644 --- a/src/main/java/com/springles/controller/message/VoteController.java +++ b/src/main/java/com/springles/controller/message/VoteController.java @@ -36,10 +36,8 @@ public class VoteController { private final SimpMessagingTemplate simpMessagingTemplate; private final PlayerRedisRepository playerRedisRepository; - @MessageMapping("/pub/chat/{roomId}/start") - private void voteStart (SimpMessageHeaderAccessor accessor, - @DestinationVariable Long roomId, - @Payload GameSessionVoteRequestDto request) { + @MessageMapping("/chat/{roomId}/start") + private void voteStart (SimpMessageHeaderAccessor accessor, @DestinationVariable Long roomId) { GameSession gameSession = gameSessionManager.findGameByRoomId(roomId); gameSession.changePhase(GamePhase.DAY_DISCUSSION, 100); gameSession.passADay(); @@ -56,6 +54,7 @@ private void voteStart (SimpMessageHeaderAccessor accessor, Map alivePlayerMap = new HashMap<>(); for (Player player : players) { + log.info("Room {} has Player {} ", gameSession.getRoomId(), player.getMemberName()); if (player.isAlive()) { alivePlayerMap.put(player.getMemberId(), player.getRole()); } diff --git a/src/main/java/com/springles/repository/VoteRedisRepository.java b/src/main/java/com/springles/repository/VoteRedisRepository.java index 889817f6..8f47aee5 100644 --- a/src/main/java/com/springles/repository/VoteRedisRepository.java +++ b/src/main/java/com/springles/repository/VoteRedisRepository.java @@ -3,6 +3,7 @@ import com.springles.domain.constants.GamePhase; import com.springles.domain.entity.Vote; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Repository; @@ -13,11 +14,12 @@ @Repository @Getter +@Slf4j public class VoteRedisRepository { // RedisTemplate: Redis 데이터베이스와 상호작용하기 위한 편리한 방법을 제공하는 도구 private final RedisTemplate redisTemplate; // HashOperations: Redis 해시에 데이터를 추가하고 조회하고 수정하고 삭제하는 작업을 간편하게 수행 - private HashOperations opsHashVote; + private HashOperations opsHashVote; private static final String key = "Vote"; // 의존성 주입하고 초기 세팅 @@ -38,28 +40,34 @@ public Map startVote(List players, GamePhase phase) { // 존재하면 가져오기 vote = getVote(playerId); } + voteResult.put(playerId, vote); updateVote(playerId, vote); }); + for(Long id : voteResult.keySet()) { + log.info("Player Id : {} Vote : {}", id, voteResult.get(id).toString()); + } return voteResult; } // playerId에 해당하는 사용자가 남긴 투표가 존재하는지 검색 public boolean isExist(Long playerId) { - return opsHashVote.hasKey(key, playerId); + return opsHashVote.hasKey(key, String.valueOf(playerId)); } // playerId에 해당하는 사용자가 남긴 투표 반환 public Vote getVote(Long playerId) { - return opsHashVote.get(key, playerId); + + return opsHashVote.get(key, String.valueOf(playerId)); } // Vote를 받아서 업데이트하는 함수 private void updateVote(Long playerId, Vote vote) { - opsHashVote.put(key, playerId, vote); + + opsHashVote.put(key, String.valueOf(playerId), vote); } private void deleteVote(Long playerId) { - opsHashVote.delete(key, playerId); + opsHashVote.delete(key, String.valueOf(playerId)); } diff --git a/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java b/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java index 7d677091..3b04da21 100644 --- a/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java +++ b/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java @@ -45,7 +45,8 @@ public void startVote(Long roomId, int phaseCount, GamePhase phase, LocalDateTim task.setRoomId(roomId); task.setPhaseCount(phaseCount); task.setPhase(phase); - timer.schedule(task, TimeConfig.convertToDate(time)); + // 플레이어 하나당 20초의 회의 시간을 줌 + timer.schedule(task, players.size() * 20000L); } @Override diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 875d9a22..5f22a738 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -14,7 +14,7 @@ values insert into member (email,is_deleted,member_name,password,role) values - ('test3@naver.com',0,'test3','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); + insert into member (email,is_deleted,member_name,password,role) values diff --git a/src/main/resources/templates/chat-room.html b/src/main/resources/templates/chat-room.html index b98077de..9c7e0bc5 100644 --- a/src/main/resources/templates/chat-room.html +++ b/src/main/resources/templates/chat-room.html @@ -130,6 +130,12 @@

참여자

--> + +
+ + +
@@ -254,7 +260,15 @@

참여자

+ messageOutput.message)); response.appendChild(p); } +// 투표 테스트를 위한 임시 코드 + document.getElementById("vote-test").addEventListener("submit", (event) => { + event.preventDefault() + stompClient.send(`/pub/chat/${roomId}/start`, { + "Authorization": "Bearer Token_here" + }); + // /pub/chat/{roomId}/start + }) document.getElementById("message-form").addEventListener("submit", (event) => { event.preventDefault() const messageInput = document.getElementById('message'); From def0e764b654eec3322a351b7402ef75734ea78e Mon Sep 17 00:00:00 2001 From: nayonnii Date: Wed, 6 Sep 2023 19:10:27 +0900 Subject: [PATCH 03/32] =?UTF-8?q?:bug:=20fix:=20JwtTokenFilter=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/springles/jwt/JwtTokenFilter.java | 290 ++++++++++++------ 1 file changed, 203 insertions(+), 87 deletions(-) diff --git a/src/main/java/com/springles/jwt/JwtTokenFilter.java b/src/main/java/com/springles/jwt/JwtTokenFilter.java index cd9df0fa..60163e2c 100644 --- a/src/main/java/com/springles/jwt/JwtTokenFilter.java +++ b/src/main/java/com/springles/jwt/JwtTokenFilter.java @@ -18,7 +18,9 @@ import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; +import java.util.Date; @Slf4j @Component @@ -26,8 +28,7 @@ public class JwtTokenFilter extends OncePerRequestFilter { private final JwtTokenUtils jwtTokenUtils; - private String accessToken = ""; - private String refreshTokenId = ""; + @Override protected void doFilterInternal( @@ -36,83 +37,101 @@ protected void doFilterInternal( FilterChain filterChain ) throws ServletException, IOException { + String accessToken = ""; + String refreshTokenId = ""; + Cookie[] cookies = request.getCookies(); - /** 쿠키에서 accessToken과 refreshTokenId 추출 */ + log.info(request.getRequestURI()); + + /** + * 쿠키에서 accessToken(atk), refreshToken(rtk) 추출 + * */ if (cookies != null) { - log.info("쿠키 != null"); + log.info("쿠키 있음"); for (Cookie cookie : cookies) { + + // 쿠키에 atk가 있는지 확인 if ("accessToken".equals(cookie.getName())) { accessToken = cookie.getValue(); - request.setAttribute("accessToken", accessToken); - } - if ("refreshTokenId".equals(cookie.getName())) { + log.info("쿠키에 atk 있음"); + log.info("atk: " + accessToken); + // 혹은 쿠키에 rtk가 있는지 확인 + } else if ("refreshTokenId".equals(cookie.getName())) { refreshTokenId = cookie.getValue(); + log.info("쿠키에 rtk 있음"); + log.info("rtk: " + refreshTokenId); } } + } else { + /* + * [쿠키가 null이면 인증 절차를 거치지 않음] + * 권한이 필요한 api일 경우, 로그인 화면으로 이동 + * 권한이 필요 없는 api일 경우, 화면 정상 출력 + */ + } - /** 쿠키에 accessToken이 존재할 경우 */ - if (!accessToken.equals("")) { - log.info("쿠키에 accessToken이 존재"); - - // accessToken 로그아웃 여부 체크 - if (jwtTokenUtils.isNotLogout(accessToken)) { - log.info("로그아웃 안됨"); - - /* accessToken 유효성 체크 - * 0 : 유효하지 않은 JWT 서명, 지원되지 않는 JWT토큰, 잘못된 JWT 토큰 - * 1 : 유효한 토큰 - * 2 : 유효기간이 만료된 토큰 - * */ - if (jwtTokenUtils.validate(accessToken) != 0) { - log.info("validate(accessToken) != 0"); - - // accessToken 유효기간 만료 or 짧게 남음 체크 - if ((jwtTokenUtils.validate(accessToken) == 2) -// || ((jwtTokenUtils.parseClaims(accessToken).getExpiration().getTime() - Date.from(Instant.now()).getTime()) / 1000) < 30L - ) { - log.info("유효기간 만료 or 적게남음"); - - // refreshTokenId가 있을 경우 - if (!refreshTokenId.equals("")) { - // accessToken 갱신 - // 만약 refreshToken이 DB에 존재하거나 유효하지 않을 경우 jwtTokenUtils.reissue() 메소드에서 ""가 반환됨(유효x) - accessToken = jwtTokenUtils.reissue(refreshTokenId); - - // 갱신한 accessToken이 유효한지 체크 - if (!accessToken.equals("")) { - // accessToken 재발급 후 쿠키, attribute에 저장 - jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); - request.setAttribute("accessToken", accessToken); - log.info("accessToken 재발급 완료"); - } - - // refreshToken이 DB 상에 존재하지 않거나 유효하지 않는 경우 - // (쿠키에는 있었으나 로직을 수행하는 사이 refreshToken의 유효시간이 지나서 DB에서 삭제된 경우) - else { - log.info("refreshToken이 DB에 존재하지 않거나 유효하지 않음"); - throw new CustomException(ErrorCode.INVALID_REFRESH_TOKEN); - } - } - // 쿠키에 refreshTokenId가 없을 경우 - else { - log.info("refreshToken이 쿠키에 존재하지 않음"); + /** + * 토큰 존재유무/유효성 판별 + * */ + // 쿠키에 atk가 있는지 확인 + if (!accessToken.equals("")) { + + // atk가 로그아웃 됐는지 확인 + if (jwtTokenUtils.isNotLogout(accessToken)) { + log.info("로그아웃 안됨"); + + // atk가 정상인지 확인(서명 등) + if (jwtTokenUtils.validate(accessToken) == 1) { + log.info("atk valid 정상"); + + // atk의 유효시간이 적게 남았는지 확인 + if(((jwtTokenUtils.parseClaims(accessToken).getExpiration().getTime() - Date.from(Instant.now()).getTime()) / 1000) < 30L) { + // rtk가 추출되었는지 확인 + if (!refreshTokenId.equals("")) { + + // atk 재발급 + accessToken = jwtTokenUtils.reissue(refreshTokenId); + + // atk 값이 비어있지 않은지 확인 + // 재발급을 했는데도 불구하고 값이 비어있으면 rtk가 비정상인 것 + if (!accessToken.equals("")) { + // atk가 정상 + log.info("atk 재발급 완료"); + + // 쿠키에 저장 + jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); + log.info("atk 쿠키에 저장 완료"); + + } else { + // atk 값이 비어있을 경우 + log.info("rtk 비정상, 재발급 불가"); + + // 현재 rtk 쿠키 초기화 + refreshTokenId = ""; + accessToken = ""; + + // rtk 쿠키 삭제 + jwtTokenUtils.setInitTokenCookie("refreshTokenId", null, response); + jwtTokenUtils.setInitTokenCookie("accessToken", null, response); + + // 예외 처리(로그인 화면으로 이동) throw new CustomException(ErrorCode.NO_JWT_TOKEN); } + } else { + /* + * rtk가 없다면 atk 재발급하지 않고 인증 진행 + */ } } - // accessToken이 유효하지 않을 경우 - else { - log.info("accessToken이 유효하지 않음"); - throw new CustomException(ErrorCode.NO_JWT_TOKEN); - } - // 인증객체 생성 + log.info("인증객체 생성"); SecurityContext context = SecurityContextHolder.createEmptyContext(); String memberName = jwtTokenUtils.parseClaims(accessToken).getSubject(); + log.info("memberName : " + memberName ); AbstractAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( MemberCreateRequest.builder() @@ -123,42 +142,139 @@ protected void doFilterInternal( context.setAuthentication(authenticationToken); SecurityContextHolder.setContext(context); } - } + // atk가 정상이 아닐 경우 + else { + // 현재 atk 초기화 + accessToken = ""; + log.info("atk valid 비정상"); + log.info("atk : " + accessToken); - /** accessToken이 존재하지 않고, refreshTokenId만 존재할 경우 */ - else if(!refreshTokenId.equals("")) { - accessToken = jwtTokenUtils.reissue(refreshTokenId); + // atk 쿠키 삭제 + jwtTokenUtils.setInitTokenCookie("accessToken", null, response); - // 갱신한 accessToken이 유효한지 체크 - if (!accessToken.equals("")) { - // accessToken 재발급 후 쿠키, attribute에 저장 - jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); - request.setAttribute("accessToken", accessToken); - log.info("accessToken 재발급 완료"); + // atk의 유효기간이 만료된 거였다면 rtk 확인 + if (jwtTokenUtils.validate(accessToken) == 2) { + log.info("atk valid 비정상 - 유효기간 만료"); - // 인증객체 생성 - SecurityContext context = SecurityContextHolder.createEmptyContext(); - String memberName = jwtTokenUtils.parseClaims(accessToken).getSubject(); + // rtk가 추출되었는지 확인 + if (!refreshTokenId.equals("")) { - AbstractAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( - MemberCreateRequest.builder() - .memberName(memberName) - .build(), - accessToken, new ArrayList<>() - ); - context.setAuthentication(authenticationToken); - SecurityContextHolder.setContext(context); - } + // atk 재발급 + accessToken = jwtTokenUtils.reissue(refreshTokenId); - // refreshToken이 DB 상에 존재하지 않거나 유효하지 않는 경우 refreshToken 초기화 - // (쿠키에는 있었으나 로직을 수행하는 사이 refreshToken의 유효시간이 지나서 DB에서 삭제된 경우) - else { - refreshTokenId = ""; - log.info("refreshToken이 DB에 존재하지 않거나 유효하지 않음"); - throw new CustomException(ErrorCode.INVALID_REFRESH_TOKEN); + // atk 값이 비어있지 않은지 확인 + // 재발급을 했는데도 불구하고 값이 비어있으면 rtk가 비정상인 것 + if (!accessToken.equals("")) { + // atk가 정상 + log.info("atk 재발급 완료"); + + // 쿠키에 저장 + jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); + + // 인증객체 생성 + SecurityContext context = SecurityContextHolder.createEmptyContext(); + String memberName = jwtTokenUtils.parseClaims(accessToken).getSubject(); + + AbstractAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( + MemberCreateRequest.builder() + .memberName(memberName) + .build(), + accessToken, new ArrayList<>() + ); + context.setAuthentication(authenticationToken); + SecurityContextHolder.setContext(context); + + } else { + // atk 값이 비어있을 경우 + log.info("rtk 비정상, 재발급 불가"); + + // 현재 rtk 쿠키 초기화 + refreshTokenId = ""; + + // rtk 쿠키 삭제 + jwtTokenUtils.setInitTokenCookie("refreshTokenId", null, response); + + // 예외 처리(로그인 화면으로 이동) + throw new CustomException(ErrorCode.NO_JWT_TOKEN); + } + } else { + // rtk가 추출되지 않았다면 예외 처리(로그인 화면으로 이동) + log.info("쿠키에 rtk 없음"); + throw new CustomException(ErrorCode.NO_JWT_TOKEN); + } + + } else { + // atk가 비정상적인 형태라면 예외 처리(로그인 화면으로 이동) + log.info("atk 비정상 - 서명 등"); + throw new CustomException(ErrorCode.NO_JWT_TOKEN); + } } + } else { + // atk가 로그아웃된 토큰일 경우 + log.info("로그아웃 됨"); + + // 현재 atk, rtk 초기화 + accessToken = ""; + refreshTokenId = ""; + + // atk, rtk 쿠키 삭제 + jwtTokenUtils.setInitTokenCookie("accessToken", null, response); + jwtTokenUtils.setInitTokenCookie("refreshTokenId", null, response); + + // 예외 처리(로그인 화면으로 이동) + throw new CustomException(ErrorCode.NO_JWT_TOKEN); + } + // atk가 없고 rtk만 있을 경우 + } else if (!refreshTokenId.equals("")) { + log.info("atk 없고 rtk만 있음"); + + // atk 재발급 + accessToken = jwtTokenUtils.reissue(refreshTokenId); + + // atk 값이 비어있지 않은지 확인 + // 재발급을 했는데도 불구하고 값이 비어있으면 rtk가 비정상인 것 + if (!accessToken.equals("")) { + // atk가 정상 + log.info("atk 재발급 완료"); + + // 쿠키에 저장 + jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); + + // 인증객체 생성 + SecurityContext context = SecurityContextHolder.createEmptyContext(); + String memberName = jwtTokenUtils.parseClaims(accessToken).getSubject(); + + AbstractAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( + MemberCreateRequest.builder() + .memberName(memberName) + .build(), + accessToken, new ArrayList<>() + ); + context.setAuthentication(authenticationToken); + SecurityContextHolder.setContext(context); + + } else { + // atk 값이 비어있을 경우 + log.info("rtk 비정상, 재발급 불가"); + + // 현재 rtk 쿠키 초기화 + refreshTokenId = ""; + + // rtk 쿠키 삭제 + jwtTokenUtils.setInitTokenCookie("refreshTokenId", null, response); + + // 예외 처리(로그인 화면으로 이동) + throw new CustomException(ErrorCode.NO_JWT_TOKEN); } + } else { + /* + * [쿠키에서 atk, rtk 모두 추출되지 않았다면 인증 절차를 거치지 않음] + * 권한이 필요한 api일 경우, 로그인 화면으로 이동 + * 권한이 필요 없는 api일 경우, 화면 정상 출력 + */ + log.info("쿠키에 atk, rtk 모두 없음"); } + log.info("필터 끝"); filterChain.doFilter(request, response); } } From 93840160ea97029aa7b22863467f88179173179b Mon Sep 17 00:00:00 2001 From: nayonnii Date: Wed, 6 Sep 2023 19:12:44 +0900 Subject: [PATCH 04/32] =?UTF-8?q?:bug:=20fix:=20JwtTokenFilter=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?utils=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80/?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/springles/jwt/JwtTokenUtils.java | 47 ++++++++++++++++++- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/springles/jwt/JwtTokenUtils.java b/src/main/java/com/springles/jwt/JwtTokenUtils.java index e4160558..bfd90b9a 100644 --- a/src/main/java/com/springles/jwt/JwtTokenUtils.java +++ b/src/main/java/com/springles/jwt/JwtTokenUtils.java @@ -9,6 +9,7 @@ import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -74,14 +75,17 @@ public String reissue(String refreshTokenId) { Optional optionalRefreshToken = refreshTokenRedisRepository.findById(refreshTokenId); if(optionalRefreshToken.isEmpty()) { log.warn("refresh token이 DB에 존재하지 않음"); -// throw new CustomException(ErrorCode.NO_JWT_TOKEN); + return ""; } // refreshToken이 유효한지 확인 if(!memberJpaRepository.existsByMemberName(optionalRefreshToken.get().getMemberName())) { log.warn("refresh token이 유효하지 않음"); -// throw new CustomException(ErrorCode.INVALID_REFRESH_TOKEN); + + // DB에서 refreshToken 삭제 + refreshTokenRedisRepository.deleteById(refreshTokenId); + return ""; } @@ -125,6 +129,9 @@ public int validate(String accessToken) { } catch (IllegalArgumentException e) { log.warn("잘못된 JWT 토큰"); return 0; + } catch (Exception e) { + log.warn(e.getMessage()); + return 0; } } @@ -151,4 +158,40 @@ public void setAtkCookie(String name, String value, HttpServletResponse response cookie.setSecure(true); response.addCookie(cookie); } + + // Token 쿠키 초기화 설정 + public void setInitTokenCookie(String name, String value, HttpServletResponse response) { + Cookie cookie = new Cookie(name, value); + cookie.setDomain("localhost"); + cookie.setPath("/"); + cookie.setMaxAge(0); + cookie.setHttpOnly(true); + cookie.setSecure(true); + response.addCookie(cookie); + } + + // 쿠키에서 accessToken 호출 + public String atkFromCookie(HttpServletRequest request) { + String accessToken = ""; + Cookie[] cookies = request.getCookies(); + + if(cookies.length != 0) { + log.info("utils: 쿠키 있음"); + for (Cookie cookie : cookies) { + if ("accessToken".equals(cookie.getName())) { + log.info("utils: accessToken 있음"); + accessToken = cookie.getValue(); + log.info("utils: " + accessToken); + break; + } + } + if(accessToken.equals("")) { + log.info("utils: accessToken 없음"); + throw new CustomException(ErrorCode.NOT_AUTHORIZED_CONTENT); + } + } else { + throw new CustomException(ErrorCode.NOT_AUTHORIZED_CONTENT); + } + return accessToken; + } } From e3ad58e826c28f02c3fb9c3c67f4401d4c2047d9 Mon Sep 17 00:00:00 2001 From: nayonnii Date: Wed, 6 Sep 2023 19:16:27 +0900 Subject: [PATCH 05/32] =?UTF-8?q?:bug:=20fix:=20accessToken=20=EC=B6=94?= =?UTF-8?q?=EC=B6=9C=20=EC=9C=84=EC=B9=98=EB=A5=BC=20request.attribute=20-?= =?UTF-8?q?>=20cookie=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ChatRoomController.java | 4 ++- .../controller/api/MemberController.java | 12 ++++--- .../controller/ui/ChatRoomUiController.java | 4 ++- .../controller/ui/ChatUiController.java | 6 ++-- .../controller/ui/MemberUiController.java | 33 ++++++++----------- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/springles/controller/api/ChatRoomController.java b/src/main/java/com/springles/controller/api/ChatRoomController.java index 2f82c324..d91d1351 100644 --- a/src/main/java/com/springles/controller/api/ChatRoomController.java +++ b/src/main/java/com/springles/controller/api/ChatRoomController.java @@ -7,6 +7,7 @@ import com.springles.domain.dto.member.MemberCreateRequest; import com.springles.domain.dto.member.MemberInfoResponse; import com.springles.domain.dto.response.ResResult; +import com.springles.jwt.JwtTokenUtils; import com.springles.service.ChatRoomService; import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; @@ -26,13 +27,14 @@ public class ChatRoomController { private final ChatRoomService chatRoomService; private final MemberUiController memberUiController; + private final JwtTokenUtils jwtTokenUtils; // 채팅방 생성 @Operation(summary = "채팅방 생성", description = "채팅방 생성") @PostMapping(value = "/chatrooms") public ResponseEntity createChatRoom(@Valid @RequestBody ChatRoomReqDTO chatRoomReqDTO, HttpServletRequest request, Authentication auth){ - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); MemberInfoResponse info = memberUiController.info(accessToken); Long id = info.getId(); String memberName = info.getMemberName(); diff --git a/src/main/java/com/springles/controller/api/MemberController.java b/src/main/java/com/springles/controller/api/MemberController.java index 0e8a68c9..3031ff4e 100644 --- a/src/main/java/com/springles/controller/api/MemberController.java +++ b/src/main/java/com/springles/controller/api/MemberController.java @@ -3,6 +3,7 @@ import com.springles.domain.constants.ResponseCode; import com.springles.domain.dto.member.*; import com.springles.domain.dto.response.ResResult; +import com.springles.jwt.JwtTokenUtils; import com.springles.service.MemberService; import com.springles.valid.ValidationSequence; import jakarta.servlet.http.HttpServletRequest; @@ -18,6 +19,7 @@ public class MemberController { private final MemberService memberService; + private final JwtTokenUtils jwtTokenUtils; // 회원가입 @PostMapping("/signup") @@ -42,7 +44,7 @@ public ResponseEntity updateInfo( @Validated({ValidationSequence.class}) @RequestBody MemberUpdateRequest memberDto, HttpServletRequest request ) { - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); ResponseCode responseCode = ResponseCode.MEMBER_UPDATE; return ResponseEntity.ok( @@ -61,7 +63,7 @@ public ResponseEntity signOut( @Validated({ValidationSequence.class}) @RequestBody MemberDeleteRequest memberDto, HttpServletRequest request ) { - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); memberService.signOut(memberDto, accessToken); ResponseCode responseCode = ResponseCode.MEMBER_DELETE; @@ -97,7 +99,7 @@ public ResponseEntity login( public ResponseEntity logout( HttpServletRequest request ) { - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); ResponseCode responseCode = ResponseCode.MEMBER_LOGOUT; memberService.logout(accessToken); @@ -153,7 +155,7 @@ public ResponseEntity createProfile( @Validated({ValidationSequence.class}) @RequestBody MemberProfileCreateRequest memberDto, HttpServletRequest request ) { - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); ResponseCode responseCode = ResponseCode.MEMBER_PROFILE_CREATE; return ResponseEntity.ok( @@ -173,7 +175,7 @@ public ResponseEntity updateProfile( @Validated({ValidationSequence.class}) @RequestBody MemberProfileUpdateRequest memberDto, HttpServletRequest request ) { - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); ResponseCode responseCode = ResponseCode.MEMBER_PROFILE_UPDATE; return ResponseEntity.ok( diff --git a/src/main/java/com/springles/controller/ui/ChatRoomUiController.java b/src/main/java/com/springles/controller/ui/ChatRoomUiController.java index 4f7f1f23..80688dc4 100644 --- a/src/main/java/com/springles/controller/ui/ChatRoomUiController.java +++ b/src/main/java/com/springles/controller/ui/ChatRoomUiController.java @@ -6,6 +6,7 @@ import com.springles.domain.dto.member.MemberInfoResponse; import com.springles.domain.dto.member.MemberProfileResponse; import com.springles.exception.CustomException; +import com.springles.jwt.JwtTokenUtils; import com.springles.service.ChatRoomService; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; @@ -26,6 +27,7 @@ public class ChatRoomUiController { private final MemberUiController memberUiController; private final ChatRoomService chatRoomService; + private final JwtTokenUtils jwtTokenUtils; // 홈으로 가는 controller : addAttribute 로 username 을 전달 해주고 있다. // @GetMapping("/detail.html") @@ -66,7 +68,7 @@ public String chatRoomList(Model model, ) { // 목록 전체 조회 - String accessToken = (String)request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); // 회원 정보 호출 // MemberInfoResponse info = memberUiController.info(accessToken); diff --git a/src/main/java/com/springles/controller/ui/ChatUiController.java b/src/main/java/com/springles/controller/ui/ChatUiController.java index 70c0817c..6acb7b65 100644 --- a/src/main/java/com/springles/controller/ui/ChatUiController.java +++ b/src/main/java/com/springles/controller/ui/ChatUiController.java @@ -7,6 +7,7 @@ import com.springles.exception.CustomException; import com.springles.exception.constants.ErrorCode; import com.springles.game.GameSessionManager; +import com.springles.jwt.JwtTokenUtils; import com.springles.service.ChatRoomService; import com.springles.service.MemberService; import jakarta.servlet.http.HttpServletRequest; @@ -31,6 +32,7 @@ public class ChatUiController { private final MemberService memberService; private final MemberUiController memberUiController; private final GameSessionManager gameSessionManager; + private final JwtTokenUtils jwtTokenUtils; @GetMapping("rooms") public String rooms() { @@ -58,7 +60,7 @@ public String enterRoom2( @PathVariable("room-id") Long roomId, @PathVariable("n HttpServletRequest request, Model model){ // 멤버 정보 - String accessToken = (String)request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); MemberInfoResponse memberInfo = memberUiController.info(accessToken); model.addAttribute("member",memberInfo); @@ -100,7 +102,7 @@ public String enterRoom2( @PathVariable("room-id") Long roomId, @PathVariable("n @GetMapping("quick-enter") public String quickEnterRoom( HttpServletRequest request, Model model){ - String accessToken = (String)request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); MemberInfoResponse memberInfo = memberUiController.info(accessToken); model.addAttribute("member",memberInfo); diff --git a/src/main/java/com/springles/controller/ui/MemberUiController.java b/src/main/java/com/springles/controller/ui/MemberUiController.java index acd6f9e5..56798970 100644 --- a/src/main/java/com/springles/controller/ui/MemberUiController.java +++ b/src/main/java/com/springles/controller/ui/MemberUiController.java @@ -1,6 +1,9 @@ package com.springles.controller.ui; import com.springles.domain.dto.member.*; +import com.springles.exception.CustomException; +import com.springles.exception.constants.ErrorCode; +import com.springles.jwt.JwtTokenUtils; import com.springles.repository.MemberGameInfoJpaRepository; import com.springles.service.MemberService; import com.springles.valid.ValidationSequence; @@ -24,6 +27,7 @@ public class MemberUiController { private final MemberService memberService; private final MemberGameInfoJpaRepository memberGameInfoJpaRepository; + private final JwtTokenUtils jwtTokenUtils; // 회원가입 페이지 조회 @GetMapping("/signup") @@ -82,7 +86,7 @@ public String memberProflie( HttpServletRequest request ) { // accessToken 추출 - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); // 프로필 조회 MemberProfileRead profileInfo = memberService.readProfile(accessToken); @@ -96,17 +100,15 @@ public String memberProflie( return "member/my-page"; } + // 회원 정보 변경 페이지 조회 @GetMapping("/my-page/info") public String memberInfo( Model model, - @ModelAttribute("memberInfo") MemberUpdateRequest memberDto, HttpServletRequest request ) { - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); MemberInfoResponse memberInfo = memberService.getUserInfo(accessToken); - - model.addAttribute("memberInfo", memberDto); model.addAttribute("rawMemberInfo", memberInfo); return "member/member-info"; @@ -114,23 +116,14 @@ public String memberInfo( // 회원 탈퇴 페이지 조회 @GetMapping("/my-page/sign-out") - public String signOut( - Model model, - @ModelAttribute("member") MemberDeleteRequest memberDto, - HttpServletRequest request - ) { - model.addAttribute("member", memberDto); + public String signOut() { return "member/member-sign-out"; } // 프로필 설정 페이지 조회 @GetMapping("/profile-settings") - public String profileSetting( - Model model, - @ModelAttribute("member") MemberProfileCreateRequest memberDto - ) { - model.addAttribute("member", memberDto); + public String profileSetting() { return "member/profile-settings"; } @@ -142,11 +135,9 @@ public String profileSetting( @ModelAttribute("profile") MemberProfileUpdateRequest memberDto, HttpServletRequest request ) { - // accessToken 추출 - String accessToken = (String) request.getAttribute("accessToken"); + String accessToken = jwtTokenUtils.atkFromCookie(request); MemberProfileRead rawProfile = memberService.readProfile(accessToken); - model.addAttribute("profile", memberDto); model.addAttribute("rawProfile", rawProfile); return "member/profile-change"; } @@ -170,7 +161,8 @@ public void setAtkCookie(String name, String value, HttpServletResponse response Cookie cookie = new Cookie(name, value); cookie.setDomain("localhost"); cookie.setPath("/"); - cookie.setMaxAge(60 * 60); // 1시간(테스트용) +// cookie.setMaxAge(60 * 60); // 1시간(테스트용) + cookie.setMaxAge(30); // 1시간(테스트용) cookie.setHttpOnly(true); cookie.setSecure(true); response.addCookie(cookie); @@ -182,6 +174,7 @@ public void setRtkCookie(String name, String value, HttpServletResponse response Cookie cookie = new Cookie(name, value); cookie.setDomain("localhost"); cookie.setPath("/"); +// cookie.setMaxAge(60 * 60 * 24 * 14); // 2주 cookie.setMaxAge(60 * 60 * 24 * 14); // 2주 cookie.setHttpOnly(true); cookie.setSecure(true); From 784aeb8b42b13090f79ca546b857b2d8bafcf458 Mon Sep 17 00:00:00 2001 From: nayonnii Date: Wed, 6 Sep 2023 19:17:15 +0900 Subject: [PATCH 06/32] =?UTF-8?q?:bug:=20fix:=20=EC=8B=A4=EC=A0=9C=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=BD=94=EB=93=9C=EB=A1=9C=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springles/config/WebSecurityConfig.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/springles/config/WebSecurityConfig.java b/src/main/java/com/springles/config/WebSecurityConfig.java index beeb2189..d99c5298 100644 --- a/src/main/java/com/springles/config/WebSecurityConfig.java +++ b/src/main/java/com/springles/config/WebSecurityConfig.java @@ -34,22 +34,21 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests( authHttp -> authHttp - /** 아래 API를 제외한 나머지에 대해서는 인증이 필요 없도록 임시 세팅 (*추후 개발 완료 시 '실제 권한 코드'로 변경 필요) */ - .requestMatchers(new AntPathRequestMatcher("/member/updateInfo")).authenticated() - .requestMatchers(new AntPathRequestMatcher("/member/signOut")).authenticated() - .requestMatchers(new AntPathRequestMatcher("/member/logout")).authenticated() - .requestMatchers(new AntPathRequestMatcher("/info/profile")).authenticated() - .requestMatchers(new AntPathRequestMatcher("/record", "GET")).authenticated() - .anyRequest().permitAll() /** 실제 권한 코드 */ -// .requestMatchers(new AntPathRequestMatcher("/v1/signup")).permitAll() -// .requestMatchers(new AntPathRequestMatcher("/member/signup")).permitAll() -// .requestMatchers(new AntPathRequestMatcher("/v1/login-page")).permitAll() -// .requestMatchers(new AntPathRequestMatcher("/v1/login")).permitAll() -// .requestMatchers(new AntPathRequestMatcher("/member/login")).permitAll() -// .requestMatchers(new AntPathRequestMatcher("/v1/login-page?error")).permitAll() -// .requestMatchers(new AntPathRequestMatcher("/css/*")).permitAll() -// .anyRequest().authenticated() + // 회원가입, 로그인, 아이디/비밀번호 찾기 api·ui + .requestMatchers(new AntPathRequestMatcher("/v1/signup")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/v1/login")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/v1/login-page")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/v1/login-page?error")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/v1/vertification-id")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/v1/vertification-pw")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/member/signup")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/member/login")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/member/vertification/id")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/member/vertification/pw")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/css/*")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/images/*")).permitAll() + .anyRequest().authenticated() ) .formLogin( login -> login From bb6f44f4fb64f28db86a1c87cdf6447de6d46550 Mon Sep 17 00:00:00 2001 From: nayonnii Date: Wed, 6 Sep 2023 19:46:39 +0900 Subject: [PATCH 07/32] =?UTF-8?q?:bug:=20fix:=20atk=EC=9E=AC=EB=B0=9C?= =?UTF-8?q?=EA=B8=89=20=EC=8B=9C=20request.setAttirbute=EC=97=90=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/springles/jwt/JwtTokenFilter.java | 10 ++++++++++ src/main/java/com/springles/jwt/JwtTokenUtils.java | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/springles/jwt/JwtTokenFilter.java b/src/main/java/com/springles/jwt/JwtTokenFilter.java index 60163e2c..be6bd8a8 100644 --- a/src/main/java/com/springles/jwt/JwtTokenFilter.java +++ b/src/main/java/com/springles/jwt/JwtTokenFilter.java @@ -171,6 +171,11 @@ protected void doFilterInternal( // 쿠키에 저장 jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); + // attribute에 저장 + // atk 재발급 후 쿠키에 저장해도 request 속 쿠키값은 변하지 않아 유효하지 않은 토큰으로 필터를 지나치게됨 + // 이를 해결하기 위해 재발급 시에만 request.setAttibute에도 atk 저장 + request.setAttribute("accessToken", accessToken); + // 인증객체 생성 SecurityContext context = SecurityContextHolder.createEmptyContext(); String memberName = jwtTokenUtils.parseClaims(accessToken).getSubject(); @@ -240,6 +245,11 @@ protected void doFilterInternal( // 쿠키에 저장 jwtTokenUtils.setAtkCookie("accessToken", accessToken, response); + // attribute에 저장 + // atk 재발급 후 쿠키에 저장해도 request 속 쿠키값은 변하지 않아 유효하지 않은 토큰으로 필터를 지나치게됨 + // 이를 해결하기 위해 재발급 시에만 request.setAttibute에도 atk 저장 + request.setAttribute("accessToken", accessToken); + // 인증객체 생성 SecurityContext context = SecurityContextHolder.createEmptyContext(); String memberName = jwtTokenUtils.parseClaims(accessToken).getSubject(); diff --git a/src/main/java/com/springles/jwt/JwtTokenUtils.java b/src/main/java/com/springles/jwt/JwtTokenUtils.java index bfd90b9a..ae80aa3d 100644 --- a/src/main/java/com/springles/jwt/JwtTokenUtils.java +++ b/src/main/java/com/springles/jwt/JwtTokenUtils.java @@ -178,6 +178,7 @@ public String atkFromCookie(HttpServletRequest request) { if(cookies.length != 0) { log.info("utils: 쿠키 있음"); for (Cookie cookie : cookies) { + // 쿠키에 accessToken이 있는지 확인 if ("accessToken".equals(cookie.getName())) { log.info("utils: accessToken 있음"); accessToken = cookie.getValue(); @@ -185,9 +186,9 @@ public String atkFromCookie(HttpServletRequest request) { break; } } + // 쿠키에 accessToken이 없으면 request.attribute에서 추출 if(accessToken.equals("")) { - log.info("utils: accessToken 없음"); - throw new CustomException(ErrorCode.NOT_AUTHORIZED_CONTENT); + accessToken = String.valueOf(request.getAttribute("accessToken")); } } else { throw new CustomException(ErrorCode.NOT_AUTHORIZED_CONTENT); From e56a39ffd9f72f2ba3adf364f87e0e713555e141 Mon Sep 17 00:00:00 2001 From: nayonnii Date: Wed, 6 Sep 2023 19:50:07 +0900 Subject: [PATCH 08/32] =?UTF-8?q?:bug:=20fix:=20secure=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=95=B4=EC=A0=9C(=EC=82=AC=ED=8C=8C=EB=A6=AC=20?= =?UTF-8?q?=EB=B8=8C=EB=9D=BC=EC=9A=B0=EC=A0=80=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=BF=A0=ED=82=A4=20=EC=A0=80=EC=9E=A5=EC=9D=B4=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EC=9D=B4=EC=8A=88)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/springles/controller/ui/MemberUiController.java | 8 +++----- src/main/java/com/springles/jwt/JwtTokenUtils.java | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/springles/controller/ui/MemberUiController.java b/src/main/java/com/springles/controller/ui/MemberUiController.java index 56798970..9c9d69c6 100644 --- a/src/main/java/com/springles/controller/ui/MemberUiController.java +++ b/src/main/java/com/springles/controller/ui/MemberUiController.java @@ -161,10 +161,9 @@ public void setAtkCookie(String name, String value, HttpServletResponse response Cookie cookie = new Cookie(name, value); cookie.setDomain("localhost"); cookie.setPath("/"); -// cookie.setMaxAge(60 * 60); // 1시간(테스트용) - cookie.setMaxAge(30); // 1시간(테스트용) + cookie.setMaxAge(60 * 60); // 1시간(테스트용) cookie.setHttpOnly(true); - cookie.setSecure(true); +// cookie.setSecure(true); // 사파리 브라우저에서 쿠키 저장이 안되는 이슈 해결을 위해 설정 해제 response.addCookie(cookie); } @@ -174,10 +173,9 @@ public void setRtkCookie(String name, String value, HttpServletResponse response Cookie cookie = new Cookie(name, value); cookie.setDomain("localhost"); cookie.setPath("/"); -// cookie.setMaxAge(60 * 60 * 24 * 14); // 2주 cookie.setMaxAge(60 * 60 * 24 * 14); // 2주 cookie.setHttpOnly(true); - cookie.setSecure(true); +// cookie.setSecure(true); // 사파리 브라우저에서 쿠키 저장이 안되는 이슈 해결을 위해 설정 해제 response.addCookie(cookie); } } diff --git a/src/main/java/com/springles/jwt/JwtTokenUtils.java b/src/main/java/com/springles/jwt/JwtTokenUtils.java index ae80aa3d..a4cd4d39 100644 --- a/src/main/java/com/springles/jwt/JwtTokenUtils.java +++ b/src/main/java/com/springles/jwt/JwtTokenUtils.java @@ -155,7 +155,7 @@ public void setAtkCookie(String name, String value, HttpServletResponse response cookie.setPath("/"); cookie.setMaxAge(60 * 60); // 테스트용 1시간 cookie.setHttpOnly(true); - cookie.setSecure(true); +// cookie.setSecure(true); // 사파리 브라우저에서 쿠키 저장이 안되는 이슈 해결을 위해 설정 해제 response.addCookie(cookie); } @@ -166,7 +166,7 @@ public void setInitTokenCookie(String name, String value, HttpServletResponse re cookie.setPath("/"); cookie.setMaxAge(0); cookie.setHttpOnly(true); - cookie.setSecure(true); +// cookie.setSecure(true); // 사파리 브라우저에서 쿠키 저장이 안되는 이슈 해결을 위해 설정 해제 response.addCookie(cookie); } From f870af22880efc0f2afb543581b4cb64fa586420 Mon Sep 17 00:00:00 2001 From: nayonnii Date: Thu, 7 Sep 2023 10:26:32 +0900 Subject: [PATCH 09/32] =?UTF-8?q?:bug:=20fix:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=95=84=EC=9B=83=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/springles/jwt/JwtExceptionFilter.java | 5 +++ .../com/springles/jwt/JwtTokenFilter.java | 2 +- .../resources/templates/fragments/header.html | 42 ++++++++++--------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/springles/jwt/JwtExceptionFilter.java b/src/main/java/com/springles/jwt/JwtExceptionFilter.java index c96ba2a1..ce032160 100644 --- a/src/main/java/com/springles/jwt/JwtExceptionFilter.java +++ b/src/main/java/com/springles/jwt/JwtExceptionFilter.java @@ -33,6 +33,11 @@ protected void doFilterInternal( } catch (CustomException e) { log.info("redirect error 페이지"); response.sendRedirect("/v1/login-page?error"); + + // 로그아웃된 토큰일 경우, error 파라미터 없이 redirect + if(e.getErrorCode().equals(ErrorCode.LOGOUT_TOKEN)) { + response.sendRedirect("/v1/login-page"); + } } } } diff --git a/src/main/java/com/springles/jwt/JwtTokenFilter.java b/src/main/java/com/springles/jwt/JwtTokenFilter.java index be6bd8a8..0aa08635 100644 --- a/src/main/java/com/springles/jwt/JwtTokenFilter.java +++ b/src/main/java/com/springles/jwt/JwtTokenFilter.java @@ -227,7 +227,7 @@ protected void doFilterInternal( jwtTokenUtils.setInitTokenCookie("refreshTokenId", null, response); // 예외 처리(로그인 화면으로 이동) - throw new CustomException(ErrorCode.NO_JWT_TOKEN); + throw new CustomException(ErrorCode.LOGOUT_TOKEN); } // atk가 없고 rtk만 있을 경우 } else if (!refreshTokenId.equals("")) { diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 835704c7..ae412218 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -21,25 +21,29 @@
회원가입 - 로그아웃 - - - - - - - - - - - - - - - - - + 로그아웃 + + + + +
From e26727c46ed1250b62f2c35daadada8932fe30f7 Mon Sep 17 00:00:00 2001 From: nayonnii Date: Thu, 7 Sep 2023 10:32:22 +0900 Subject: [PATCH 10/32] =?UTF-8?q?:sparkles:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=97=90=EB=9F=AC=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/springles/exception/constants/ErrorCode.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/springles/exception/constants/ErrorCode.java b/src/main/java/com/springles/exception/constants/ErrorCode.java index dac04a01..f0a8e55b 100644 --- a/src/main/java/com/springles/exception/constants/ErrorCode.java +++ b/src/main/java/com/springles/exception/constants/ErrorCode.java @@ -27,6 +27,7 @@ public enum ErrorCode { /* JWT */ NO_JWT_TOKEN(HttpStatus.UNAUTHORIZED, "로그인 정보가 존재하지 않습니다. 다시 로그인해 주세요."), NOT_AUTHORIZED_TOKEN(HttpStatus.FORBIDDEN, "접근 권한이 없습니다."), + LOGOUT_TOKEN(HttpStatus.FORBIDDEN, "로그아웃된 토큰입니다."), INVALID_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "로그인 정보가 유효하지 않습니다."), INVALID_TOKEN_TYPE(HttpStatus.UNAUTHORIZED, "로그인 정보 형식이 올바르지 않습니다."), INVALID_TOKEN_STRUCTURE(HttpStatus.UNAUTHORIZED, "로그인 정보가 올바르지 않습니다."), From 63c759865e7f5a692e10385305e9b61c748e4ad5 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 10:33:21 +0900 Subject: [PATCH 11/32] =?UTF-8?q?:construction=5Fworker:=20ci=20:=20deploy?= =?UTF-8?q?.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 77 +++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d3f7515..e0b7ce24 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,35 +2,49 @@ name: Chatfia Dev CI/CD on: pull_request: - types: [closed] + types: [ closed ] workflow_dispatch: # (2).수동 실행도 가능하도록 +permissions: + contents: read + jobs: build: runs-on: ubuntu-latest # (3).OS환경 + if: github.event.pull_request.merged == true && (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'develop') + # 환경변수 + env: + NAVER_MAIL_PASSWORD: ${{ secrets.NAVER_MAIL_PASSWORD }} + NAVER_MAIL_USERNAME: ${{ secrets.NAVER_MAIL_USERNAME }} + REDIS_HOST: localhost + REDIS_PORT: '6379' + KAKAO_SNS_APP_KEY: ${{ secrets.KAKAO_SNS_APP_KEY }} + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + steps: - name: Checkout - uses: actions/checkout@v2 # (4).코드 check out + uses: actions/checkout@v2 # 코드 check out - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 17 # (5).자바 설치 + java-version: 17 # 자바 설치 distribution: 'adopt' - name: Grant execute permission for gradlew run: chmod +x ./gradlew - shell: bash # (6).권한 부여 + shell: bash # 권한 부여 - name: Build with Gradle run: ./gradlew clean build -x test - shell: bash # (7).build 시작 + shell: bash # build 시작 - - name: Get current time - uses: 1466587594/get-current-time@v2 - id: current-time-build + - name: Get current-time + uses: gerred/actions/current-time@master + id: current-time with: format: YYYY-MM-DDTHH-mm-ss utcOffset: "+09:00" # (8).build 시점의 시간 확보 @@ -42,17 +56,34 @@ jobs: - name: Test with Gradle run: ./gradlew --info test # (10).test 시작 - - name: Get current time - uses: 1466587594/get-current-time@v2 + - name: Get current time test + uses: gerred/actions/current-time@master id: current-time-test with: format: YYYY-MM-DDTHH-mm-ss utcOffset: "+09:00" # (11).test 시점의 시간 확보 - - name: Show Current Time + - name: Show Current Time test run: echo "CurrentTime=$" shell: bash # (12).확보한 시간 보여 주기 + - name: Run string replace + uses: frabert/replace-string-action@master + id: format-time + with: + pattern: '[:\.]+' + string: "${{ steps.current-time-test.outputs.time }}" + replace-with: '-' + flags: 'g' + + # 도커 로그인 + 빌드 + - name: Docker build + run: | + docker login -u ${{ env.DOCKERHUB_USERNAME }} -p ${{ env.DOCKERHUB_TOKEN }} + docker build -t springles . + docker tag springles chatpiaspringles/springles:latest + docker push chatpiaspringles/springles:latest + - name: Generate deployment package run: | mkdir -p deploy @@ -62,15 +93,15 @@ jobs: cp -r .platform deploy/.platform cd deploy && zip -r deploy.zip . -# - name: Beanstalk Deploy -# uses: einaregilsson/beanstalk-deploy@v21 -# with: -# aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }} -# aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} -# application_name: chatfia-dev -# environment_name: chatfia-dev-env -# version_label: github-action-${{ steps.current-time.outputs.formattedTime }} -# region: ap-northeast-2 -# deployment_package: deploy/deploy.zip -# wait_for_environment_recovery: 60 - + - name: Beanstalk Deploy + uses: einaregilsson/beanstalk-deploy@v21 + with: + aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + application_name: springles-dev + environment_name: Springles-dev-env + version_label: "the-simple-engineer-deployment-${{ steps.format-time.outputs.replaced }}" + region: ap-northeast-2 + deployment_package: docker-compose.yml + wait_for_environment_recovery: 60 +# use_existing_version_if_available: true \ No newline at end of file From 2b10ef313194b7f96b2196279f333ace51ab278a Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 10:34:38 +0900 Subject: [PATCH 12/32] =?UTF-8?q?:construction=5Fworker:=20ci=20:=20?= =?UTF-8?q?=EB=A0=88=EB=94=94=EC=8A=A4=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e0b7ce24..101c4b93 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,8 +18,8 @@ jobs: env: NAVER_MAIL_PASSWORD: ${{ secrets.NAVER_MAIL_PASSWORD }} NAVER_MAIL_USERNAME: ${{ secrets.NAVER_MAIL_USERNAME }} - REDIS_HOST: localhost - REDIS_PORT: '6379' + REDIS_HOST: ${{ secrets.REDIS_HOST }} + REDIS_PORT: ${{ secrets.REDIS_PORT }} KAKAO_SNS_APP_KEY: ${{ secrets.KAKAO_SNS_APP_KEY }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} From 7eb45f05c8d26bbeac8e1b9ad308c7b874422425 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 10:53:17 +0900 Subject: [PATCH 13/32] =?UTF-8?q?:construction=5Fworker:=20ci=20:=20?= =?UTF-8?q?=EB=8F=84=EC=BB=A4=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 21 +++++++++++++++++++++ docker-compose.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..41dcebf0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM openjdk:17-jdk-slim-buster + +#작업 dir +WORKDIR /app + +# 파일 복사 +COPY . /app + +# 빌드 --exclude-task test 는 테스트 오류로 추가함 +RUN ./gradlew build --exclude-task test + +# 빌드된 jar 복사 +COPY build/libs/Springles-0.0.1-SNAPSHOT.jar app.jar + +EXPOSE 8080 + + +CMD ["java", "-jar", "app.jar"] + +#FROM nginx +#COPY --from=0 /app/build /usr/share/nginx/html \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..75481de5 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,28 @@ +version: '4' +services: + developmebt: + build: + context: . + dockerfile: Dockerfile + ports: + - '8080:8080' + beanstalk: + image: "chatpiaspringles/springles" + ports: + - "8080:8080" + + mysql-docker: + image: mysql + ports: + - "3306:3306" + container_name: "docker-mysql" + + redis-docker: + image: redis + command: redis-server --port 6379 + container_name: "docker-redis" + labels: + - "name=redis" + - "mode=standalone" + ports: + - 6379:6379 \ No newline at end of file From 11eccfe3c663cf81c9a2ffd409631b8d596cd5b9 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 10:54:30 +0900 Subject: [PATCH 14/32] =?UTF-8?q?:construction=5Fworker:=20ci=20:=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 1 + .../java/com/springles/config/MailConfig.java | 4 +-- src/main/resources/application-dev.yml | 4 +-- src/main/resources/application-redis.yml | 4 +-- src/test/resources/application.yml | 35 +++++++++++++++++++ 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/test/resources/application.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 101c4b93..9bb9b043 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,6 +24,7 @@ jobs: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + steps: - name: Checkout uses: actions/checkout@v2 # 코드 check out diff --git a/src/main/java/com/springles/config/MailConfig.java b/src/main/java/com/springles/config/MailConfig.java index 8989015a..dab97821 100644 --- a/src/main/java/com/springles/config/MailConfig.java +++ b/src/main/java/com/springles/config/MailConfig.java @@ -14,9 +14,9 @@ public class MailConfig { // username, password 환경변수 설정 필요 - @Value("${username}") + @Value("${NAVER_MAIL_USERNAME}") private String username; - @Value("${password}") + @Value("${NAVER_MAIL_PASSWORD}") private String password; @Bean diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fb6f63f3..6ba653b4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,8 +6,8 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/springles - username: root - password: abc123 + username: ${MYSQL_ROOT_USER} + password: ${MYSQL_ROOT_PASSWORD} jpa: hibernate: ddl-auto: create-drop diff --git a/src/main/resources/application-redis.yml b/src/main/resources/application-redis.yml index 9a16e2f0..15079fdb 100644 --- a/src/main/resources/application-redis.yml +++ b/src/main/resources/application-redis.yml @@ -1,5 +1,5 @@ spring: data: redis: - host: localhost - port: 6379 + host: ${REDIS_HOST} + port: ${REDIS_PORT} diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 00000000..f3a8c1d6 --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,35 @@ +spring: + datasource: + # url: jdbc:h2:tcp://localhost/~/springles + url: jdbc:h2:mem:testdb + username: sa + password: + driver-class-name: org.h2.Driver + + jpa: + hibernate: + ddl-auto: create + properties: + hibernate: + format_sql: true + + mail: + host: smtp.gmail.com + port: ${NAVER_MAIL_PORT} + NAVER_MAIL_USERNAME: ${NAVER_MAIL_USERNAME} + NAVER_MAIL_PASSWORD: ${NAVER_MAIL_PASSWORD} + +jwt: + secret: dhwhokdfnpwkempfnwiofnpwkempfnwiofnpwkempfnwiofnpwkempfnwio + +logging: + level: + org.hibernate.SQL: debug + org.hibernate.type: trace + + +# H2 Console 설정 (test 프로파일에서만 활성화) +h2: + console: + enabled: true + path: /h2-console \ No newline at end of file From 6b276c263890394a6b4eee524fc397789fc98a03 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 10:56:12 +0900 Subject: [PATCH 15/32] =?UTF-8?q?:construction=5Fworker:=20ci=20:=20?= =?UTF-8?q?=EC=97=94=EC=A7=84=EC=97=91=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .platform/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.platform/nginx.conf b/.platform/nginx.conf index 4b3528c5..4f675e64 100644 --- a/.platform/nginx.conf +++ b/.platform/nginx.conf @@ -13,7 +13,8 @@ events { http { include /etc/nginx/mime.types; default_type application/octet-stream; - + types_hash_max_size 2048; + types_hash_bucket_size 128; log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; From 752109f48931f67295ae400330fb563f5817c2f6 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 11:43:33 +0900 Subject: [PATCH 16/32] =?UTF-8?q?:construction=5Fworker:=20ci=20:=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- src/main/resources/templates/chat-room-info.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6ba653b4..539d4417 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring: port: 6379 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/springles + url: jdbc:mysql://${DATASOURCE_URL_HOST}/springles username: ${MYSQL_ROOT_USER} password: ${MYSQL_ROOT_PASSWORD} jpa: diff --git a/src/main/resources/templates/chat-room-info.html b/src/main/resources/templates/chat-room-info.html index 7d2e2b2a..27a1721a 100644 --- a/src/main/resources/templates/chat-room-info.html +++ b/src/main/resources/templates/chat-room-info.html @@ -69,7 +69,7 @@
챗피아로 초대합니다.
else if (sns == 'kakaotalk') { // 사용할 앱의 JavaScript 키 설정 - Kakao.init('1f068199be43767b197138dfc91f1cb6'); + Kakao.init(`${KAKAO_SNS_APP_KEY}`); // 카카오링크 버튼 생성 Kakao.Link.createDefaultButton({ From 4cc8275d6fbc7855e1108011c0cecc4f02e3b2ca Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 11:48:16 +0900 Subject: [PATCH 17/32] =?UTF-8?q?:bug:=20fix:=20GameSessionManagerTest=20?= =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=88=98=EC=A0=95=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=8B=A4=ED=8C=A8=20,=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game/GameSessionManagerTest.java | 376 +++++++++--------- 1 file changed, 188 insertions(+), 188 deletions(-) diff --git a/src/test/java/com/springles/game/GameSessionManagerTest.java b/src/test/java/com/springles/game/GameSessionManagerTest.java index 1277f780..68ec27fb 100644 --- a/src/test/java/com/springles/game/GameSessionManagerTest.java +++ b/src/test/java/com/springles/game/GameSessionManagerTest.java @@ -1,188 +1,188 @@ -package com.springles.game; - -import com.springles.domain.constants.ChatRoomCode; -import com.springles.domain.constants.GamePhase; -import com.springles.domain.constants.GameRole; -import com.springles.domain.constants.Role; -import com.springles.domain.entity.ChatRoom; -import com.springles.domain.entity.Member; -import com.springles.repository.ChatRoomJpaRepository; -import com.springles.repository.GameSessionRedisRepository; -import com.springles.repository.MemberJpaRepository; -import com.springles.repository.PlayerRedisRepository; -import jakarta.transaction.Transactional; -import java.util.Optional; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import static org.assertj.core.api.Assertions.assertThat; - -@SpringBootTest -class GameSessionManagerTest { - - @Autowired - private GameSessionManager gameSessionManager; - @Autowired - private GameSessionRedisRepository gameSessionRedisRepository; - @Autowired - private PlayerRedisRepository playerRedisRepository; - @Autowired - private RoleManager roleManager; - @Autowired - ChatRoomJpaRepository chatRoomJpaRepository; - @Autowired - MemberJpaRepository memberJpaRepository; - - @BeforeEach - @Transactional - void init() { - // 채팅방, 유저 테스트데이터 생성 - for (long i = 1; i <= 10; i++) { - chatRoomJpaRepository.save( - new ChatRoom(i, "testGameRoom" + i, null, i, - ChatRoomCode.WAITING, 10L, (long) i, false) - ); - memberJpaRepository.save( - Member.builder() - .memberName("testName" + i) - .password("testPassword" + i) - .email("testEmail" + i) - .role(Role.USER.toString()) - .isDeleted(false) - .build()); - } - } - - @AfterEach - void rollback_Redis() { - gameSessionRedisRepository.deleteAll(); - playerRedisRepository.deleteAll(); - } - - @Test - void createGame() { - //given - Long testRoomId = 1L; - ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); - - //when - gameSessionManager.createGame(chatRoom); - - //then - assertThat(gameSessionRedisRepository.findById(testRoomId).get().getHostId()).isEqualTo( - chatRoom.getOwnerId()); - } - - @Test - void addUser() { - //given - Long testRoomId = 7L; - int testPlayerCount = 7; - ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); - gameSessionManager.createGame(chatRoom); - - //when - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - - //then - for (long i = 1; i < testPlayerCount; i++) { - assertThat(playerRedisRepository.findById(i)).isNotEmpty(); - } - } - - @Test - void removePlayer() { - //given - Long testRoomId = 7L; - int testPlayerCount = 7; - ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); - gameSessionManager.createGame(chatRoom); - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - - //when - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.removePlayer(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - - //then - for (long i = 0; i < testPlayerCount; i++) { - assertThat(playerRedisRepository.findById(i)).isEmpty(); - } - } - - @Test - void startGame() { - //given - Long testRoomId = 7L; - int testPlayerCount = 7; - ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); - - gameSessionManager.createGame(chatRoom); - - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - - //when - gameSessionManager.startGame(testRoomId); - - //then - assertThat(playerRedisRepository.findByRoomId(testRoomId).size()).isEqualTo( - testPlayerCount); - assertThat(playerRedisRepository.existsById(chatRoom.getOwnerId())).isEqualTo(true); - - } - - @Test - void endGame() { - //given - Long testRoomId = 7L; - int testPlayerCount = 7; - ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); - gameSessionManager.createGame(chatRoom); - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - gameSessionManager.startGame(testRoomId); - - //when - gameSessionManager.endGame(testRoomId); - - //then - assertThat(gameSessionRedisRepository.findById(testRoomId).get() - .getGamePhase()).isEqualTo(GamePhase.READY); - for (long i = 1; i < testPlayerCount; i++) { - assertThat(playerRedisRepository.findById(i).get().getRole()).isEqualTo(GameRole.NONE); - } - } - - @Test - void removeGame() { - //given - Long testRoomId = 7L; - int testPlayerCount = 7; - ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); - gameSessionManager.createGame(chatRoom); - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - - for (long i = 1; i < testPlayerCount; i++) { - gameSessionManager.removePlayer(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); - } - gameSessionManager.removePlayer(testRoomId, memberJpaRepository.findById(chatRoom.getOwnerId()).get().getMemberName()); - - //when - gameSessionManager.removeGame(testRoomId); - - //then - assertThat(gameSessionRedisRepository.findById(testRoomId)).isEqualTo(Optional.empty()); - } -} \ No newline at end of file +//package com.springles.game; +// +//import com.springles.domain.constants.ChatRoomCode; +//import com.springles.domain.constants.GamePhase; +//import com.springles.domain.constants.GameRole; +//import com.springles.domain.constants.Role; +//import com.springles.domain.entity.ChatRoom; +//import com.springles.domain.entity.Member; +//import com.springles.repository.ChatRoomJpaRepository; +//import com.springles.repository.GameSessionRedisRepository; +//import com.springles.repository.MemberJpaRepository; +//import com.springles.repository.PlayerRedisRepository; +//import jakarta.transaction.Transactional; +//import java.util.Optional; +//import org.junit.jupiter.api.AfterEach; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import static org.assertj.core.api.Assertions.assertThat; +// +//@SpringBootTest +//class GameSessionManagerTest { +// +// @Autowired +// private GameSessionManager gameSessionManager; +// @Autowired +// private GameSessionRedisRepository gameSessionRedisRepository; +// @Autowired +// private PlayerRedisRepository playerRedisRepository; +// @Autowired +// private RoleManager roleManager; +// @Autowired +// ChatRoomJpaRepository chatRoomJpaRepository; +// @Autowired +// MemberJpaRepository memberJpaRepository; +// +// @BeforeEach +// @Transactional +// void init() { +// // 채팅방, 유저 테스트데이터 생성 +// for (long i = 1; i <= 10; i++) { +// chatRoomJpaRepository.save( +// new ChatRoom(i, "testGameRoom" + i, null, i, +// ChatRoomCode.WAITING, 10L, (long) i, false) +// ); +// memberJpaRepository.save( +// Member.builder() +// .memberName("testName" + i) +// .password("testPassword" + i) +// .email("testEmail" + i) +// .role(Role.USER.toString()) +// .isDeleted(false) +// .build()); +// } +// } +// +// @AfterEach +// void rollback_Redis() { +// gameSessionRedisRepository.deleteAll(); +// playerRedisRepository.deleteAll(); +// } +// +// @Test +// void createGame() { +// //given +// Long testRoomId = 1L; +// ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); +// +// //when +// gameSessionManager.createGame(chatRoom); +// +// //then +// assertThat(gameSessionRedisRepository.findById(testRoomId).get().getHostId()).isEqualTo( +// chatRoom.getOwnerId()); +// } +// +// @Test +// void addUser() { +// //given +// Long testRoomId = 7L; +// int testPlayerCount = 7; +// ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); +// gameSessionManager.createGame(chatRoom); +// +// //when +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// +// //then +// for (long i = 1; i < testPlayerCount; i++) { +// assertThat(playerRedisRepository.findById(i)).isNotEmpty(); +// } +// } +// +// @Test +// void removePlayer() { +// //given +// Long testRoomId = 7L; +// int testPlayerCount = 7; +// ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); +// gameSessionManager.createGame(chatRoom); +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// +// //when +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.removePlayer(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// +// //then +// for (long i = 0; i < testPlayerCount; i++) { +// assertThat(playerRedisRepository.findById(i)).isEmpty(); +// } +// } +// +// @Test +// void startGame() { +// //given +// Long testRoomId = 7L; +// int testPlayerCount = 7; +// ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); +// +// gameSessionManager.createGame(chatRoom); +// +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// +// //when +// gameSessionManager.startGame(testRoomId); +// +// //then +// assertThat(playerRedisRepository.findByRoomId(testRoomId).size()).isEqualTo( +// testPlayerCount); +// assertThat(playerRedisRepository.existsById(chatRoom.getOwnerId())).isEqualTo(true); +// +// } +// +// @Test +// void endGame() { +// //given +// Long testRoomId = 7L; +// int testPlayerCount = 7; +// ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); +// gameSessionManager.createGame(chatRoom); +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// gameSessionManager.startGame(testRoomId); +// +// //when +// gameSessionManager.endGame(testRoomId); +// +// //then +// assertThat(gameSessionRedisRepository.findById(testRoomId).get() +// .getGamePhase()).isEqualTo(GamePhase.READY); +// for (long i = 1; i < testPlayerCount; i++) { +// assertThat(playerRedisRepository.findById(i).get().getRole()).isEqualTo(GameRole.NONE); +// } +// } +// +// @Test +// void removeGame() { +// //given +// Long testRoomId = 7L; +// int testPlayerCount = 7; +// ChatRoom chatRoom = chatRoomJpaRepository.findById(testRoomId).get(); +// gameSessionManager.createGame(chatRoom); +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.addUser(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// +// for (long i = 1; i < testPlayerCount; i++) { +// gameSessionManager.removePlayer(testRoomId, memberJpaRepository.findById(i).get().getMemberName()); +// } +// gameSessionManager.removePlayer(testRoomId, memberJpaRepository.findById(chatRoom.getOwnerId()).get().getMemberName()); +// +// //when +// gameSessionManager.removeGame(testRoomId); +// +// //then +// assertThat(gameSessionRedisRepository.findById(testRoomId)).isEqualTo(Optional.empty()); +// } +//} \ No newline at end of file From d7dbf4483dd7100c1817978806491c0f196ba859 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 11:50:17 +0900 Subject: [PATCH 18/32] =?UTF-8?q?:bug:=20fix:=20MemberGameInfoJpaRepositor?= =?UTF-8?q?y=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=9D=B8=ED=95=9C=20=EC=98=A4=EB=A5=98=20->=20=ED=95=84?= =?UTF-8?q?=EC=9A=94=EC=97=86=EB=8A=94=20import=20=EB=AC=B8=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/springles/repository/MemberRecordJpaRepositoryTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/com/springles/repository/MemberRecordJpaRepositoryTest.java b/src/test/java/com/springles/repository/MemberRecordJpaRepositoryTest.java index d4e2c46d..a8d68c2f 100644 --- a/src/test/java/com/springles/repository/MemberRecordJpaRepositoryTest.java +++ b/src/test/java/com/springles/repository/MemberRecordJpaRepositoryTest.java @@ -1,8 +1,6 @@ package com.springles.repository; -import com.springles.domain.entity.MemberGameInfo; import com.springles.domain.entity.MemberRecord; -import com.springles.repository.support.MemberGameInfoJpaRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; From 0ca1767eb20abe39ee07c4951235f1278c931382 Mon Sep 17 00:00:00 2001 From: Shjung Date: Thu, 7 Sep 2023 12:14:51 +0900 Subject: [PATCH 19/32] =?UTF-8?q?:bug:=20fix:=20MemberGameInfoJpaRepositor?= =?UTF-8?q?yTest=20=EC=97=90=20MemberGameInfoJpaRepository=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EC=98=A4=EB=A5=98=20->=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=EC=97=86=EB=8A=94=20import=20=EB=AC=B8=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springles/repository/MemberGameInfoJpaRepositoryTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/springles/repository/MemberGameInfoJpaRepositoryTest.java b/src/test/java/com/springles/repository/MemberGameInfoJpaRepositoryTest.java index 9991da65..e1f83084 100644 --- a/src/test/java/com/springles/repository/MemberGameInfoJpaRepositoryTest.java +++ b/src/test/java/com/springles/repository/MemberGameInfoJpaRepositoryTest.java @@ -6,7 +6,6 @@ import com.springles.domain.entity.GameRecord; import com.springles.domain.entity.Member; import com.springles.domain.entity.MemberGameInfo; -import com.springles.repository.support.MemberGameInfoJpaRepository; import jakarta.transaction.Transactional; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; From e15d3b7cf87c5741033f63b02b53f834de241cd8 Mon Sep 17 00:00:00 2001 From: HEE-GEON Date: Thu, 7 Sep 2023 15:44:50 +0900 Subject: [PATCH 20/32] Feature/#177 front game ing (#220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :recycle: refactor: 직업 설명 영어 -> 한글 * :sparkles: feat: 게임시작 로직 적용 - 방장만 시작 가능 - 정원이 5명 이상 10명 이하여야 게임시작 가능 - 랜덤 직업 부여 테스트 성공 - 방 정원에 상관없이 정원이 5명 이상 10명 이하면 시작 가능 - 방장이 게임을 나갈 시 방장 변경 기능 적용 - 방장 변경 시 게임 시작 권한 부여 테스트 성공 * :bug: fix: 더미데이터 sql 오타 수정 * :bug: fix: 게임 삭제 시 채팅방 엔티티 삭제 적용 --- .../controller/message/MessageController.java | 32 +++++++++++++++++-- .../springles/domain/constants/GameRole.java | 14 ++++---- .../dto/message/RoleExplainMessage.java | 2 +- .../com/springles/domain/entity/ChatRoom.java | 4 +++ .../springles/game/GameSessionManager.java | 10 +++++- .../com/springles/service/MemberService.java | 2 ++ .../service/impl/MemberServiceImpl.java | 7 +++- src/main/resources/data.sql | 24 ++++++-------- src/main/resources/templates/chat-room.html | 3 +- 9 files changed, 69 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/springles/controller/message/MessageController.java b/src/main/java/com/springles/controller/message/MessageController.java index ed220a0f..4d194a52 100644 --- a/src/main/java/com/springles/controller/message/MessageController.java +++ b/src/main/java/com/springles/controller/message/MessageController.java @@ -12,6 +12,7 @@ import com.springles.game.GameSessionManager; import com.springles.game.MessageManager; import com.springles.service.ChatRoomService; +import com.springles.service.MemberService; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -34,6 +35,7 @@ public class MessageController { private final GameSessionManager gameSessionManager; private final MessageManager messageManager; private final ChatRoomService chatRoomService; + private final MemberService memberService; /*메세지 전송*/ @MessageMapping("/chat/{roomId}") @@ -84,7 +86,7 @@ public void sendMessage_GameJoin(SimpMessageHeaderAccessor accessor, // 게임 참여 메시지 전송 messageManager.sendMessage( "/sub/chat/" + roomId, - memberName + "님이 입장하셨습니다.", + memberName + "님이 입장했습니다.", roomId, "admin"); } @@ -104,7 +106,7 @@ public void sendMessage_GameExit(SimpMessageHeaderAccessor accessor, // 게임 퇴장 메시지 전송 messageManager.sendMessage( "/sub/chat/" + roomId, - memberName + "님이 퇴장하셨습니다.", + memberName + "님이 퇴장했습니다.", roomId, "admin" ); } @@ -113,11 +115,32 @@ public void sendMessage_GameExit(SimpMessageHeaderAccessor accessor, @MessageMapping("/gameStart/{roomId}") public void sendMessage_GameStart(SimpMessageHeaderAccessor accessor, @DestinationVariable Long roomId) { + log.info("요청자 정보: "+getMemberName(accessor)); + // 방장만 게임을 시작 가능 + if (memberService.findUserByName(getMemberName(accessor)).getId() + != chatRoomService.findChatRoomByChatRoomId(roomId).getOwnerId()) { + messageManager.sendMessage( + "/sub/chat/" + roomId + "/" + getMemberName(accessor), + "방장만 게임을 시작할 수 있습니다.", roomId, "admin"); + return; + } + + // 참여자 수가 5이상 10 이하여야 함. + int playerSize = gameSessionManager.findPlayersByRoomId(roomId).size(); + if (playerSize < 5 || playerSize > 10) { + messageManager.sendMessage( + "/sub/chat/" + roomId + "/" + getMemberName(accessor), + "참여자 수가 부족합니다.", roomId, "admin"); + return; + } + + // 게임 시작 메시지 출력 messageManager.sendMessage("/sub/chat/" + roomId, "게임이 시작되었습니다.", roomId, "admin"); + // 게임 시작 -> 직업 랜덤 부여, 게임 페이즈 변경, 직업 설명 List mafiaList = new ArrayList<>(); gameSessionManager.startGame(roomId, getMemberName(accessor)).forEach(p -> { messageManager.sendMessage( @@ -129,10 +152,10 @@ public void sendMessage_GameStart(SimpMessageHeaderAccessor accessor, } }); + // 마피아들에게 마피아가 누구인지 알려주기 String mafiaListString = mafiaList.stream() .map(Player::getMemberName) .collect(Collectors.joining(", ")); - mafiaList.forEach(m -> { messageManager.sendMessage( "/sub/chat/" + roomId + "/" + m.getMemberName(), @@ -140,6 +163,9 @@ public void sendMessage_GameStart(SimpMessageHeaderAccessor accessor, roomId, "admin" ); }); + + // 낮 로직으로 이동하기 + } /*게임 정보 수정?*/ diff --git a/src/main/java/com/springles/domain/constants/GameRole.java b/src/main/java/com/springles/domain/constants/GameRole.java index 7dae20a4..8bffb95c 100644 --- a/src/main/java/com/springles/domain/constants/GameRole.java +++ b/src/main/java/com/springles/domain/constants/GameRole.java @@ -5,16 +5,16 @@ @Getter public enum GameRole { - MAFIA("mafia"), - CIVILIAN("civilian"), - POLICE("police"), - DOCTOR("doctor"), - NONE("none"), - OBSERVER("observer"); + MAFIA("마피아"), + CIVILIAN("시민"), + POLICE("경찰"), + DOCTOR("의사"), + NONE("없음"), + OBSERVER("관전자"); GameRole(String val) { this.val = val; } - private String val; + private final String val; } diff --git a/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java b/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java index 766bf9e3..adb70881 100644 --- a/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java +++ b/src/main/java/com/springles/domain/dto/message/RoleExplainMessage.java @@ -21,7 +21,7 @@ public class RoleExplainMessage { public RoleExplainMessage(GameRole gameRole, String time) { this.gameRole = gameRole; - this.message = "당신의 직업은 " + gameRole + "입니다."; + this.message = "당신의 직업은 " + gameRole.getVal() + "입니다."; this.sender = "admin"; this.time = time; } diff --git a/src/main/java/com/springles/domain/entity/ChatRoom.java b/src/main/java/com/springles/domain/entity/ChatRoom.java index 5e27f591..1f216845 100644 --- a/src/main/java/com/springles/domain/entity/ChatRoom.java +++ b/src/main/java/com/springles/domain/entity/ChatRoom.java @@ -60,4 +60,8 @@ public void modify(ChatRoom chatRoom){ this.head = chatRoom.getHead(); this.close = chatRoom.getClose(); } + + public void changeHost(Long nextHostId) { + this.ownerId = nextHostId; + } } \ No newline at end of file diff --git a/src/main/java/com/springles/game/GameSessionManager.java b/src/main/java/com/springles/game/GameSessionManager.java index 241bfbd1..90190ff2 100644 --- a/src/main/java/com/springles/game/GameSessionManager.java +++ b/src/main/java/com/springles/game/GameSessionManager.java @@ -32,6 +32,7 @@ public class GameSessionManager { private final RoleManager roleManager; private final MemberJpaRepository memberJpaRepository; private final ChatRoomJpaRepository chatRoomJpaRepository; + private final MessageManager messageManager; /* 게임 세션 생성 */ public void createGame(Long roomId) { @@ -74,6 +75,7 @@ public void removeGame(Long roomId) { if (!players.isEmpty()) { throw new CustomException(ErrorCode.GAME_PLAYER_EXISTS); } + chatRoomJpaRepository.deleteById(roomId); gameSessionRedisRepository.deleteById(roomId); } @@ -91,7 +93,13 @@ public void removePlayer(Long roomId, String memberName) { // 남은 플레이어가 존재하고 방장이 나갔다면 랜덤으로 방장 넘겨주기 else if (Objects.equals(gameSession.getHostId(), member.getId())) { Random random = new Random(); - gameSession.changeHost(players.get(random.nextInt(players.size())).getMemberId()); + Player nextHost = players.get(random.nextInt(players.size())); + gameSession.changeHost(nextHost.getMemberId()); + chatRoomJpaRepository.findByIdCustom(roomId).changeHost(nextHost.getMemberId()); + messageManager.sendMessage( + "/sub/chat/"+roomId, + nextHost.getMemberName()+"님이 방장이 되었습니다.", + roomId, "admin"); gameSessionRedisRepository.save(gameSession); } } diff --git a/src/main/java/com/springles/service/MemberService.java b/src/main/java/com/springles/service/MemberService.java index a2c345f3..bfb88872 100644 --- a/src/main/java/com/springles/service/MemberService.java +++ b/src/main/java/com/springles/service/MemberService.java @@ -14,6 +14,8 @@ public interface MemberService { // 사용자 정보 API MemberInfoResponse getUserInfo(String accessToken); + MemberInfoResponse findUserByName(String memberName); + // 사용자 프로필 정보 호출 MemberProfileResponse getUserProfileInfo(String accessToken); diff --git a/src/main/java/com/springles/service/impl/MemberServiceImpl.java b/src/main/java/com/springles/service/impl/MemberServiceImpl.java index 9168101b..128a1edf 100644 --- a/src/main/java/com/springles/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/springles/service/impl/MemberServiceImpl.java @@ -11,7 +11,6 @@ import com.springles.service.MemberService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import jakarta.servlet.http.HttpServletRequest; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -50,6 +49,12 @@ public MemberInfoResponse getUserInfo(String accessToken) { .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER))); } + @Override + public MemberInfoResponse findUserByName(String memberName) { + return MemberInfoResponse.of(memberRepository.findByMemberName(memberName) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER))); + } + /** * 사용자 프로필 정보 반환 */ diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 5f22a738..802356b5 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,8 +1,3 @@ -insert into member -(email,is_deleted,member_name,password,role) -values - ('admin@naver.com',0,'admin123','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); - insert into member (email,is_deleted,member_name,password,role) values @@ -14,7 +9,7 @@ values insert into member (email,is_deleted,member_name,password,role) values - + ('test3@naver.com',0,'test3','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); insert into member (email,is_deleted,member_name,password,role) values @@ -31,16 +26,19 @@ insert into member (email,is_deleted,member_name,password,role) values ('test7@naver.com',0,'test7','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); - +insert into member +(email,is_deleted,member_name,password,role) +values + ('test7@naver.com',0,'test8','$2a$10$jWpTgBFPm4f77Jklchp7iu/oe0uaB8VeaeBiEueRp3/xOlFLvkPqC', 'USER'); insert into member_game_info (is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) values - (0,'0','1','1','NONE','BEGINNER','admin','PROFILE01'); + (0,'0','1','1','NONE','BEGINNER','test1','PROFILE01'); insert into member_game_info (is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) values - (0,'0','2','2','NONE','BEGINNER','test1','PROFILE01'); + (0,'0','2','2','NONE','BEGINNER','test2','PROFILE01'); insert into member_game_info (is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) values @@ -61,9 +59,7 @@ insert into member_game_info (is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) values (0,'0','7','7','NONE','BEGINNER','test7','PROFILE01'); - - -insert into chat_room -(close, capacity, chatroom_id, head, owner_id, password, state, title) +insert into member_game_info +(is_observer, exp, member_game_info_id, member_id, in_game_role, level, nickname, profile_img) values - (0, '7', '1', '0', '1', '', 'WAITING', 'mafia'); \ No newline at end of file + (0,'0','8','8','NONE','BEGINNER','test8','PROFILE01'); diff --git a/src/main/resources/templates/chat-room.html b/src/main/resources/templates/chat-room.html index 9c7e0bc5..816ca010 100644 --- a/src/main/resources/templates/chat-room.html +++ b/src/main/resources/templates/chat-room.html @@ -94,8 +94,7 @@

방 정보

- 게임시작 + 게임시작 내 직업 설명 From 1afcc6784141ab7c40559598c2edf5bb8114931d Mon Sep 17 00:00:00 2001 From: Huisu <87214089+ranunclulus@users.noreply.github.com> Date: Thu, 7 Sep 2023 16:11:37 +0900 Subject: [PATCH 21/32] =?UTF-8?q?:sparkles:=20feat:=20<=EB=82=AE=20?= =?UTF-8?q?=ED=88=AC=ED=91=9C=20=EA=B8=B0=EB=8A=A5=20=EC=99=84>=20(#221)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :sparkles: feat: <투표 기능 완> 투표 시작을 누르면 투표 객체 생성 토글에서 투표할 사람 누르고 투표하면 저장됨 확정은 되지 않음 * :truck: chore: <이게 왜 빠졌지> --- .../controller/message/VoteController.java | 30 ++++++++--- .../springles/domain/entity/GameSession.java | 3 ++ .../impl/GameSessionVoteServiceImpl.java | 14 +++--- src/main/resources/templates/chat-room.html | 50 ++++++++++++++++++- 4 files changed, 83 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/springles/controller/message/VoteController.java b/src/main/java/com/springles/controller/message/VoteController.java index aefbbeff..530c936a 100644 --- a/src/main/java/com/springles/controller/message/VoteController.java +++ b/src/main/java/com/springles/controller/message/VoteController.java @@ -11,6 +11,7 @@ import com.springles.exception.constants.ErrorCode; import com.springles.game.ChatMessage; import com.springles.game.GameSessionManager; +import com.springles.game.MessageManager; import com.springles.repository.PlayerRedisRepository; import com.springles.service.GameSessionVoteService; import lombok.RequiredArgsConstructor; @@ -35,11 +36,12 @@ public class VoteController { private final GameSessionVoteService gameSessionVoteService; private final SimpMessagingTemplate simpMessagingTemplate; private final PlayerRedisRepository playerRedisRepository; + private final MessageManager messageManager; - @MessageMapping("/chat/{roomId}/start") + @MessageMapping("/chat/{roomId}/dayStart") private void voteStart (SimpMessageHeaderAccessor accessor, @DestinationVariable Long roomId) { GameSession gameSession = gameSessionManager.findGameByRoomId(roomId); - gameSession.changePhase(GamePhase.DAY_DISCUSSION, 100); + gameSession.changePhase(GamePhase.DAY_VOTE, 100); gameSession.passADay(); // 종료된 게임인지 체크 @@ -62,22 +64,35 @@ private void voteStart (SimpMessageHeaderAccessor accessor, @DestinationVariable gameSessionVoteService.startVote(roomId, gameSession.getPhaseCount(), gameSession.getGamePhase(), gameSession.getTimer(), alivePlayerMap); + int day = gameSession.getDay(); + + // 투표 시작 메시지 전송 + messageManager.sendMessage( + "/sub/chat/" + roomId, + day + "번째 날 아침이 밝았습니다. 투표를 시작합니다.", + roomId, "admin" + ); } - @MessageMapping("/pub/chat/{roomId}/vote") + @MessageMapping("/chat/{roomId}/vote") private void dayVote(SimpMessageHeaderAccessor accessor, @DestinationVariable Long roomId, @Payload GameSessionVoteRequestDto request) { - String playerName = accessor.getUser().getName(); + String playerName = getMemberName(accessor); + log.info("Player {} 로그로그", playerName); Long playerId = gameSessionManager.findMemberByMemberName(playerName).getId(); + log.info("Player {} vote {}", playerName, request.getVote()); Map voteResult = gameSessionVoteService.vote(roomId, playerId, request); if (voteResult == null) { throw new CustomException(ErrorCode.FAIL_VOTE); } else { - simpMessagingTemplate.convertAndSend("/sub/chat/" + roomId, - VoteResultResponseDto.of(voteResult)); + messageManager.sendMessage( + "/sub/chat/" + roomId, + VoteResultResponseDto.of(voteResult).toString(), + roomId, "admin" + ); } } @@ -178,4 +193,7 @@ public void confirmNightVote(SimpMessageHeaderAccessor accessor, } } } + public String getMemberName(SimpMessageHeaderAccessor accessor) { + return accessor.getUser().getName().split(",")[1].split(":")[1].trim(); + } } diff --git a/src/main/java/com/springles/domain/entity/GameSession.java b/src/main/java/com/springles/domain/entity/GameSession.java index 82b1125e..6134ba3c 100644 --- a/src/main/java/com/springles/domain/entity/GameSession.java +++ b/src/main/java/com/springles/domain/entity/GameSession.java @@ -90,4 +90,7 @@ public void passADay() { this.day++; } + public void setGamePhase(GamePhase phase) { + this.gamePhase = phase; + } } diff --git a/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java b/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java index 3b04da21..ebf052e5 100644 --- a/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java +++ b/src/main/java/com/springles/service/impl/GameSessionVoteServiceImpl.java @@ -39,14 +39,16 @@ public class GameSessionVoteServiceImpl implements GameSessionVoteService { @Override public void startVote(Long roomId, int phaseCount, GamePhase phase, LocalDateTime time, Map players) { log.info("Room {} start Vote for {}", roomId, phase); + GameSession gameSession = gameSessionManager.findGameByRoomId(roomId); + gameSession.setGamePhase(phase); voteRepository.startVote(roomId, phaseCount, phase, players); Timer timer = new Timer(); - VoteFinTimerTask task = new VoteFinTimerTask(this); - task.setRoomId(roomId); - task.setPhaseCount(phaseCount); - task.setPhase(phase); - // 플레이어 하나당 20초의 회의 시간을 줌 - timer.schedule(task, players.size() * 20000L); +// VoteFinTimerTask task = new VoteFinTimerTask(this); +// task.setRoomId(roomId); +// task.setPhaseCount(phaseCount); +// task.setPhase(phase); +// // 플레이어 하나당 20초의 회의 시간을 줌 +// timer.schedule(task, players.size() * 20000L); } @Override diff --git a/src/main/resources/templates/chat-room.html b/src/main/resources/templates/chat-room.html index 816ca010..e8e41c19 100644 --- a/src/main/resources/templates/chat-room.html +++ b/src/main/resources/templates/chat-room.html @@ -130,6 +130,19 @@

참여자

--> +
+
+ + +
+
+