WorldTimesTable

Plan/src/main/java/com/djrapitops/plan/data/Session.java

@@ -3,6 +3,7 @@ package main.java.com.djrapitops.plan.data;
 import main.java.com.djrapitops.plan.data.time.WorldTimes;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -57,8 +58,8 @@ public class Session {
         this.sessionID = id;
         this.sessionStart = sessionStart;
         this.sessionEnd = sessionEnd;
-        this.worldTimes = worldTimes;
+        this.worldTimes = new WorldTimes(new HashMap<>());
-        this.playerKills = playerKills;
+        this.playerKills = new ArrayList<>();
         this.mobKills = mobKills;
         this.deaths = deaths;
     }

Plan/src/main/java/com/djrapitops/plan/data/time/GMTimes.java

@@ -32,7 +32,6 @@ public class GMTimes extends TimeKeeper {
     public GMTimes(Map<String, Long> times) {
         super(times);
     }
-
     public GMTimes() {
         super();
     }

Plan/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java

@@ -132,4 +132,8 @@ public class WorldTimes {
     public Map<String, GMTimes> getWorldTimes() {
         return worldTimes;
     }
+
+    public void setGMTimesForWorld(String world, GMTimes gmTimes) {
+        worldTimes.put(world, gmTimes);
+    }
 }

Plan/src/main/java/com/djrapitops/plan/database/tables/KillsTable.java

@@ -14,8 +14,6 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * @author Rsl1122
@@ -26,7 +24,7 @@ public class KillsTable extends UserIDTable {
     private final String columnVictimUserID = "victim_id";
     private final String columnWeapon = "weapon";
     private final String columnDate = "date";
-    private final String columnSessionID = "session_id"; //TODO
+    private final String columnSessionID = "session_id";
 
     private final SessionsTable sessionsTable;
 
@@ -116,21 +114,20 @@ public class KillsTable extends UserIDTable {
         }
     }
 
-    public void addKillsToSessions(UUID uuid, List<Session> allSessions) throws SQLException {
+    public void addKillsToSessions(UUID uuid, Map<Long, Session> sessions) throws SQLException {
         PreparedStatement statement = null;
         ResultSet set = null;
-        Map<Long, Session> sessions = allSessions.stream().collect(Collectors.toMap(Session::getSessionID, Function.identity()));
         try {
-            String usersTableID = usersTable + "." + usersTable.getColumnID();
+            String usersIDColumn = usersTable + "." + usersTable.getColumnID();
-            String usersTableUUID = usersTable + "." + usersTable.getColumnUUID() + " as victim_uuid";
+            String usersUUIDColumn = usersTable + "." + usersTable.getColumnUUID() + " as victim_uuid";
             statement = prepareStatement("SELECT " +
                     columnSessionID + ", " +
                     columnDate + ", " +
                     columnWeapon + ", " +
-                    usersTableUUID + ", " +
+                    usersUUIDColumn +
                     " FROM " + tableName +
                     " WHERE " + columnKillerUserID + "=" + usersTable.statementSelectID +
-                    " JOIN " + usersTable + " on " + usersTableID + "=" + columnVictimUserID); // Might not work TODO TEST
+                    " JOIN " + usersTable + " on " + usersIDColumn + "=" + columnVictimUserID); // Might not work TODO TEST
             statement.setString(1, uuid.toString());
             set = statement.executeQuery();
             while (set.next()) {
@@ -149,4 +146,6 @@ public class KillsTable extends UserIDTable {
             close(set, statement);
         }
     }
+
+    // TODO getPlayerKills (UUID)
 }

Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java

@@ -12,6 +12,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -92,7 +93,7 @@ public class SessionsTable extends UserIDTable {
         if (sessionID == -1) {
             throw new IllegalStateException("Session was not Saved!");
         }
-        db.getWorldTimesTable().saveWorldTimes(sessionID, session.getWorldTimes());
+        db.getWorldTimesTable().saveWorldTimes(uuid, sessionID, session.getWorldTimes());
         db.getKillsTable().savePlayerKills(uuid, sessionID, session.getPlayerKills());
     }
 
@@ -201,7 +202,8 @@ public class SessionsTable extends UserIDTable {
 
     public Map<String, List<Session>> getSessions(UUID uuid) throws SQLException {
         Map<String, List<Session>> sessions = getSessionInformation(uuid);
-        List<Session> allSessions = sessions.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+        Map<Long, Session> allSessions = sessions.values().stream().flatMap(Collection::stream).collect(Collectors.toMap(Session::getSessionID, Function.identity()));
+
         db.getKillsTable().addKillsToSessions(uuid, allSessions);
         db.getWorldTimesTable().addWorldTimesToSessions(uuid, allSessions);
         return sessions;

Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTable.java

@@ -23,9 +23,11 @@ import java.util.List;
  */
 public class WorldTable extends Table {
 
-    private final String columnWorldId;
+    private final String columnWorldId = "id";
-    private final String columnWorldName;
+    private final String columnWorldName = "world_name";
-    private final String columnServerID; //TODO
+    private final String columnServerID = "server_id";
+
+    public final String statementSelectID;
 
     /**
      * Constructor.
@@ -35,9 +37,7 @@ public class WorldTable extends Table {
      */
     public WorldTable(SQLDB db, boolean usingMySQL) {
         super("plan_worlds", db, usingMySQL);
-        columnWorldId = "world_id";
+        statementSelectID = "(SELECT " + columnWorldId + " FROM " + tableName + " WHERE (" + columnWorldName + "=?))";
-        columnWorldName = "world_name";
-        columnServerID = "server_id";
     }
 
     @Override

Plan/src/main/java/com/djrapitops/plan/database/tables/WorldTimesTable.java

@@ -3,6 +3,7 @@ package main.java.com.djrapitops.plan.database.tables;
 import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.data.Session;
+import main.java.com.djrapitops.plan.data.time.GMTimes;
 import main.java.com.djrapitops.plan.data.time.WorldTimes;
 import main.java.com.djrapitops.plan.database.databases.SQLDB;
 import main.java.com.djrapitops.plan.database.sql.Sql;
@@ -11,7 +12,9 @@ import main.java.com.djrapitops.plan.database.sql.TableSqlParser;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Table class representing database table plan_world_times.
@@ -21,17 +24,15 @@ import java.util.*;
  */
 public class WorldTimesTable extends UserIDTable {
 
-    private final String columnServerID = "server_id"; //TODO
+    private final String columnSessionID = "session_id";
-    private final WorldTable worldTable;
-    private final String worldIDColumn;
-    private final String worldNameColumn;
-
     private final String columnWorldId = "world_id";
-    @Deprecated
+    private final String columnSurvival = "survival_time";
-    private final String columnPlaytime = "playtime";
+    private final String columnCreative = "creative_time";
-    //TODO GM Times to World table
+    private final String columnAdventure = "adventure_time";
+    private final String columnSpectator = "spectator_time";
 
-    private final String selectWorldIDsql;
+    private final WorldTable worldTable;
+    private final SessionsTable sessionsTable;
 
     /**
      * Constructor.
@@ -42,22 +43,23 @@ public class WorldTimesTable extends UserIDTable {
     public WorldTimesTable(SQLDB db, boolean usingMySQL) {
         super("plan_world_times", db, usingMySQL);
         worldTable = db.getWorldTable();
-        worldIDColumn = worldTable + "." + worldTable.getColumnID();
+        sessionsTable = db.getSessionsTable();
-        worldNameColumn = worldTable.getColumnWorldName();
-
-        selectWorldIDsql = "(SELECT " + worldIDColumn + " FROM " + worldTable + " WHERE (" + worldNameColumn + "=?))";
     }
 
     @Override
     public boolean createTable() {
-        UsersTable usersTable = db.getUsersTable();
         try {
             execute(TableSqlParser.createTable(tableName)
                     .column(columnUserID, Sql.INT).notNull()
                     .column(columnWorldId, Sql.INT).notNull()
-                    .column(columnPlaytime, Sql.LONG).notNull()
+                    .column(columnSessionID, Sql.LONG).notNull()
+                    .column(columnSurvival, Sql.LONG).notNull().defaultValue("0")
+                    .column(columnCreative, Sql.LONG).notNull().defaultValue("0")
+                    .column(columnAdventure, Sql.LONG).notNull().defaultValue("0")
+                    .column(columnSpectator, Sql.LONG).notNull().defaultValue("0")
                     .foreignKey(columnUserID, usersTable.getTableName(), usersTable.getColumnID())
                     .foreignKey(columnWorldId, worldTable.getTableName(), worldTable.getColumnID())
+                    .foreignKey(columnSessionID, sessionsTable.getTableName(), sessionsTable.getColumnID())
                     .toString()
             );
             return true;
@@ -71,253 +73,81 @@ public class WorldTimesTable extends UserIDTable {
         return super.removeDataOf(userId);
     }
 
-    /**
+    public void saveWorldTimes(UUID uuid, long sessionID, WorldTimes worldTimes) throws SQLException {
-     * @param userId
+        if (Verify.isEmpty(worldTimes.getWorldTimes())) {
-     * @return
+            return;
-     * @throws SQLException
+        }
-     */
-    public Map<String, Long> getWorldTimes(int userId) throws SQLException {
         PreparedStatement statement = null;
-        ResultSet set = null;
         try {
-            statement = prepareStatement("SELECT "
+            statement = prepareStatement("INSERT INTO " + tableName + " (" +
-                    + columnPlaytime + ", "
+                    columnUserID + ", " +
-                    + worldNameColumn
+                    columnWorldId + ", " +
-                    + " FROM " + tableName + ", " + worldTable
+                    columnSessionID + ", " +
-                    + " WHERE (" + columnUserID + "=?)"
+                    columnSurvival + ", " +
-                    + " AND (" + worldIDColumn + "=" + tableName + "." + columnWorldId + ")");
+                    columnCreative + ", " +
-            statement.setInt(1, userId);
+                    columnAdventure + ", " +
-            set = statement.executeQuery();
+                    columnSpectator +
-            HashMap<String, Long> times = new HashMap<>();
+                    ") VALUES (" +
-            while (set.next()) {
+                    usersTable.statementSelectID + ", " +
-                times.put(set.getString(worldNameColumn), set.getLong(columnPlaytime));
+                    worldTable.statementSelectID + ", " +
+                    "?, ?, ?, ?, ?)");
+            for (Map.Entry<String, GMTimes> entry : worldTimes.getWorldTimes().entrySet()) {
+                String worldName = entry.getKey();
+                GMTimes gmTimes = entry.getValue();
+                statement.setString(1, uuid.toString());
+                statement.setString(2, worldName);
+                statement.setLong(3, sessionID);
+
+                String[] gms = GMTimes.getGMKeyArray();
+                statement.setLong(4, gmTimes.getTime(gms[0]));
+                statement.setLong(5, gmTimes.getTime(gms[1]));
+                statement.setLong(6, gmTimes.getTime(gms[2]));
+                statement.setLong(7, gmTimes.getTime(gms[3]));
+                statement.addBatch();
             }
-            return times;
+            statement.executeBatch();
         } finally {
-            close(set);
             close(statement);
         }
     }
 
-    public Map<Integer, Map<String, Long>> getWorldTimes(Collection<Integer> userIds) throws SQLException {
+    public void addWorldTimesToSessions(UUID uuid, Map<Long, Session> sessions) throws SQLException {
         PreparedStatement statement = null;
         ResultSet set = null;
-        Map<Integer, Map<String, Long>> times = new HashMap<>();
-        for (Integer id : userIds) {
-            times.put(id, new HashMap<>());
-        }
         try {
-            statement = prepareStatement("SELECT "
+            String worldIDColumn = worldTable + "." + worldTable.getColumnID();
-                    + columnUserID + ", "
+            String worldNameColumn = worldTable + "." + worldTable.getColumnWorldName() + " as world_name";
-                    + columnPlaytime + ", "
+            statement = prepareStatement("SELECT " +
-                    + worldNameColumn
+                    columnSessionID + ", " +
-                    + " FROM " + tableName + ", " + worldTable
+                    columnSurvival + ", " +
-                    + " WHERE (" + worldIDColumn + "=" + tableName + "." + columnWorldId + ")");
+                    columnCreative + ", " +
+                    columnAdventure + ", " +
+                    columnSpectator + ", " +
+                    worldNameColumn +
+                    " FROM " + tableName +
+                    " WHERE " + columnUserID + "=" + usersTable.statementSelectID +
+                    " JOIN " + worldTable + " on " + worldIDColumn + "=" + columnWorldId // TODO TEST
+            );
+            statement.setString(1, uuid.toString());
             set = statement.executeQuery();
+            String[] gms = GMTimes.getGMKeyArray();
             while (set.next()) {
-                int id = set.getInt(columnUserID);
+                long sessionID = set.getLong(columnSessionID);
-                if (!userIds.contains(id)) {
+                Session session = sessions.get(sessionID);
+                if (session == null) {
                     continue;
                 }
-                Map<String, Long> worldTimes = times.get(id);
+                String worldName = set.getString("world_name");
-                worldTimes.put(set.getString(worldNameColumn), set.getLong(columnPlaytime));
+                Map<String, Long> gmMap = new HashMap<>();
-            }
+                gmMap.put(gms[0], set.getLong(columnSurvival));
-            return times;
+                gmMap.put(gms[1], set.getLong(columnCreative));
-        } finally {
+                gmMap.put(gms[2], set.getLong(columnAdventure));
-            close(set);
+                gmMap.put(gms[3], set.getLong(columnSpectator));
-            close(statement);
+                GMTimes gmTimes = new GMTimes(gmMap);
-        }
+                session.getWorldTimes().setGMTimesForWorld(worldName, gmTimes);
-    }
-
-    public void saveWorldTimes(int userId, Map<String, Long> worldTimes) throws SQLException {
-        if (Verify.isEmpty(worldTimes)) {
-            return;
-        }
-        Map<String, Long> saved = getWorldTimes(userId);
-
-        Map<String, Long> newData = new HashMap<>();
-        Map<String, Long> updateData = new HashMap<>();
-
-        for (Map.Entry<String, Long> entry : worldTimes.entrySet()) {
-            String world = entry.getKey();
-            long time = entry.getValue();
-            Long savedTime = saved.get(world);
-
-            if (savedTime == null) {
-                newData.put(world, time);
-            } else {
-                if (savedTime < time) {
-                    updateData.put(world, time);
-                }
-            }
-        }
-        insertWorlds(userId, newData);
-        updateWorlds(userId, updateData);
-    }
-
-    private void updateWorlds(int userId, Map<String, Long> updateData) throws SQLException {
-        if (Verify.isEmpty(updateData)) {
-            return;
-        }
-        PreparedStatement statement = null;
-        try {
-            statement = prepareStatement(
-                    "UPDATE " + tableName + " SET " + columnPlaytime + "=?" +
-                            " WHERE (" + selectWorldIDsql + "=" + columnWorldId + ")" +
-                            " AND (" + columnUserID + "=?)"
-            );
-            boolean commitRequired = false;
-            for (Map.Entry<String, Long> entry : updateData.entrySet()) {
-                String worldName = entry.getKey();
-                long time = entry.getValue();
-                statement.setLong(1, time);
-                statement.setString(2, worldName);
-                statement.setInt(3, userId);
-                statement.addBatch();
-                commitRequired = true;
-            }
-            if (commitRequired) {
-                statement.executeBatch();
             }
         } finally {
-            close(statement);
+            close(set, statement);
         }
     }
-
-    private void insertWorlds(int userId, Map<String, Long> newData) throws SQLException {
-        if (Verify.isEmpty(newData)) {
-            return;
-        }
-        PreparedStatement statement = null;
-        try {
-            statement = prepareStatement(
-                    "INSERT INTO " + tableName + " ("
-                            + columnUserID + ", "
-                            + columnWorldId + ", "
-                            + columnPlaytime
-                            + ") VALUES (?, " + selectWorldIDsql + ", ?)"
-            );
-            boolean commitRequired = false;
-            for (Map.Entry<String, Long> entry : newData.entrySet()) {
-                String worldName = entry.getKey();
-                long time = entry.getValue();
-                statement.setInt(1, userId);
-                statement.setString(2, worldName);
-                statement.setLong(3, time);
-                statement.addBatch();
-                commitRequired = true;
-            }
-            if (commitRequired) {
-                statement.executeBatch();
-            }
-        } finally {
-            close(statement);
-        }
-    }
-
-    public void saveWorldTimes(Map<Integer, Map<String, Long>> worldTimesMultiple) throws SQLException {
-        if (Verify.isEmpty(worldTimesMultiple)) {
-            return;
-        }
-        Map<Integer, Map<String, Long>> saved = getWorldTimes(worldTimesMultiple.keySet());
-
-        Map<Integer, Map<String, Long>> newData = new HashMap<>();
-        Map<Integer, Map<String, Long>> updateData = new HashMap<>();
-
-        for (Map.Entry<Integer, Map<String, Long>> entry : worldTimesMultiple.entrySet()) {
-            int userId = entry.getKey();
-            Map<String, Long> savedTimes = saved.get(userId);
-            Map<String, Long> worldTimes = entry.getValue();
-            Map<String, Long> newTimes = new HashMap<>(worldTimes);
-            newTimes.keySet().removeAll(savedTimes.keySet());
-
-            newData.put(userId, newTimes);
-
-            for (Map.Entry<String, Long> times : savedTimes.entrySet()) {
-                String world = times.getKey();
-                long savedTime = times.getValue();
-                Long toSave = worldTimes.get(world);
-                if (toSave != null && toSave <= savedTime) {
-                    worldTimes.remove(world);
-                }
-            }
-            updateData.put(userId, worldTimes);
-        }
-        insertWorlds(newData);
-        updateWorlds(updateData);
-    }
-
-    private void updateWorlds(Map<Integer, Map<String, Long>> updateData) throws SQLException {
-        if (Verify.isEmpty(updateData)) {
-            return;
-        }
-        PreparedStatement statement = null;
-        try {
-            statement = prepareStatement(
-                    "UPDATE " + tableName + " SET " + columnPlaytime + "=?" +
-                            " WHERE (" + selectWorldIDsql + "=" + columnWorldId + ")" +
-                            " AND (" + columnUserID + "=?)"
-            );
-            boolean commitRequired = false;
-            for (Map.Entry<Integer, Map<String, Long>> entry : updateData.entrySet()) {
-                int userId = entry.getKey();
-                for (Map.Entry<String, Long> times : entry.getValue().entrySet()) {
-                    String worldName = times.getKey();
-                    long time = times.getValue();
-                    statement.setLong(1, time);
-                    statement.setString(2, worldName);
-                    statement.setInt(3, userId);
-                    statement.addBatch();
-                    commitRequired = true;
-                }
-            }
-            if (commitRequired) {
-                statement.executeBatch();
-            }
-        } finally {
-            close(statement);
-        }
-    }
-
-    private void insertWorlds(Map<Integer, Map<String, Long>> newData) throws SQLException {
-        if (Verify.isEmpty(newData)) {
-            return;
-        }
-        PreparedStatement statement = null;
-        try {
-            statement = prepareStatement(
-                    "INSERT INTO " + tableName + " ("
-                            + columnUserID + ", "
-                            + columnWorldId + ", "
-                            + columnPlaytime
-                            + ") VALUES (?, " + selectWorldIDsql + ", ?)"
-            );
-            boolean commitRequired = false;
-            for (Map.Entry<Integer, Map<String, Long>> entry : newData.entrySet()) {
-                int userId = entry.getKey();
-                for (Map.Entry<String, Long> times : entry.getValue().entrySet()) {
-                    String worldName = times.getKey();
-                    long time = times.getValue();
-                    statement.setInt(1, userId);
-                    statement.setString(2, worldName);
-                    statement.setLong(3, time);
-                    statement.addBatch();
-                    commitRequired = true;
-                }
-            }
-            if (commitRequired) {
-                statement.executeBatch();
-            }
-        } finally {
-            close(statement);
-        }
-    }
-
-    public void saveWorldTimes(long sessionID, WorldTimes worldTimes) {
-        // TODO saveWorldTimes (INSERT)
-    }
-
-    public void addWorldTimesToSessions(UUID uuid, List<Session> allSessions) {
-        // TODO saveWorldTimes
-    }
 }