From 37c394f0109eab6d7438be4cccdfdbf4abe059ec Mon Sep 17 00:00:00 2001 From: waterricecake Date: Sat, 12 Oct 2024 19:48:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?hotfix=20:=20SSE=20=EC=A0=91=EC=86=8D?= =?UTF-8?q?=EC=8B=9C=20code=20name=20parsing=20=EB=A1=9C=EC=A7=81=20?= =?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/mafia/mafiatogether/game/aspect/SseService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/mafia/mafiatogether/game/aspect/SseService.java b/src/main/java/mafia/mafiatogether/game/aspect/SseService.java index e86b9c28..79c7b146 100644 --- a/src/main/java/mafia/mafiatogether/game/aspect/SseService.java +++ b/src/main/java/mafia/mafiatogether/game/aspect/SseService.java @@ -4,6 +4,7 @@ import mafia.mafiatogether.common.annotation.PlayerInfo; import mafia.mafiatogether.common.exception.AuthException; import mafia.mafiatogether.common.exception.ExceptionCode; +import mafia.mafiatogether.common.resolver.PlayerInfoDto; import mafia.mafiatogether.game.application.dto.response.GameStatusResponse; import mafia.mafiatogether.game.domain.Game; import mafia.mafiatogether.game.domain.GameRepository; @@ -45,8 +46,9 @@ public ResponseEntity subscribe(final ProceedingJoinPoint joinPoint) String[] codeAndName = new String[2]; for (int i = 0; i < parameterAnnotations.length; i++) { if (hasPlayerInfo(parameterAnnotations[i])) { - codeAndName[0] = args[i].toString(); - codeAndName[1] = args[i].toString(); + PlayerInfoDto playerInfoDto = (PlayerInfoDto) args[i]; + codeAndName[0] = playerInfoDto.code(); + codeAndName[1] = playerInfoDto.name(); break; } } From 345aa71de897d45f05c524b351270b0d5edf8b42 Mon Sep 17 00:00:00 2001 From: waterricecake Date: Sat, 12 Oct 2024 20:03:33 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20mafiaTarget=20null=EC=9D=BC?= =?UTF-8?q?=EC=8B=9C=20npe=20=EB=B0=A9=EC=A7=80=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/mafia/mafiatogether/job/domain/JobTarget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mafia/mafiatogether/job/domain/JobTarget.java b/src/main/java/mafia/mafiatogether/job/domain/JobTarget.java index 6dbe28c0..c17fdc57 100644 --- a/src/main/java/mafia/mafiatogether/job/domain/JobTarget.java +++ b/src/main/java/mafia/mafiatogether/job/domain/JobTarget.java @@ -25,7 +25,7 @@ public JobTarget() { public String findTarget() { final String mafiaTarget = findJobTargetBy(JobType.MAFIA); final String doctorTarget = findJobTargetBy(JobType.DOCTOR); - if (mafiaTarget.equals(doctorTarget)) { + if (mafiaTarget == null || mafiaTarget.equals(doctorTarget)) { return null; } return mafiaTarget;