Abstract reset method to work on MySQL too

darbyjack · Sep 5, 2021 · cff96c6 · cff96c6
1 parent 524657c
commit cff96c6
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 32 deletions.
diff --git a/src/main/kotlin/me/clip/voteparty/data/base/DatabaseVotePlayer.kt b/src/main/kotlin/me/clip/voteparty/data/base/DatabaseVotePlayer.kt
@@ -7,25 +7,27 @@ import java.util.UUID
 
 internal interface DatabaseVotePlayer : Addon, State
 {
-	
+
 	override fun load()
-	
+
 	override fun kill()
-	
-	
+
+
 	fun load(uuid: UUID): User?
-	
+
 	fun save(data: User)
-	
-	
+
+
 	fun load(uuid: Collection<UUID>): Map<UUID, User?>
 	{
 		return uuid.associateWith(::load)
 	}
-	
+
 	fun save(data: Collection<User>)
 	{
 		data.forEach(::save)
 	}
-
-}
+
+	fun reset(data: User)
+
+}
diff --git a/src/main/kotlin/me/clip/voteparty/data/impl/DatabaseVotePlayerGson.kt b/src/main/kotlin/me/clip/voteparty/data/impl/DatabaseVotePlayerGson.kt
@@ -10,24 +10,24 @@ import java.util.logging.Level
 
 internal class DatabaseVotePlayerGson(override val plugin: VotePartyPlugin) : DatabaseVotePlayer
 {
-	
+
 	private lateinit var gson: Gson
-	
-	
+
+
 	override fun load()
 	{
 		val builder = GsonBuilder().disableHtmlEscaping().enableComplexMapKeySerialization().setPrettyPrinting().serializeNulls()
 		gson = builder.create()
-		
+
 		plugin.dataFolder.resolve("players").mkdirs()
 	}
-	
+
 	override fun kill()
 	{
-	
+
 	}
-	
-	
+
+
 	override fun load(uuid: UUID): User?
 	{
 		return try
@@ -40,7 +40,7 @@ internal class DatabaseVotePlayerGson(override val plugin: VotePartyPlugin) : Da
 			null
 		}
 	}
-	
+
 	override fun save(data: User)
 	{
 		try
@@ -52,16 +52,21 @@ internal class DatabaseVotePlayerGson(override val plugin: VotePartyPlugin) : Da
 			logger.log(Level.SEVERE, "failed to save player:${data.uuid}", ex)
 		}
 	}
-
+
+	override fun reset(data: User)
+	{
+		data.reset()
+	}
+
 	override fun load(uuid: Collection<UUID>): Map<UUID, User?>
 	{
 		if (uuid.isNotEmpty())
 		{
 			return super.load(uuid)
 		}
-		
+
 		val files = plugin.dataFolder.resolve("players").listFiles() ?: return emptyMap()
-		
+
 		return files.mapNotNull()
 		{
 			try
@@ -74,5 +79,5 @@ internal class DatabaseVotePlayerGson(override val plugin: VotePartyPlugin) : Da
 			}
 		}.associateWith(::load)
 	}
-	
-}
+
+}
diff --git a/src/main/kotlin/me/clip/voteparty/data/impl/DatabaseVotePlayerMySQL.kt b/src/main/kotlin/me/clip/voteparty/data/impl/DatabaseVotePlayerMySQL.kt
@@ -13,11 +13,13 @@ import java.sql.SQLException
 import java.util.UUID
 import java.util.logging.Level
 
-internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : DatabaseVotePlayer {
+internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : DatabaseVotePlayer
+{
 
     private lateinit var database: Database
 
-    override fun load() {
+    override fun load()
+    {
         val sql = party.conf().getProperty(StorageSettings.SQL)
 
         val options = DatabaseOptions.builder()
@@ -30,7 +32,8 @@ internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : D
 
         DB.setGlobalDatabase(database)
 
-        try {
+        try
+        {
             database.executeUpdate(
                 "CREATE TABLE IF NOT EXISTS `voteparty_players` (" +
                         "  `uuid` varchar(255) NOT NULL," +
@@ -48,7 +51,9 @@ internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : D
                         ") ENGINE=InnoDB DEFAULT CHARSET=utf8;"
             )
 
-        } catch (ex: SQLException) {
+        }
+        catch (ex: SQLException)
+        {
             throw RuntimeException("Error while creating database table:", ex)
         }
     }
@@ -58,8 +63,10 @@ internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : D
         DB.close()
     }
 
-    override fun load(uuid: UUID): User? {
-        return try {
+    override fun load(uuid: UUID): User?
+    {
+        return try
+        {
             val row = database.getFirstRow("SELECT name, claimable FROM voteparty_players WHERE uuid = ?", uuid.toString())
             val user = User(uuid, row.getString("name"), mutableListOf(), row.getInt("claimable"))
 
@@ -76,7 +83,8 @@ internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : D
         }
     }
 
-    override fun save(data: User) {
+    override fun save(data: User)
+    {
         database.executeInsert("INSERT INTO voteparty_players (uuid, name, claimable) VALUES(?, ?, ?) ON DUPLICATE " +
                 "KEY UPDATE name = ?, claimable = ?", data.uuid.toString(), data.name, data.claimable, data.name, data.claimable)
 
@@ -85,6 +93,11 @@ internal class DatabaseVotePlayerMySQL(override val plugin: VotePartyPlugin) : D
         }
     }
 
+    override fun reset(data: User)
+    {
+        database.executeUpdate("DELETE FROM voteparty_votes WHERE UUID = ?", data.uuid.toString())
+    }
+
     override fun load(uuid: Collection<UUID>): Map<UUID, User?>
     {
         if (uuid.isNotEmpty())

diff --git a/src/main/kotlin/me/clip/voteparty/user/UsersHandler.kt b/src/main/kotlin/me/clip/voteparty/user/UsersHandler.kt
@@ -83,7 +83,7 @@ class UsersHandler(override val plugin: VotePartyPlugin) : Addon, State, Listene
 
 	fun reset(player: OfflinePlayer)
 	{
-		get(player).reset()
+		database.reset(get(player))
 	}
 
 	fun saveAll()