Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-26 11:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Removed UsersTable#getTimesKicked - not used

Browse Source
This commit is contained in:
Rsl1122 2019-02-16 11:36:31 +02:00
parent 30bac0f6ca
commit c57021a116
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/PlayerContainerQuery.java
View File

@ -54,7 +54,7 @@ public class PlayerContainerQuery implements Query<PlayerContainer> {
container.putRawData(PlayerKeys.UUID, uuid); container.putRawData(PlayerKeys.UUID, uuid);
Key<BaseUser> baseUserKey = new Key<>(BaseUser.class, "BASE_USER"); Key<BaseUser> baseUserKey = new Key<>(BaseUser.class, "BASE_USER");
container.putSupplier(baseUserKey, () -> db.query(BaseUserQueries.fetchCommonUserInformationOfPlayer(uuid)).orElse(null)); container.putSupplier(baseUserKey, () -> db.query(BaseUserQueries.fetchBaseUserOfPlayer(uuid)).orElse(null));
container.putSupplier(PlayerKeys.REGISTERED, () -> container.getValue(baseUserKey).map(BaseUser::getRegistered).orElse(null)); container.putSupplier(PlayerKeys.REGISTERED, () -> container.getValue(baseUserKey).map(BaseUser::getRegistered).orElse(null));
container.putSupplier(PlayerKeys.NAME, () -> container.getValue(baseUserKey).map(BaseUser::getName).orElse(null)); container.putSupplier(PlayerKeys.NAME, () -> container.getValue(baseUserKey).map(BaseUser::getName).orElse(null));
container.putSupplier(PlayerKeys.KICK_COUNT, () -> container.getValue(baseUserKey).map(BaseUser::getTimesKicked).orElse(null)); container.putSupplier(PlayerKeys.KICK_COUNT, () -> container.getValue(baseUserKey).map(BaseUser::getTimesKicked).orElse(null));

2
Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/BaseUserQueries.java
View File

@ -83,7 +83,7 @@ public class BaseUserQueries {
}; };
} }
public static Query<Optional<BaseUser>> fetchCommonUserInformationOfPlayer(UUID playerUUID) { public static Query<Optional<BaseUser>> fetchBaseUserOfPlayer(UUID playerUUID) {
String sql = Select.all(UsersTable.TABLE_NAME).where(UsersTable.USER_UUID + "=?").toString(); String sql = Select.all(UsersTable.TABLE_NAME).where(UsersTable.USER_UUID + "=?").toString();
return new QueryStatement<Optional<BaseUser>>(sql, 20000) { return new QueryStatement<Optional<BaseUser>>(sql, 20000) {

21
Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/UsersTable.java
View File

@ -65,27 +65,6 @@ public class UsersTable extends Table {
.toString(); .toString();
} }
public int getTimesKicked(UUID uuid) {
String sql = Select.from(tableName, TIMES_KICKED)
.where(USER_UUID + "=?")
.toString();
return query(new QueryStatement<Integer>(sql) {
@Override
public void prepare(PreparedStatement statement) throws SQLException {
statement.setString(1, uuid.toString());
}
@Override
public Integer processResults(ResultSet set) throws SQLException {
if (set.next()) {
return set.getInt(TIMES_KICKED);
}
return 0;
}
});
}
public void kicked(UUID uuid) { public void kicked(UUID uuid) {
String sql = "UPDATE " + tableName + " SET " String sql = "UPDATE " + tableName + " SET "
+ TIMES_KICKED + "=" + TIMES_KICKED + "+ 1" + + TIMES_KICKED + "=" + TIMES_KICKED + "+ 1" +

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

@ -457,7 +457,7 @@ public abstract class CommonDBTest {
public void testUsersTableKickSaving() throws DBInitException { public void testUsersTableKickSaving() throws DBInitException {
saveUserOne(); saveUserOne();
UsersTable usersTable = db.getUsersTable(); UsersTable usersTable = db.getUsersTable();
assertEquals(1, usersTable.getTimesKicked(playerUUID)); OptionalAssert.equals(1, db.query(BaseUserQueries.fetchBaseUserOfPlayer(playerUUID)).map(BaseUser::getTimesKicked));
int random = new Random().nextInt(20); int random = new Random().nextInt(20);
@ -465,7 +465,7 @@ public abstract class CommonDBTest {
usersTable.kicked(playerUUID); usersTable.kicked(playerUUID);
} }
commitTest(); commitTest();
assertEquals(random + 2, usersTable.getTimesKicked(playerUUID)); OptionalAssert.equals(random + 2, db.query(BaseUserQueries.fetchBaseUserOfPlayer(playerUUID)).map(BaseUser::getTimesKicked));
} }
@Test @Test