diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java index 9bbebb6..e33e438 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Game.java +++ b/src/main/java/com/ntlab/irisserver/entities/Game.java @@ -16,7 +16,7 @@ private DrawingController drawingController = null; public Game(Room room) { - drawingController = new DrawingController(room, room.getMembers(), assignments); + drawingController = new DrawingController(room, room.getMembers(), assignments, drawingList); } public DrawingController getDrawingController() { @@ -52,4 +52,10 @@ return assignments; } + public List getMap(){ + return map; + } + public List getColor(){ + return color; + } } diff --git a/src/main/java/com/ntlab/irisserver/resources/GameRest.java b/src/main/java/com/ntlab/irisserver/resources/GameRest.java index 3603ee8..67cdf6c 100644 --- a/src/main/java/com/ntlab/irisserver/resources/GameRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/GameRest.java @@ -1,5 +1,8 @@ package com.ntlab.irisserver.resources; +import com.ntlab.irisserver.entities.Game; +import com.ntlab.irisserver.entities.Room; +import com.ntlab.irisserver.models.RoomManager; import org.springframework.stereotype.Component; import javax.ws.rs.GET; @@ -13,6 +16,9 @@ @Path("/{rid}/game/map") @GET public List getMap(@PathParam("rid") String rid){ + RoomManager rm = RoomManager.getInstance(); + Room room = rm.getRoom(rid); + Game game = room.getGame(); return null; }