Actually made an ID System instead of using Random.

Author: DxsSucuk

pom.xml

@@ -7,7 +7,7 @@
     <groupId>de.ree6</groupId>
     <artifactId>Ree6-SQL</artifactId>
     <description>This is the SQL-Module for Ree6!</description>
-    <version>2.2.4</version>
+    <version>2.2.5</version>
 
     <properties>
         <sonar.organization>ree6-applications</sonar.organization>

src/main/java/de/presti/ree6/sql/SQLWorker.java

@@ -13,6 +13,7 @@
 import de.presti.ree6.sql.entities.stats.Statistics;
 import de.presti.ree6.sql.entities.webhook.*;
 import de.presti.ree6.sql.entities.webhook.base.Webhook;
+import de.presti.ree6.sql.entities.webhook.base.WebhookSocial;
 import de.presti.ree6.sql.util.SettingsManager;
 import io.sentry.Sentry;
 import jakarta.persistence.PersistenceException;
@@ -1712,7 +1713,7 @@ public void addChatProtectorWord(long guildId, String word) {
      */
     public void removeChatProtectorWord(long guildId, String word) {
         Blacklist blacklist =
-                getEntity(new Blacklist(), "FROM Blacklist WHERE guildAndId.guildId = :gid AND guildAndName.name = :word",
+                getEntity(new Blacklist(), "FROM Blacklist WHERE guildAndName.guildId = :gid AND guildAndName.name = :word",
                         Map.of("gid", guildId, "word", word));
 
         // Check if there is no entry for it.
@@ -2220,6 +2221,24 @@ public <R> R updateEntity(R r) {
             }
         }
 
+        // TODO:: Need a better way to handle this.
+        if (r instanceof Punishments punishments) {
+            if (punishments.getId() <= 0) {
+                long maxId = (Long) getEntityList(r, "select max(guildAndId.id) from " + r.getClass().getName(), null, false, 1).get(0);
+                ((Punishments)r).getGuildAndId().setId(maxId + 1);
+            }
+        } else if (r instanceof ScheduledMessage scheduledMessage) {
+            if (scheduledMessage.getId() <= 0) {
+                long maxId = (Long) getEntityList(r, "select max(guildAndId.id) from " + r.getClass().getName(), null, false, 1).get(0);
+                ((ScheduledMessage)r).getGuildAndId().setId(maxId + 1);
+            }
+        } else if (r instanceof WebhookSocial webhookSocial) {
+            if (webhookSocial.getId() <= 0) {
+                long maxId = (Long) getEntityList(r, "select max(guildAndId.id) from " + r.getClass().getName(), null, false, 1).get(0);
+                ((WebhookSocial)r).getGuildAndId().setId(maxId + 1);
+            }
+        }
+
         try (Session session = SQLSession.getSessionFactory().openSession()) {
 
             session.beginTransaction();

src/main/java/de/presti/ree6/sql/entities/webhook/base/WebhookSocial.java

@@ -53,6 +53,17 @@ public WebhookSocial(long guildId, long channelId, long webhookId, String token)
         this.token = token;
     }
 
+    /**
+     * Get the ID of the Webhook.
+     * @return The ID of the Webhook.
+     */
+    public long getId() {
+        if (guildAndId == null)
+            return -1;
+
+        return guildAndId.getId();
+    }
+
     /**
      * Set the GuildID of the Webhook.
      * @param guildId The GuildID of the Webhook.

src/main/java/de/presti/ree6/sql/keys/GuildAndId.java

@@ -38,7 +38,7 @@ public class GuildAndId implements Serializable {
      * @param guildId The Discord Guild ID.
      */
     public GuildAndId(long guildId) {
-        this.id = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE);
+        this.id = -1;
         this.guildId = guildId;
     }
 

src/test/java/Main.java

@@ -1,5 +1,6 @@
 import de.presti.ree6.sql.DatabaseTyp;
 import de.presti.ree6.sql.SQLSession;
+import de.presti.ree6.sql.entities.webhook.WebhookYouTube;
 import de.presti.ree6.sql.util.SQLConfig;
 
 import java.sql.ResultSet;
@@ -31,6 +32,9 @@ public static void main(String[] args) throws SQLException {
             }
         }
 
+        WebhookYouTube hook = new WebhookYouTube(-1, "test", "test", -1, -1, "test");
+        SQLSession.getSqlConnector().getSqlWorker().updateEntity(hook);
+
         SQLSession.getSqlConnector().getSqlWorker().getEntityList(new de.presti.ree6.sql.entities.Warning(), "", null);
         SQLSession.getSqlConnector().getSqlWorker().getEntityList(new de.presti.ree6.sql.entities.Giveaway(), "", null);
         SQLSession.getSqlConnector().getSqlWorker().getEntityList(new de.presti.ree6.sql.entities.roles.AutoRole(), "", null);