Adding stats.

gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/GameHistoryDAO.java

@@ -120,16 +120,17 @@ public class GameHistoryDAO {
         }
     }
 
-    public int getActivePlayersInLastMs(long ms) {
+    public int getActivePlayersCount(long from, long duration) {
         try {
             Connection connection = _dbAccess.getDataSource().getConnection();
             try {
                 PreparedStatement statement = connection.prepareStatement(
-                        "select count(*) from (SELECT winner FROM game_history where end_date>=? union select loser from game_history where end_date>=?) as u");
+                        "select count(*) from (SELECT winner FROM game_history where end_date>=? and end_date<? union select loser from game_history where end_date>=? and end_date<?) as u");
                 try {
-                    long time = System.currentTimeMillis() - ms;
+                    statement.setLong(1, from);
-                    statement.setLong(1, time);
+                    statement.setLong(2, from + duration);
-                    statement.setLong(2, time);
+                    statement.setLong(3, from);
+                    statement.setLong(4, from + duration);
                     ResultSet rs = statement.executeQuery();
                     try {
                         if (rs.next())
@@ -150,15 +151,16 @@ public class GameHistoryDAO {
         }
     }
 
-    public int getGamesPlayedCountInLastMs(long ms) {
+    public int getGamesPlayedCount(long from, long duration) {
         try {
             Connection connection = _dbAccess.getDataSource().getConnection();
             try {
                 // 5 minutes minimum game
                 long minTime = 1000 * 60 * 5;
-                PreparedStatement statement = connection.prepareStatement("select count(*) from game_history where end_date>=? and end_date-start_date>" + minTime);
+                PreparedStatement statement = connection.prepareStatement("select count(*) from game_history where end_date>=? and end_date<? and end_date-start_date>" + minTime);
                 try {
-                    statement.setLong(1, System.currentTimeMillis() - ms);
+                    statement.setLong(1, from);
+                    statement.setLong(2, from + duration);
                     ResultSet rs = statement.executeQuery();
                     try {
                         if (rs.next())

gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameHistoryService.java

@@ -1,6 +1,5 @@
 package com.gempukku.lotro.game;
 
-import com.gempukku.lotro.DateUtils;
 import com.gempukku.lotro.db.GameHistoryDAO;
 import com.gempukku.lotro.db.vo.GameHistoryEntry;
 
@@ -13,12 +12,6 @@ public class GameHistoryService {
     private GameHistoryDAO _gameHistoryDAO;
     private Map<String, Integer> _playerGameCount = new ConcurrentHashMap<String, Integer>();
 
-    private Map<Long, Integer> _activeCountCachedTimes = new ConcurrentHashMap<Long, Integer>();
-    private Map<Long, Integer> _activeCountCachedValues = new ConcurrentHashMap<Long, Integer>();
-
-    private Map<Long, Integer> _gamesPlayedCountCachedTimes = new ConcurrentHashMap<Long, Integer>();
-    private Map<Long, Integer> _gamesPlayedCountCachedValues = new ConcurrentHashMap<Long, Integer>();
-
     public GameHistoryService(GameHistoryDAO gameHistoryDAO) {
         _gameHistoryDAO = gameHistoryDAO;
     }
@@ -46,28 +39,12 @@ public class GameHistoryService {
         return _gameHistoryDAO.getGameHistoryForPlayer(player, start, count);
     }
 
-    public int getActivePlayersInLastMs(long ms) {
+    public int getActivePlayersCount(long from, long duration) {
-        Integer cachedOn = _activeCountCachedTimes.get(ms);
+        return _gameHistoryDAO.getActivePlayersCount(from, duration);
-        int minute = DateUtils.getCurrentMinute();
-        if (cachedOn != null && minute == cachedOn)
-            return _activeCountCachedValues.get(ms);
-
-        int result = _gameHistoryDAO.getActivePlayersInLastMs(ms);
-        _activeCountCachedValues.put(ms, result);
-        _activeCountCachedTimes.put(ms, minute);
-        return result;
     }
 
-    public int getGamesPlayedCountInLastMs(long ms) {
+    public int getGamesPlayedCount(long from, long duration) {
-        Integer cachedOn = _gamesPlayedCountCachedTimes.get(ms);
+        return _gameHistoryDAO.getGamesPlayedCount(from, duration);
-        int minute = DateUtils.getCurrentMinute();
-        if (cachedOn != null && minute == cachedOn)
-            return _gamesPlayedCountCachedValues.get(ms);
-
-        int result = _gameHistoryDAO.getGamesPlayedCountInLastMs(ms);
-        _gamesPlayedCountCachedValues.put(ms, result);
-        _gamesPlayedCountCachedTimes.put(ms, minute);
-        return result;
     }
 
     public long getOldestGameHistoryEntry() {

gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/ServerResource.java

@@ -3,10 +3,7 @@ package com.gempukku.lotro.server;
 import com.gempukku.lotro.chat.ChatServer;
 import com.gempukku.lotro.common.ApplicationRoot;
 import com.gempukku.lotro.db.vo.GameHistoryEntry;
-import com.gempukku.lotro.game.GameHistoryService;
+import com.gempukku.lotro.game.*;
-import com.gempukku.lotro.game.LotroCardBlueprintLibrary;
-import com.gempukku.lotro.game.LotroServer;
-import com.gempukku.lotro.game.Player;
 import com.gempukku.lotro.hall.HallServer;
 import com.sun.jersey.spi.resource.Singleton;
 import org.apache.log4j.Logger;
@@ -26,7 +23,12 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 @Singleton
 @Path("/")
@@ -203,9 +205,11 @@ public class ServerResource extends AbstractResource {
             sb.append("<script>location.href='hall.html';</script>");
         } else {
             sb.append("You are not logged in, log in below or <button id='clickToRegister'>register</button>.");
+            int day = 1000 * 60 * 60 * 24;
+            int week = 1000 * 60 * 60 * 24 * 7;
             sb.append("<div class='status'>Tables count: ").append(_hallServer.getTablesCount()).append(", players in hall: ").append(_chatServer.getChatRoom("Game Hall").getUsersInRoom().size())
-                    .append(", games played in last 24 hours: ").append(_gameHistoryService.getGamesPlayedCountInLastMs(1000 * 60 * 60 * 24))
+                    .append(", games played in last 24 hours: ").append(_gameHistoryService.getGamesPlayedCount(System.currentTimeMillis() - day, day))
-                    .append(",<br/> active players in last week: ").append(_gameHistoryService.getActivePlayersInLastMs(1000 * 60 * 60 * 24 * 7))
+                    .append(",<br/> active players in last week: ").append(_gameHistoryService.getActivePlayersCount(System.currentTimeMillis() - week, week))
                     .append("</div>");
             sb.append(getLoginHTML());
         }
@@ -213,6 +217,60 @@ public class ServerResource extends AbstractResource {
         return sb.toString();
     }
 
+    @Path("/stats")
+    @GET
+    @Produces(MediaType.APPLICATION_XML)
+    public Document getGameState(
+            @QueryParam("startDay") String startDay,
+            @QueryParam("length") String length,
+            @QueryParam("participantId") String participantId,
+            @Context HttpServletRequest request) throws ParserConfigurationException {
+        Player resourceOwner = getResourceOwnerSafely(request, participantId);
+
+        try {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            format.setTimeZone(TimeZone.getTimeZone("GMT"));
+            long from = format.parse(startDay).getTime();
+            Date to = format.parse(startDay);
+            if (length.equals("month"))
+                to.setMonth(to.getMonth() + 1);
+            else if (length.equals("week"))
+                to.setDate(to.getDate() + 7);
+            else if (length.equals("day"))
+                to.setDate(to.getDate() + 1);
+            else
+                sendError(Response.Status.BAD_REQUEST);
+            long duration = to.getTime() - from;
+
+            int activePlayers = _gameHistoryService.getActivePlayersCount(from, duration);
+            int gamesCount = _gameHistoryService.getGamesPlayedCount(from, duration);
+
+            GameHistoryStatistics gameHistoryStatistics = _gameHistoryService.getGameHistoryStatistics(from, duration);
+
+            DecimalFormat percFormat = new DecimalFormat("#0.0%");
+
+            DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+            Document doc = documentBuilder.newDocument();
+            Element stats = doc.createElement("stats");
+            stats.setAttribute("activePlayers", String.valueOf(activePlayers));
+            stats.setAttribute("gamesCount", String.valueOf(gamesCount));
+            for (GameHistoryStatistics.FormatStat formatStat : gameHistoryStatistics.getFormatStats()) {
+                Element formatStatElem = doc.createElement("formatStat");
+                formatStatElem.setAttribute("format", formatStat.getFormat());
+                formatStatElem.setAttribute("count", String.valueOf(formatStat.getCount()));
+                formatStatElem.setAttribute("perc", percFormat.format(formatStat.getPercentage()));
+                stats.appendChild(formatStatElem);
+            }
+
+            doc.appendChild(stats);
+            return doc;
+        } catch (ParseException exp) {
+            sendError(Response.Status.BAD_REQUEST);
+            return null;
+        }
+    }
+
     private void logUser(HttpServletRequest request, String login) {
         request.getSession().setAttribute("logged", login);
     }