From 2d12d9350276f49e18537aa12dc342593b4b7bde Mon Sep 17 00:00:00 2001 From: dlrjs2360 Date: Thu, 14 Sep 2023 09:23:56 +0900 Subject: [PATCH] =?UTF-8?q?:sparkles:=20feat:=20=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=A0=80=EC=9E=A5=20=EB=B0=8F=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/springles/controller/api/MemberController.java | 4 ++-- src/main/java/com/springles/domain/entity/Member.java | 5 +++++ src/main/java/com/springles/game/DayDiscussionManager.java | 2 +- src/main/java/com/springles/game/DayEliminationManager.java | 2 -- src/main/java/com/springles/game/DayToNightManager.java | 1 - src/main/java/com/springles/game/GameSessionManager.java | 3 ++- src/main/java/com/springles/service/MemberService.java | 2 +- .../java/com/springles/service/impl/MemberServiceImpl.java | 6 +++--- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/springles/controller/api/MemberController.java b/src/main/java/com/springles/controller/api/MemberController.java index 27a465e1..f6576a4d 100644 --- a/src/main/java/com/springles/controller/api/MemberController.java +++ b/src/main/java/com/springles/controller/api/MemberController.java @@ -275,7 +275,7 @@ public ResponseEntity isExistsProfile( .build() ); } - +/* // 레벨업 @PatchMapping("/levelup") public ResponseEntity levelUp( @@ -292,7 +292,7 @@ public ResponseEntity levelUp( .data(memberService.levelUp(memberId)) .build() ); - } + }*/ // 멤버 게임 기록 조회 diff --git a/src/main/java/com/springles/domain/entity/Member.java b/src/main/java/com/springles/domain/entity/Member.java index 58c7ae60..ce6c34cf 100644 --- a/src/main/java/com/springles/domain/entity/Member.java +++ b/src/main/java/com/springles/domain/entity/Member.java @@ -60,4 +60,9 @@ public String toString() { + ", role : " + role + ", isDeleted : " + isDeleted; } + + public void addGameRecord(GameRecord gameRecord) { + gameRecordList.add(gameRecord); + } + } \ No newline at end of file diff --git a/src/main/java/com/springles/game/DayDiscussionManager.java b/src/main/java/com/springles/game/DayDiscussionManager.java index d0cafe57..80b28e3d 100644 --- a/src/main/java/com/springles/game/DayDiscussionManager.java +++ b/src/main/java/com/springles/game/DayDiscussionManager.java @@ -107,7 +107,7 @@ public void sendMessage(DayDiscussionMessage message) { log.info("변론 후 최종 투표를 시작합니다."); messageManager.sendMessage( "/sub/chat/" + roomId, - "변론 시간이 종료되었습니다. 최종 투표를 진행합니다. 투표 시간은 30초 입니다.", + "변론 시간이 종료되었습니다. 최종 투표를 진행합니다. 투표 시간은 20초 입니다.", roomId, "admin" ); }; diff --git a/src/main/java/com/springles/game/DayEliminationManager.java b/src/main/java/com/springles/game/DayEliminationManager.java index 5ef0cc4c..9323df00 100644 --- a/src/main/java/com/springles/game/DayEliminationManager.java +++ b/src/main/java/com/springles/game/DayEliminationManager.java @@ -61,8 +61,6 @@ private void setDayToNight(GameSession gameSession, Long deadPlayerId) { // 죽어서 관찰만 하는 사람들 List players = playerRedisRepository.findByRoomId(gameSession.getRoomId()); - - for (Player player : players) { // 살아 있으면 패스 if (player.isAlive()) { diff --git a/src/main/java/com/springles/game/DayToNightManager.java b/src/main/java/com/springles/game/DayToNightManager.java index d07e021b..1c486253 100644 --- a/src/main/java/com/springles/game/DayToNightManager.java +++ b/src/main/java/com/springles/game/DayToNightManager.java @@ -81,7 +81,6 @@ else if (gameSessionManager.mafiaWin(gameSession) == 0) { ); } - log.info("game end"); gameSessionManager.endGame(gameSession.getRoomId()); messageManager.sendMessage( diff --git a/src/main/java/com/springles/game/GameSessionManager.java b/src/main/java/com/springles/game/GameSessionManager.java index 3b2165e1..d077913c 100644 --- a/src/main/java/com/springles/game/GameSessionManager.java +++ b/src/main/java/com/springles/game/GameSessionManager.java @@ -89,7 +89,8 @@ public void endGame(Long roomId) { } for (Member member : memberList) { gameRecord.addMember(member); - memberService.levelUp(member.getId()); + member.addGameRecord(gameRecord); + memberService.levelUp(member.getId(),gameRecord); } gameRecordJpaRepository.save(gameRecord); diff --git a/src/main/java/com/springles/service/MemberService.java b/src/main/java/com/springles/service/MemberService.java index e97d8d54..9177c21c 100644 --- a/src/main/java/com/springles/service/MemberService.java +++ b/src/main/java/com/springles/service/MemberService.java @@ -52,7 +52,7 @@ public interface MemberService { * */ Long existsUserProfile(String accessToken); - MemberProfileResponse levelUp(Long memberId); + MemberProfileResponse levelUp(Long memberId,GameRecord gameRecord); Level nextLevel(Level rawLevel); diff --git a/src/main/java/com/springles/service/impl/MemberServiceImpl.java b/src/main/java/com/springles/service/impl/MemberServiceImpl.java index dc3b7447..3d60b07f 100644 --- a/src/main/java/com/springles/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/springles/service/impl/MemberServiceImpl.java @@ -607,7 +607,7 @@ public MemberProfileRead readProfile(String accessToken) { * 레벨(경험치) 업데이트 */ @Override - public MemberProfileResponse levelUp(Long memberId) { + public MemberProfileResponse levelUp(Long memberId, GameRecord gameRecord) { // 해당 회원의 게임정보 호출 Optional optionalMemberGameInfo = memberGameInfoJpaRepository.findByMemberId(memberId); @@ -615,8 +615,8 @@ public MemberProfileResponse levelUp(Long memberId) { throw new CustomException(ErrorCode.NOT_FOUND_GAME_INFO); } - // 가장 최근 게임기록 - GameRecord gameRecord = gameRecordJpaRepository.findTOP1MemberIdOrderByIdDesc(memberId); +/* // 가장 최근 게임기록 + GameRecord gameRecord = gameRecordJpaRepository.findTOP1MemberIdOrderByIdDesc(memberId);*/ // 현재 레벨 Level level = optionalMemberGameInfo.get().getLevel();