From 8f1b35d4d5a46061570f5bd50576763065c0da9d Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sun, 20 Jan 2019 11:36:34 +0200
Subject: [PATCH] Removed KillsTable#getPlayerKills

---
 .../plan/db/sql/tables/KillsTable.java        | 37 ++-----------------
 .../com/djrapitops/plan/db/CommonDBTest.java  | 12 ++++--
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
index 4cbfc0bbc..f0028c332 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
@@ -23,7 +23,6 @@ import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.ExecStatement;
-import com.djrapitops.plan.db.access.QueryAllStatement;
 import com.djrapitops.plan.db.access.QueryStatement;
 import com.djrapitops.plan.db.patches.KillsOptimizationPatch;
 import com.djrapitops.plan.db.patches.KillsServerIDPatch;
@@ -37,7 +36,9 @@ import com.djrapitops.plugin.utilities.Verify;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Table that is in charge of storing kill data for each session.
@@ -209,38 +210,6 @@ public class KillsTable extends UserUUIDTable {
         });
     }
 
-    public Map<UUID, List<PlayerKill>> getPlayerKills() {
-        String usersVictimUUIDColumn = usersTable + "." + UsersTable.Col.UUID;
-        String usersVictimNameColumn = usersTable + "." + UsersTable.Col.USER_NAME + " as victim_name";
-        String sql = "SELECT " +
-                Col.DATE + ", " +
-                Col.WEAPON + ", " +
-                Col.VICTIM_UUID + ", " +
-                usersVictimNameColumn + ", " +
-                Col.KILLER_UUID +
-                " FROM " + tableName +
-                " INNER JOIN " + usersTable + " on " + usersVictimUUIDColumn + "=" + Col.VICTIM_UUID;
-
-        return query(new QueryAllStatement<Map<UUID, List<PlayerKill>>>(sql, 50000) {
-            @Override
-            public Map<UUID, List<PlayerKill>> processResults(ResultSet set) throws SQLException {
-                Map<UUID, List<PlayerKill>> allKills = new HashMap<>();
-                while (set.next()) {
-                    UUID killer = UUID.fromString(set.getString(Col.KILLER_UUID.get()));
-                    UUID victim = UUID.fromString(set.getString(Col.VICTIM_UUID.get()));
-                    String victimName = set.getString("victim_name");
-                    long date = set.getLong(Col.DATE.get());
-                    String weapon = set.getString(Col.WEAPON.get());
-
-                    List<PlayerKill> kills = allKills.getOrDefault(killer, new ArrayList<>());
-                    kills.add(new PlayerKill(victim, weapon, date, victimName));
-                    allKills.put(killer, kills);
-                }
-                return allKills;
-            }
-        });
-    }
-
     public void addKillsToSessions(Map<UUID, Map<UUID, List<Session>>> map) {
         Map<Integer, List<PlayerKill>> playerKillsBySessionID = db.query(LargeFetchQueries.fetchAllPlayerKillsBySessionID());
         for (UUID serverUUID : map.keySet()) {
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
index 47293a1a2..59301e7c1 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
@@ -682,9 +682,15 @@ public abstract class CommonDBTest {
 
         commitTest();
 
-        Map<UUID, List<PlayerKill>> playerKills = db.getKillsTable().getPlayerKills();
-        List<PlayerKill> kills = playerKills.get(playerUUID);
-        assertFalse(playerKills.isEmpty());
+        Map<UUID, List<Session>> sessions = db.getSessionsTable().getSessions(playerUUID);
+        List<Session> savedSessions = sessions.get(playerUUID);
+        assertNotNull(savedSessions);
+        assertFalse(savedSessions.isEmpty());
+
+        Session savedSession = savedSessions.get(0);
+        assertNotNull(savedSession);
+
+        List<PlayerKill> kills = savedSession.getPlayerKills();
         assertNotNull(kills);
         assertFalse(kills.isEmpty());
         assertEquals(expected, kills);