Merge branch 'master' of github.com:cash1981/civilization-boardgame-rest

Author: cash1981

src/main/java/no/asgari/civilization/server/action/PlayerAction.java

@@ -715,4 +715,21 @@ public void saveNote(String pbfId, String playerId, MessageDTO messageDTO) {
         playerhand.setGamenote(messageDTO.getMessage());
         pbfCollection.updateById(pbfId, pbf);
     }
+
+    public void takeTurnButton(String pbfId, String playerId) {
+        Preconditions.checkNotNull(pbfId);
+        Preconditions.checkNotNull(playerId);
+        PBF pbf = pbfCollection.findOneById(pbfId);
+
+        pbf.getPlayers().stream()
+                .filter(p -> p.isYourTurn())
+                .forEach(p -> p.setYourTurn(false));
+
+        Playerhand playerhand = getPlayerhandByPlayerId(playerId, pbf);
+        playerhand.setYourTurn(true);
+
+        pbfCollection.updateById(pbfId, pbf);
+
+        super.createCommonPublicLog("took turn button", pbfId, playerId);
+    }
 }

src/main/java/no/asgari/civilization/server/resource/PlayerResource.java

@@ -345,4 +345,12 @@ public Response saveNote(@Auth Player player, @NotEmpty @PathParam("pbfId") Stri
         return Response.ok().build();
     }
 
+    @PUT
+    @Path("/turn/take")
+    public Response takeTurn(@Auth Player player, @NotEmpty @PathParam("pbfId") String pbfId) {
+        playerAction.takeTurnButton(pbfId, player.getId());
+        return Response.ok().build();
+    }
+
+
 }