remove game from session on game delete

Author: mwunderl

src/main/java/scorekeep/GameController.java

@@ -58,8 +58,8 @@ public Game updateGame(@PathVariable String sessionId, @PathVariable String game
   }
   /*  DELETE /game/SESSION/GAME */
   @RequestMapping(value="/{gameId}",method=RequestMethod.DELETE)
-  public void deleteGame(@PathVariable String gameId) throws GameNotFoundException {
-    model.deleteGame(gameId);
+  public void deleteGame(@PathVariable String sessionId, @PathVariable String gameId) throws GameNotFoundException {
+    model.deleteGame(sessionId, gameId);
   }
   /*  GET /game/SESSION/GAME/name */
   @RequestMapping(value="/{gameId}/name", method=RequestMethod.GET)

src/main/java/scorekeep/GameModel.java

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.HashSet;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.profile.ProfileCredentialsProvider;
@@ -74,11 +75,17 @@ public List<Game> loadGames(String sessionId) throws SessionNotFoundException {
     return sessionGames;
   }
 
-  public void deleteGame(String gameId) throws GameNotFoundException {
+  public void deleteGame(String sessionId, String gameId) throws GameNotFoundException {
     Game game = mapper.load(Game.class, gameId);
     if ( game == null ) {
       throw new GameNotFoundException(gameId);
     }
     mapper.delete(game);
+    //delete game from session
+    Session session = mapper.load(Session.class, sessionId);
+    Set<String> sessionGames = session.getGames();
+    sessionGames.remove(gameId);
+    session.setGames(sessionGames);
+    mapper.save(session);
   }
 }