Select rows for ban status before batch update

Affects issues:
- Fixed #4624

Author: AuroraLS3

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/Transaction.java

@@ -105,7 +105,7 @@ private void manageFailure(SQLException statementFail) {
         boolean deadlocked = mySQLDeadlock || statementFail instanceof SQLTransactionRollbackException;
         boolean lockWaitTimeout = errorCode == 1205;
         boolean duplicateEntry = errorCode == 1062;
-        if (mysqlOutdatedRead || deadlocked || duplicateEntry || lockWaitTimeout && attempts < ATTEMPT_LIMIT) {
+        if (attempts < ATTEMPT_LIMIT && (mysqlOutdatedRead || deadlocked || duplicateEntry || lockWaitTimeout)) {
             executeTransaction(db); // Recurse to attempt again.
             return;
         }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/BatchBanStatusTransaction.java

@@ -17,6 +17,7 @@
 package com.djrapitops.plan.storage.database.transactions.events;
 
 import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.storage.database.DBType;
 import com.djrapitops.plan.storage.database.sql.building.Update;
 import com.djrapitops.plan.storage.database.sql.tables.ServerTable;
 import com.djrapitops.plan.storage.database.sql.tables.UserInfoTable;
@@ -30,6 +31,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import static com.djrapitops.plan.storage.database.sql.building.Sql.*;
+
 /**
  * Transaction to update a player's ban status.
  *
@@ -53,6 +56,20 @@ protected void performOperations() {
     }
 
     private Executable updateBanStatus() {
+        if (dbType == DBType.MYSQL) {
+            String selectUserIds = SELECT + UsersTable.ID +
+                    FROM + UsersTable.TABLE_NAME +
+                    WHERE + UsersTable.USER_UUID + " IN (" + nParameters(bannedPlayerUUIDs.size() + unbannedPlayerUUIDs.size()) + ")";
+            List<Integer> userIds = query(db -> db.queryList(selectUserIds, set -> set.getInt(UsersTable.ID), bannedPlayerUUIDs, unbannedPlayerUUIDs));
+
+            String selectRowsToLock = SELECT + UserInfoTable.ID +
+                    FROM + UserInfoTable.TABLE_NAME +
+                    WHERE + UserInfoTable.USER_ID + " IN (" + nParameters(userIds.size()) + ")" +
+                    AND + UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
+                    lockForUpdate();
+            query(db -> db.queryList(selectRowsToLock, set -> set.getInt(UserInfoTable.ID), userIds, serverUUID));
+        }
+
         String sql = Update.values(UserInfoTable.TABLE_NAME, UserInfoTable.BANNED)
                 .where(UserInfoTable.USER_ID + "=" + UsersTable.SELECT_USER_ID)
                 .and(UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID)

Plan/common/src/test/java/com/djrapitops/plan/storage/database/queries/UserInfoQueriesTest.java

@@ -49,7 +49,6 @@ default void userInfoTableStoresCorrectUserInformation() {
         assertEquals(expected, userInfo);
     }
 
-
     @Test
     default void userInfoTableUpdatesBanStatus() {
         db().executeTransaction(new StoreServerPlayerTransaction(playerUUID, () -> TestConstants.REGISTER_TIME,
@@ -63,6 +62,19 @@ default void userInfoTableUpdatesBanStatus() {
         assertEquals(expected, userInfo);
     }
 
+    @Test
+    default void userInfoTableUpdatesBanStatusBatch() {
+        db().executeTransaction(new StoreServerPlayerTransaction(playerUUID, () -> TestConstants.REGISTER_TIME,
+                TestConstants.PLAYER_ONE_NAME, serverUUID(), TestConstants.GET_PLAYER_HOSTNAME));
+
+        db().executeTransaction(new BatchBanStatusTransaction(List.of(playerUUID), List.of(), serverUUID()));
+
+        Set<UserInfo> userInfo = db().query(UserInfoQueries.fetchUserInformationOfUser(playerUUID));
+        Set<UserInfo> expected = Collections.singleton(new UserInfo(playerUUID, serverUUID(), TestConstants.REGISTER_TIME, false, TestConstants.GET_PLAYER_HOSTNAME.get(), true));
+
+        assertEquals(expected, userInfo);
+    }
+
     @Test
     default void userInfoTableUpdatesOperatorStatus() {
         db().executeTransaction(new StoreServerPlayerTransaction(playerUUID, () -> TestConstants.REGISTER_TIME,