diff --git a/src/main/java/com/ntlab/irisserver/entities/Card.java b/src/main/java/com/ntlab/irisserver/entities/Card.java index ebc574d..ab9160b 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Card.java +++ b/src/main/java/com/ntlab/irisserver/entities/Card.java @@ -5,13 +5,13 @@ public class Card { @JsonProperty("isOpen") - public boolean isOpen; + private boolean isOpen; @JsonProperty("color") - public String color; + private String color; @JsonProperty("dno") - public int dno; + private int dno; public void setIsOpen(boolean isOpen) {this.isOpen = isOpen;} diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index e33e438..d8140a9 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -12,6 +12,7 @@ private Map keywordList = new HashMap<>(); private List map = new ArrayList<>(); private List color = new ArrayList<>(); + private String turn = "none"; private DrawingController drawingController = null; @@ -58,4 +59,7 @@ public List getColor(){ return color; } + public String getTurn(){ + return turn; + } } diff --git a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java index 2c1ffa9..53bc8aa 100644 --- a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java @@ -1,6 +1,9 @@ package com.ntlab.irisserver.resources; +import com.ntlab.irisserver.entities.Game; +import com.ntlab.irisserver.entities.Room; import com.ntlab.irisserver.entities.Turn; +import com.ntlab.irisserver.models.RoomManager; import org.springframework.stereotype.Component; import javax.ws.rs.GET; @@ -21,7 +24,11 @@ @Path("/{rid}/game/turn") @GET - public Turn getTurn(@PathParam("rid") String rid) { - return null; + public String getTurn(@PathParam("rid") String rid) { + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); + String turn = game.getTurn(); + return turn; } }