diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java index 48c6386..0f126d0 100644 --- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java @@ -1,11 +1,7 @@ package com.ntlab.irisserver.resources; +import com.ntlab.irisserver.entities.*; import org.springframework.stereotype.Component; import com.ntlab.irisserver.models.RoomManager; -import com.ntlab.irisserver.entities.Room; -import com.ntlab.irisserver.entities.Game; -import com.ntlab.irisserver.entities.Turn; -import com.ntlab.irisserver.entities.Cell; -import com.ntlab.irisserver.entities.Member; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @@ -50,12 +46,13 @@ @GET //Turnインスタンスの取得 @Path("/{rid}/game/turns/{tno}") @Produces(MediaType.APPLICATION_JSON) - public Turn getTurns(@PathParam("rid") String rid, @PathParam("tno") int tno) { + public TurnJson getTurns(@PathParam("rid") String rid, @PathParam("tno") int tno) { RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); Turn t = game.getTurn(tno); + TurnJson tj = new TurnJson(t); if (t == null) { //部屋がなければエラー @@ -64,11 +61,22 @@ throw new WebApplicationException(response.build()); } - return t; + return tj; } //------------------------------------------------------------------------ // rooms/{rid}/game/turns/{tno}/hint: + @GET //ヒントを取得 + @Path("/{rid}/game/turns/{tno}/hint") + public String getHint(@PathParam("rid") String rid, @PathParam("tno") int tno){ + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); + Turn t = game.getTurn(tno); + + return t.getHint(); + } + @PUT //ヒントと最大数を入力することで諜報員のターンに遷移する @Path("/{rid}/game/turns/{tno}/hint") public void putHint(@PathParam("rid") String rid, @PathParam("tno") int tno, @FormParam("hint") String hint, @FormParam("max") int max){ @@ -85,6 +93,17 @@ //------------------------------------------------------------------------ // rooms/{rid}/game/turns/{tno}/max: + @GET //Maxを取得 + @Path("/{rid}/game/turns/{tno}/max") + public Integer getMax(@PathParam("rid") String rid, @PathParam("tno") int tno){ + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); + Turn t = game.getTurn(tno); + + return t.getMax(); + } + /* @PUT //putHintに吸収合併 @Path("/{rid}/game/turns/{tno}/max")