Fix communities queries having the ability to lock the server mysql connections due to nesting, improve RepositoryBase by allowing all the methods to be passed a Connection object to reuse it, and fix duplicate invites throwing an sql error

Plugins/Mineplex.Core/src/mineplex/core/communities/CommunityManager.java

@@ -469,8 +469,11 @@ public class CommunityManager extends MiniDbClientPlugin<CommunityMemberData>
 		runAsync(() ->
 		{
 			if (_repo.deleteInviteToCommunity(community.getId(), target))
+			{
+				if (!community.getMembers().containsKey(sender.getUniqueId()))
 				{
 					UtilPlayer.message(sender, F.main(getName(), "You have revoked " + F.name(target) + "'s invitation to join " + F.name(community.getName()) + "!"));
+				}
 				new CommunityUnInvite(community.getId(), sender.getName(), target, Managers.get(CoreClientManager.class).loadUUIDFromDB(target).toString(), true).publish();
 			}
 			else

Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java

@@ -40,7 +40,7 @@ public class CommunityRepository extends MinecraftRepository
 	private static final String ADD_TO_COMMUNITY = "INSERT INTO communityMembers (accountId, communityId, communityRole, readingChat) VALUES (?, ?, ?, true);";
 	private static final String UPDATE_COMMUNITY_SETTING = "INSERT INTO communitySettings (settingId, communityId, settingValue) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE settingValue=VALUES(settingValue);";
 	private static final String UPDATE_COMMUNITY_NAME = "UPDATE communities SET name=? WHERE id=?;";
-	private static final String INVITE_TO_COMMUNITY = "INSERT INTO communityInvites (accountId, communityId) SELECT a.id AS accountId, ? FROM accounts as a WHERE a.name = ? ORDER BY a.lastLogin DESC LIMIT 1;";
+	private static final String INVITE_TO_COMMUNITY = "INSERT INTO communityInvites (accountId, communityId) SELECT a.id AS accountId, ? FROM accounts as a WHERE a.name = ? ORDER BY a.lastLogin DESC LIMIT 1 ON DUPLICATE KEY UPDATE communityInvites.id=communityInvites.id;";
 	private static final String DELETE_INVITE_TO_COMMUNITY = "DELETE i FROM communityInvites AS i INNER JOIN accounts as a ON i.accountId = a.id WHERE a.name = ? AND i.communityId=?;";
 	private static final String ADD_JOIN_REQUEST = "INSERT INTO communityJoinRequests (accountId, communityId) VALUES (?, ?);";
 	private static final String REMOVE_JOIN_REQUEST = "DELETE FROM communityJoinRequests WHERE accountId=? AND communityId=?;";
@@ -62,14 +62,16 @@ public class CommunityRepository extends MinecraftRepository
 	
 	public void loadCommunity(int communityId, final Map<Integer, Community> communityMap)
 	{
-		executeQuery(GET_COMMUNITY_BY_ID, resultSet ->
+		try (Connection connection = getConnection())
+		{
+			executeQuery(connection, GET_COMMUNITY_BY_ID, resultSet ->
 			{
 				if (resultSet.next())
 				{
 					final int id = resultSet.getInt("id");
 					final String cName = resultSet.getString("name");
 					final Community community = new Community(id, cName);
-				executeQuery(GET_COMMUNITY_MEMBERS, memberSet ->
+					executeQuery(connection, GET_COMMUNITY_MEMBERS, memberSet ->
 					{
 						while (memberSet.next())
 						{
@@ -93,7 +95,7 @@ public class CommunityRepository extends MinecraftRepository
 						}
 					}, new ColumnInt("communityId", community.getId()));
 
-				executeQuery(GET_COMMUNITY_JOIN_REQUESTS, requestSet ->
+					executeQuery(connection, GET_COMMUNITY_JOIN_REQUESTS, requestSet ->
 					{
 						while (requestSet.next())
 						{
@@ -105,7 +107,7 @@ public class CommunityRepository extends MinecraftRepository
 						}
 					}, new ColumnInt("communityId", community.getId()));
 
-				executeQuery(GET_COMMUNITY_SETTINGS, settingSet ->
+					executeQuery(connection, GET_COMMUNITY_SETTINGS, settingSet ->
 					{
 						while (settingSet.next())
 						{
@@ -124,10 +126,17 @@ public class CommunityRepository extends MinecraftRepository
 				}
 			}, new ColumnInt("id", communityId));
 		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
+	}
 	
 	public void loadCommunities(final Map<Integer, Community> communityMap)
 	{
-		executeQuery(GET_ALL_COMMUNITIES, resultSet ->
+		try (Connection connection = getConnection())
+		{
+			executeQuery(connection, GET_ALL_COMMUNITIES, resultSet ->
 			{
 				Map<Integer, Community> resultant = new HashMap<>();
 				while (resultSet.next())
@@ -135,7 +144,7 @@ public class CommunityRepository extends MinecraftRepository
 					final int id = resultSet.getInt("id");
 					final String cName = resultSet.getString("name");
 					final Community community = new Community(id, cName);
-				executeQuery(GET_COMMUNITY_MEMBERS, memberSet ->
+					executeQuery(connection, GET_COMMUNITY_MEMBERS, memberSet ->
 					{
 						while (memberSet.next())
 						{
@@ -159,7 +168,7 @@ public class CommunityRepository extends MinecraftRepository
 						}
 					}, new ColumnInt("communityId", community.getId()));
 
-				executeQuery(GET_COMMUNITY_JOIN_REQUESTS, requestSet ->
+					executeQuery(connection, GET_COMMUNITY_JOIN_REQUESTS, requestSet ->
 					{
 						while (requestSet.next())
 						{
@@ -171,7 +180,7 @@ public class CommunityRepository extends MinecraftRepository
 						}
 					}, new ColumnInt("communityId", community.getId()));
 
-				executeQuery(GET_COMMUNITY_SETTINGS, settingSet ->
+					executeQuery(connection, GET_COMMUNITY_SETTINGS, settingSet ->
 					{
 						while (settingSet.next())
 						{
@@ -193,6 +202,11 @@ public class CommunityRepository extends MinecraftRepository
 				communityMap.putAll(resultant);
 			}, new ColumnVarChar("region", 5, _us ? "US" : "EU"));
 		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
+	}
 	
 	public void updateMembersAndJoinRequests(LinkedList<Community> communities)
 	{
@@ -372,12 +386,14 @@ public class CommunityRepository extends MinecraftRepository
 	
 	public void createCommunity(String name, int leaderAccount, Callback<Integer> idCallback)
 	{
-		executeInsert(CREATE_COMMUNITY, resultSet ->
+		try (Connection connection = getConnection())
+		{
+			executeInsert(connection, CREATE_COMMUNITY, resultSet ->
 			{
 				if (resultSet.next())
 				{
 					int id = resultSet.getInt(1);
-				executeUpdate(ADD_TO_COMMUNITY, new ColumnInt("accountId", leaderAccount), new ColumnInt("communityId", id), new ColumnVarChar("communityRole", 20, CommunityRole.LEADER.toString()));
+					executeUpdate(connection, ADD_TO_COMMUNITY, new ColumnInt("accountId", leaderAccount), new ColumnInt("communityId", id), new ColumnVarChar("communityRole", 20, CommunityRole.LEADER.toString()));
 					idCallback.run(id);
 				}
 				else
@@ -386,14 +402,26 @@ public class CommunityRepository extends MinecraftRepository
 				}
 			}, new ColumnVarChar("name", 15, name), new ColumnVarChar("region", 5, _us ? "US" : "EU"));
 		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
+	}
 	
 	public void deleteCommunity(int communityId)
 	{
-		executeUpdate("DELETE FROM communities WHERE id=?;", new ColumnInt("id", communityId));
+		try (Connection connection = getConnection())
-		executeUpdate("DELETE FROM communitySettings WHERE communityId=?;", new ColumnInt("communityId", communityId));
+		{
-		executeUpdate("DELETE FROM communityMembers WHERE communityId=?;", new ColumnInt("communityId", communityId));
+			executeUpdate(connection, "DELETE FROM communities WHERE id=?;", new ColumnInt("id", communityId));
-		executeUpdate("DELETE FROM communityInvites WHERE communityId=?;", new ColumnInt("communityId", communityId));
+			executeUpdate(connection, "DELETE FROM communitySettings WHERE communityId=?;", new ColumnInt("communityId", communityId));
-		executeUpdate("DELETE FROM communityJoinRequests WHERE communityId=?", new ColumnInt("communityId", communityId));
+			executeUpdate(connection, "DELETE FROM communityMembers WHERE communityId=?;", new ColumnInt("communityId", communityId));
+			executeUpdate(connection, "DELETE FROM communityInvites WHERE communityId=?;", new ColumnInt("communityId", communityId));
+			executeUpdate(connection, "DELETE FROM communityJoinRequests WHERE communityId=?", new ColumnInt("communityId", communityId));
+		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+		}
 	}
 	
 	public void setReadingChat(int accountId, int communityId, boolean reading)

Plugins/Mineplex.ServerData/src/mineplex/serverdata/database/RepositoryBase.java

@@ -76,6 +76,11 @@ public abstract class RepositoryBase
 		}
 	}
 	
+	protected int executeUpdate(Connection connection, String query, Column<?>...columns)
+	{
+		return executeInsert(connection, query, null, columns);
+	}
+
 	/**
 	 * Execute a query against the repository.
 	 * @param query - the concatenated query to execute in string form.
@@ -87,13 +92,12 @@ public abstract class RepositoryBase
 		return executeInsert(query, null, columns);
 	}
 	
-	protected int executeInsert(String query, ResultSetCallable callable, Column<?>...columns)
+	protected int executeInsert(Connection connection, String query, ResultSetCallable callable, Column<?>...columns)
 	{
 		int affectedRows = 0;
 		
 		// Automatic resource management for handling/closing objects.
 		try (
-				Connection connection = getConnection();
 				PreparedStatement preparedStatement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS)
 			)
 		{
@@ -121,6 +125,29 @@ public abstract class RepositoryBase
 		return affectedRows;
 	}
 	
+	protected int executeInsert(String query, ResultSetCallable callable, Column<?>...columns)
+	{
+		int affectedRows = 0;
+		
+		// Automatic resource management for handling/closing objects.
+		try (
+				Connection connection = getConnection();
+			)
+		{
+			affectedRows = executeInsert(connection, query, callable, columns);
+		}
+		catch (SQLException exception)
+		{
+			exception.printStackTrace();
+		}
+		catch (Exception exception)
+		{
+			exception.printStackTrace();
+		}
+		
+		return affectedRows;
+	}
+	
 	protected void executeQuery(PreparedStatement statement, ResultSetCallable callable, Column<?>...columns)
 	{
 		try
@@ -148,11 +175,10 @@ public abstract class RepositoryBase
 		}
 	}
 	
-	protected void executeQuery(String query, ResultSetCallable callable, Column<?>...columns)
+	protected void executeQuery(Connection connection, String query, ResultSetCallable callable, Column<?>...columns)
 	{
 		// Automatic resource management for handling/closing objects.
 		try (
-				Connection connection = getConnection();
 				PreparedStatement preparedStatement = connection.prepareStatement(query)
 			)
 		{
@@ -167,4 +193,23 @@ public abstract class RepositoryBase
 			exception.printStackTrace();
 		}
 	}
+	
+	protected void executeQuery(String query, ResultSetCallable callable, Column<?>...columns)
+	{
+		// Automatic resource management for handling/closing objects.
+		try (
+				Connection connection = getConnection();
+			)
+		{
+			executeQuery(connection, query, callable, columns);
+		}
+		catch (SQLException exception)
+		{
+			exception.printStackTrace();
+		}
+		catch (Exception exception)
+		{
+			exception.printStackTrace();
+		}
+	}
 }