Merge branch 'master' into sql

Author: Michael Wunderlich

bin/test-api.sh

@@ -14,7 +14,7 @@ do
   GAMEID=$(curl --silent -X POST $API/game/$SESSIONID | jq -r .id)
   echo "configuring game, "
   curl --silent -X POST $API/game/$SESSIONID/$GAMEID/users -H "Content-Type: application/json" --data "[\"$USER1ID\",\"$USER2ID\"]"
-  curl --silent -X PUT $API/game/$SESSIONID/$GAMEID/rules/TICTACTOE
+  curl --silent -X PUT $API/game/$SESSIONID/$GAMEID/rules/TicTacToe
   curl --silent -X PUT $API/game/$SESSIONID/$GAMEID/name/tic-tac-toe-test
   EPOCH=$(date +%s)
   curl --silent -X PUT $API/game/$SESSIONID/$GAMEID/starttime/$EPOCH

public/app/gameController.js

@@ -6,6 +6,7 @@ function Game($q, $scope, $http, $interval, $routeParams, SessionService, UserSe
   $scope.gamestate = []; // game state as Array
   $scope.moving = 0;
   $scope.user = UserService.get({ id: $routeParams.userid });
+  $scope.winner = '';
 
   $scope.playgame = function(){
     return $q(function(resolve, reject) {
@@ -16,6 +17,11 @@ function Game($q, $scope, $http, $interval, $routeParams, SessionService, UserSe
       })
       SetState = GetState.then(function(result){
         $scope.gamestate = $scope.state.state.split('');
+        if ( $scope.gamestate[0] == 'A' ) {
+          $scope.winner = "X wins!";
+        } else if ( $scope.gamestate[0] == 'B') {
+          $scope.winner = "O wins!";
+        }
         resolve();
       });
     });
@@ -28,7 +34,7 @@ function Game($q, $scope, $http, $interval, $routeParams, SessionService, UserSe
   }, 5000);
 
   $scope.move = function(cellid){
-    if ( $scope.moving == 1 ) {
+    if ( $scope.moving == 1 || $scope.winner != '' ) {
       return;
     }
     $scope.moving = 1;

public/game.html

@@ -1,6 +1,7 @@
 <div id="game">
   <div id="user"><h6>{{ user.name}}</h6></div>
   <div class="sub-header">{{game.name}}</div>
+  <div id="win message">{{ winner }}</div>
   <div class="gameboard">
     <div class="row">
       <div class="square" ng-click="move(1)">&nbsp;{{gamestate[1]}}</div>

src/main/java/scorekeep/MoveController.java

@@ -31,7 +31,7 @@ public List<Move> getMoves(@PathVariable String sessionId, @PathVariable String
   }
   /* POST /move/SESSION/GAME/USER ; move string */
   @RequestMapping(value="/{userId}", method=RequestMethod.POST)
-  public Move newMove(@PathVariable String sessionId, @PathVariable String gameId, @PathVariable String userId, @RequestBody String move) throws SessionNotFoundException, GameNotFoundException, StateNotFoundException {
+  public Move newMove(@PathVariable String sessionId, @PathVariable String gameId, @PathVariable String userId, @RequestBody String move) throws SessionNotFoundException, GameNotFoundException, StateNotFoundException, RulesException {
     return moveFactory.newMove(sessionId, gameId, userId, move);
   }
   /** GET /move/SESSION/GAME/MOVE **/

src/main/java/scorekeep/MoveFactory.java

@@ -5,8 +5,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.lang.Class;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MoveFactory {
+  private static final Logger logger = LoggerFactory.getLogger("scorekeep.MoveFactory");
   private SecureRandom random = new SecureRandom();
   private final HashMap<String, Move> allMoves = new HashMap<String, Move>(1);
   private MoveModel moveModel = new MoveModel();
@@ -18,10 +24,11 @@ public class MoveFactory {
   public MoveFactory(){
   }
 
-  public Move newMove(String sessionId, String gameId, String userId, String moveText) throws SessionNotFoundException, GameNotFoundException, StateNotFoundException {
+  public Move newMove(String sessionId, String gameId, String userId, String moveText) throws SessionNotFoundException, GameNotFoundException, StateNotFoundException, RulesException {
     String moveId = new BigInteger(40, random).toString(32).toUpperCase();
     String stateId = new BigInteger(40, random).toString(32).toUpperCase();
     Move move = new Move(moveId, sessionId, gameId, userId, moveText);
+    String newStateText = "";
     // load game state
     Game game = gameController.getGame(sessionId, gameId);
     List<String> states = game.getStates();
@@ -37,7 +44,15 @@ public Move newMove(String sessionId, String gameId, String userId, String moveT
     if (newTurn.size() != 1) {
       newTurn.remove(userId);
     }
-    String newStateText = TicTacToe.move(oldState.getState(), moveText);
+    String rulesName = game.getRules();
+    if ( !rulesName.matches("[a-zA-Z]{1,16}") ) {
+      throw new RulesException(rulesName);
+    }
+    try {
+      Class<?> rules = Class.forName("scorekeep." + rulesName);
+      Method moveMethod = rules.getMethod("move", String.class, String.class);
+      newStateText = (String) moveMethod.invoke(null, oldState.getState(), moveText);
+    } catch ( ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { throw new RulesException(rulesName); }
     // save new game state
     State newState = new State(stateId, sessionId, gameId, newStateText, newTurn);
     // register state and move id to game

src/main/java/scorekeep/RulesException.java

@@ -0,0 +1,16 @@
+package scorekeep;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.http.HttpStatus;
+
+@ResponseStatus(value=HttpStatus.BAD_REQUEST, reason="Rules move invocation failed.")
+public class RulesException extends Exception{
+  private String rulesId;
+  public RulesException(String rulesId)
+  {
+    this.rulesId = rulesId;
+  }
+  public String getRulesId()
+  {
+    return rulesId;
+  }
+}

src/main/java/scorekeep/RulesFactory.java

@@ -8,7 +8,7 @@ public class RulesFactory {
   private final HashMap<String, Rules> allRules = new HashMap<String, Rules>(1);
 
   public RulesFactory(){
-    String id = "TICTACTOE";
+    String id = "TicTacToe";
     String name = "Tic Tac Toe";
     String[] categories = { "head to head", "quick" };
     Integer[] users = { 2 };

src/main/java/scorekeep/TicTacToe.java

@@ -1,6 +1,7 @@
 package scorekeep;
 
 import java.lang.Character;
+import java.lang.Math;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +26,44 @@ public static String move(String oldState, String moveText) {
       logger.error("Not your turn");
     }
     // new = "ONNXNNNNNN" 
+    // check for victory
+    // - convert state to integer
+    int stateInt = toInt(oldchar, movchar[0]);
+    logger.info("state int: " + stateInt);
+    // - compare
+    boolean win = checkWin(stateInt);
+    if ( win ) {
+      if ( movchar[0] == 'X') {
+        oldchar[0] = 'A';
+      } else {
+        oldchar[0] = 'B';
+      }
+    }
     String newState = new String(oldchar);
     return newState;
   }
+
+  public static int toInt(char[] state, char turn) {
+    int out = 0;
+    int len = state.length;
+    for ( int i = 1; i <= len; i++ ){
+      if ( state[len-i] == turn) {
+        out += java.lang.Math.pow( 2, i-1 );
+      }
+    }
+    return out;
+  }
+
+  public static boolean checkWin(int state) {
+    int[] winningStates = {7,56,73,84,146,273,292,448};
+    for ( int i = 0; i < 8; i++ ){
+      int combinedState = winningStates[i] & state;
+      if ( combinedState == winningStates[i]) {
+        logger.info("winning state: " + state);
+        logger.info("matches: " + winningStates[i]);
+        return true;
+      }
+    }
+    return false;
+  }
 }