Merge pull request #21 from ijehyunpark/feature/card-communication

Draft: 입력 버그 수정
ijehyunpark · Jun 10, 2023 · 73b5cca · 73b5cca
2 parents 4f7bd04 + 0cae9ad
commit 73b5cca
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/AgricolaGame.java b/src/main/java/com/semoss/agricola/GamePlay/domain/AgricolaGame.java
@@ -46,7 +46,7 @@ public class AgricolaGame implements Game {
 
     @Getter
     public static class GameState {
-        private int round = -1;
+        private int round = 0;
         private GameProgress gameProgress;
         @JsonProperty("playerId")
         @JsonIdentityReference(alwaysAsId = true)

diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/action/implement/Action29.java b/src/main/java/com/semoss/agricola/GamePlay/domain/action/implement/Action29.java
@@ -1,5 +1,7 @@
 package com.semoss.agricola.GamePlay.domain.action.implement;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.semoss.agricola.GamePlay.domain.History;
 import com.semoss.agricola.GamePlay.domain.action.DoType;
 import com.semoss.agricola.GamePlay.domain.action.component.PlaceAction;
@@ -10,6 +12,8 @@
 import com.semoss.agricola.GamePlay.domain.resource.ResourceStructInterface;
 import com.semoss.agricola.GamePlay.domain.resource.ResourceType;
 import com.semoss.agricola.GamePlay.dto.AgricolaActionRequest;
+import com.semoss.agricola.GamePlay.exception.IllegalRequestException;
+import com.semoss.agricola.util.ObjectMapperSingleton;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,7 +45,15 @@ public History runAction(Player player, Player startingPlayer, int round,  List<
         // TODO: Memento로 실패 시 롤백
 
         PlaceAction placeAction = (PlaceAction) getActions().get(0);
-        Long cardId = (Long) acts.get(0).getActs();
+        Long cardId;
+        try {
+            AgricolaActionRequest.ActionFormat actionFormat = acts.get(0);
+            ObjectMapper objectMapper = ObjectMapperSingleton.getInstance();
+            String jsonString = objectMapper.writeValueAsString(actionFormat.getActs());
+            cardId = objectMapper.readValue(jsonString, Long.class);
+        } catch (JsonProcessingException e){
+            throw new IllegalRequestException("요청 필드 오류");
+        }
 
         // 플레이어가 내려놓은 직업 카드 계산
         int occupationCount = 0;

diff --git a/src/main/java/com/semoss/agricola/GamePlay/domain/action/implement/Action4.java b/src/main/java/com/semoss/agricola/GamePlay/domain/action/implement/Action4.java
@@ -1,5 +1,7 @@
 package com.semoss.agricola.GamePlay.domain.action.implement;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.semoss.agricola.GamePlay.domain.History;
 import com.semoss.agricola.GamePlay.domain.action.DoType;
 import com.semoss.agricola.GamePlay.domain.action.component.PlaceAction;
@@ -10,6 +12,8 @@
 import com.semoss.agricola.GamePlay.domain.resource.ResourceStructInterface;
 import com.semoss.agricola.GamePlay.domain.resource.ResourceType;
 import com.semoss.agricola.GamePlay.dto.AgricolaActionRequest;
+import com.semoss.agricola.GamePlay.exception.IllegalRequestException;
+import com.semoss.agricola.util.ObjectMapperSingleton;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -40,7 +44,15 @@ public History runAction(Player player, Player startingPlayer, int round, List<A
         // TODO: Memento로 실패 시 롤백
 
         PlaceAction placeAction = (PlaceAction) getActions().get(0);
-        Long cardId = (Long) acts.get(0).getActs();
+        Long cardId;
+        try {
+            AgricolaActionRequest.ActionFormat actionFormat = acts.get(0);
+            ObjectMapper objectMapper = ObjectMapperSingleton.getInstance();
+            String jsonString = objectMapper.writeValueAsString(actionFormat.getActs());
+            cardId = objectMapper.readValue(jsonString, Long.class);
+        } catch (JsonProcessingException e){
+            throw new IllegalRequestException("요청 필드 오류");
+        }
 
         // 플레이어가 내려놓은 직업 카드 계산
         int occupationCount = 0;