Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-04 09:27:27 +02:00
Code Issues Projects Releases Wiki Activity

Removed UserInfoTable#getUserInfo - not used

Browse Source
This commit is contained in:
Rsl1122 2019-02-01 10:54:53 +02:00
parent b0170b76af
commit 44bc2c01fa
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UserInfoTable.java
View File

@ -63,11 +63,8 @@ public class UserInfoTable extends Table {
OP +
") VALUES (?, ?, ?, ?, ?)";
private final UsersTable usersTable;
public UserInfoTable(SQLDB db) {
super(TABLE_NAME, db);
usersTable = db.getUsersTable();
}
public static String createTableSQL(DBType dbType) {
@ -95,7 +92,7 @@ public class UserInfoTable extends Table {
}
public boolean isRegistered(UUID uuid, UUID serverUUID) {
String sql = Select.from(tableName, "COUNT(" + USER_UUID + ") as c")
String sql = Select.from(TABLE_NAME, "COUNT(" + USER_UUID + ") as c")
.where(USER_UUID + "=?")
.and(SERVER_UUID + "=?")
.toString();
@ -119,7 +116,7 @@ public class UserInfoTable extends Table {
}
public void updateOpStatus(UUID uuid, boolean op) {
String sql = Update.values(tableName, OP)
String sql = Update.values(TABLE_NAME, OP)
.where(USER_UUID + "=?")
.toString();
@ -133,7 +130,7 @@ public class UserInfoTable extends Table {
}
public void updateBanStatus(UUID uuid, boolean banned) {
String sql = Update.values(tableName, BANNED)
String sql = Update.values(TABLE_NAME, BANNED)
.where(USER_UUID + "=?")
.toString();
@ -147,18 +144,18 @@ public class UserInfoTable extends Table {
}
public Map<UUID, UserInfo> getAllUserInfo(UUID uuid) {
String usersUUIDColumn = usersTable + "." + UsersTable.USER_UUID;
String usersNameColumn = usersTable + "." + UsersTable.USER_NAME + " as name";
String usersUUIDColumn = UsersTable.TABLE_NAME + "." + UsersTable.USER_UUID;
String usersNameColumn = UsersTable.TABLE_NAME + "." + UsersTable.USER_NAME + " as name";
String sql = "SELECT " +
tableName + "." + REGISTERED + ", " +
TABLE_NAME + "." + REGISTERED + ", " +
BANNED + ", " +
OP + ", " +
usersNameColumn + ", " +
SERVER_UUID +
" FROM " + tableName +
" INNER JOIN " + usersTable + " on " + usersUUIDColumn + "=" + tableName + "." + USER_UUID +
" WHERE " + tableName + "." + USER_UUID + "=?";
" FROM " + TABLE_NAME +
" INNER JOIN " + UsersTable.TABLE_NAME + " on " + usersUUIDColumn + "=" + TABLE_NAME + "." + USER_UUID +
" WHERE " + TABLE_NAME + "." + USER_UUID + "=?";
return query(new QueryStatement<Map<UUID, UserInfo>>(sql) {
@Override
@ -183,22 +180,18 @@ public class UserInfoTable extends Table {
});
}
public UserInfo getUserInfo(UUID uuid) {
return getAllUserInfo(uuid).get(getServerUUID());
}
public List<UserInfo> getServerUserInfo(UUID serverUUID) {
String usersUUIDColumn = usersTable + "." + UsersTable.USER_UUID;
String usersNameColumn = usersTable + "." + UsersTable.USER_NAME + " as name";
String usersUUIDColumn = UsersTable.TABLE_NAME + "." + UsersTable.USER_UUID;
String usersNameColumn = UsersTable.TABLE_NAME + "." + UsersTable.USER_NAME + " as name";
String sql = "SELECT " +
tableName + "." + REGISTERED + ", " +
TABLE_NAME + "." + REGISTERED + ", " +
BANNED + ", " +
OP + ", " +
usersNameColumn + ", " +
tableName + "." + USER_UUID +
" FROM " + tableName +
" INNER JOIN " + usersTable + " on " + usersUUIDColumn + "=" + tableName + "." + USER_UUID +
TABLE_NAME + "." + USER_UUID +
" FROM " + TABLE_NAME +
" INNER JOIN " + UsersTable.TABLE_NAME + " on " + usersUUIDColumn + "=" + TABLE_NAME + "." + USER_UUID +
" WHERE " + SERVER_UUID + "=?";
return query(new QueryStatement<List<UserInfo>>(sql, 20000) {
@ -241,7 +234,7 @@ public class UserInfoTable extends Table {
}
public Set<UUID> getSavedUUIDs(UUID serverUUID) {
String sql = "SELECT " + USER_UUID + " FROM " + tableName + " WHERE " + SERVER_UUID + "=?";
String sql = "SELECT " + USER_UUID + " FROM " + TABLE_NAME + " WHERE " + SERVER_UUID + "=?";
return query(new QueryStatement<Set<UUID>>(sql, 50000) {
@Override

8
Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
View File

@ -412,7 +412,7 @@ public abstract class CommonDBTest {
assertTrue(usersTable.isRegistered(playerUUID));
assertTrue(userInfoTable.isRegistered(playerUUID));
UserInfo userInfo = userInfoTable.getUserInfo(playerUUID);
UserInfo userInfo = userInfoTable.getAllUserInfo(playerUUID).get(serverUUID);
assertEquals(playerUUID, userInfo.getUuid());
assertEquals(123456789L, (long) usersTable.getRegisterDates().get(0));
assertEquals(223456789L, userInfo.getRegistered());
@ -435,7 +435,7 @@ public abstract class CommonDBTest {
userInfoTable.updateBanStatus(playerUUID, true);
commitTest();
UserInfo userInfo = userInfoTable.getUserInfo(playerUUID);
UserInfo userInfo = userInfoTable.getAllUserInfo(playerUUID).get(serverUUID);
assertTrue(userInfo.isBanned());
assertTrue(userInfo.isOperator());
@ -443,7 +443,7 @@ public abstract class CommonDBTest {
userInfoTable.updateBanStatus(playerUUID, true);
commitTest();
userInfo = userInfoTable.getUserInfo(playerUUID);
userInfo = userInfoTable.getAllUserInfo(playerUUID).get(serverUUID);
assertTrue(userInfo.isBanned());
assertFalse(userInfo.isOperator());
@ -452,7 +452,7 @@ public abstract class CommonDBTest {
userInfoTable.updateBanStatus(playerUUID, false);
commitTest();
userInfo = userInfoTable.getUserInfo(playerUUID);
userInfo = userInfoTable.getAllUserInfo(playerUUID).get(serverUUID);
assertFalse(userInfo.isBanned());
assertTrue(userInfo.isOperator());