Merge branch 'feature-halloffame' into 'devel'

#10 Fix - don't count tutorials to received trophies



See merge request !102

core/src/cz/nic/tablexia/model/game/GameTrophy.java

@@ -29,7 +29,7 @@ public class GameTrophy {
 
     public static class NumberOfTimesFinished implements GameTrophyResolver {
 
-        public static final String GAME_PLAYED_SELECT = "SELECT COUNT(*) FROM game WHERE user_id = ? AND game_number = ? AND end_time IS NOT NULL GROUP BY user_id, game_number";
+        public static final String GAME_PLAYED_SELECT = "SELECT COUNT(*) FROM game WHERE user_id = ? AND game_number = ? AND difficulty_number != ? AND end_time IS NOT NULL GROUP BY user_id, game_number";
 
         @Override
         public boolean hasGameTrophy(User user, GameTrophyDefinition trophyDef) {
@@ -38,6 +38,7 @@ public class GameTrophy {
                 PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(GAME_PLAYED_SELECT);
                 statement.setLong(1, user.getId());
                 statement.setInt(2, trophyDef.getGameDefinition().getGameNumber());
+                statement.setInt(3, GameDifficulty.TUTORIAL.getDifficultyNumber());
                 try {
                     ResultSet resultSet = statement.executeQuery();
                     if (resultSet.next()) {

core/src/cz/nic/tablexia/model/game/UserTrophy.java

@@ -139,7 +139,7 @@ public class UserTrophy {
     public static class AllStarsGame implements UserTrophyResolver {
 
         public static final String GAME_SELECT_FOR_USER_AND_DIFFICULTY = "SELECT id, user_id, difficulty_number, game_number, random_seed, start_time, end_time FROM game WHERE difficulty_number = ? AND user_id = ? AND end_time IS NOT NULL";
-        public static final String GAME_SELECT_FOR_USER = "SELECT id, user_id, difficulty_number, game_number, random_seed, start_time, end_time FROM game WHERE user_id = ? AND end_time IS NOT NULL";
+        public static final String GAME_SELECT_FOR_USER = "SELECT id, user_id, difficulty_number, game_number, random_seed, start_time, end_time FROM game WHERE user_id = ? AND difficulty_number != ? AND end_time IS NOT NULL";
 
         private static List<Game> getGamesForUserAndDifficulty(User user, UserTrophyDefinition trophyDef) throws SQLException {
             PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(GAME_SELECT_FOR_USER_AND_DIFFICULTY);
@@ -152,6 +152,7 @@ public class UserTrophy {
         private static List<Game> getGamesForUser(User user) throws SQLException {
             PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(GAME_SELECT_FOR_USER);
             statement.setLong(1, user.getId());
+            statement.setInt(2, GameDifficulty.TUTORIAL.getDifficultyNumber());
 
             return getGamesByUserAndStatement(user, statement);
         }