Cleaning up some stuff.

Author: DxsSucuk

src/main/java/de/presti/ree6/sql/entities/Blacklist.java

@@ -1,5 +1,6 @@
 package de.presti.ree6.sql.entities;
 
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 
 /**
@@ -10,18 +11,10 @@
 public class Blacklist {
 
     /**
-     * The PrimaryKey of the Entity.
+     * The ID of the Entity.
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private int id;
-
-    /**
-     * The ID of the Guild.
-     */
-    @Column(name = "guildId")
-    private long guildId;
+    @EmbeddedId
+    private GuildAndId guildAndId;
 
     /**
      * The blacklisted word.
@@ -42,7 +35,7 @@ public Blacklist() {
      * @param word    the blacklisted word.
      */
     public Blacklist(long guildId, String word) {
-        this.guildId = guildId;
+        guildAndId = new GuildAndId(guildId);
         this.word = word;
     }
 
@@ -52,7 +45,10 @@ public Blacklist(long guildId, String word) {
      * @return {@link String} as GuildID.
      */
     public long getGuildId() {
-        return guildId;
+        if (guildAndId == null)
+            return 0;
+
+        return guildAndId.getGuildId();
     }
 
     /**

src/main/java/de/presti/ree6/sql/entities/Invite.java

@@ -1,5 +1,6 @@
 package de.presti.ree6.sql.entities;
 
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 
 /**
@@ -12,16 +13,8 @@ public class Invite {
     /**
      * The PrimaryKey of the Entity.
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private int id;
-
-    /**
-     * The GuildID of the Invite.
-     */
-    @Column(name = "guildId")
-    long guild;
+    @EmbeddedId
+    GuildAndId guildAndId;
 
     /**
      * The UserID of the Invite.
@@ -56,7 +49,7 @@ public Invite() {
      * @param code   the Code of the Invite.
      */
     public Invite(long guild, long userId, long uses, String code) {
-        this.guild = guild;
+        this.guildAndId = new GuildAndId(guild);
         this.userId = userId;
         this.uses = uses;
         this.code = code;
@@ -68,7 +61,10 @@ public Invite(long guild, long userId, long uses, String code) {
      * @return {@link String} as GuildID.
      */
     public long getGuild() {
-        return guild;
+        if (guildAndId == null)
+            return 0;
+
+        return guildAndId.getGuildId();
     }
 
     /**

src/main/java/de/presti/ree6/sql/entities/Punishments.java

@@ -1,5 +1,6 @@
 package de.presti.ree6.sql.entities;
 
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -18,16 +19,10 @@
 public class Punishments {
 
     /**
-     * The id of the punishment.
+     * Primary key for the entity.
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    long id;
-
-    /**
-     * The guild that it is bound to.
-     */
-    long guildId;
+    @EmbeddedId
+    GuildAndId guildAndId;
 
     /**
      * The required warnings.

src/main/java/de/presti/ree6/sql/entities/ReactionRole.java

@@ -1,6 +1,7 @@
 package de.presti.ree6.sql.entities;
 
 
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -19,18 +20,10 @@
 public class ReactionRole {
 
     /**
-     * The PrimaryKey of the Entity.
+     * The Key of the Entity.
      */
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private long id;
-
-    /**
-     * The ID of the Guild.
-     */
-    @Column(name = "guildId")
-    private long guildId;
+    @EmbeddedId
+    GuildAndId guildAndId;
 
     /**
      * The ID of the Emote used as reaction.
@@ -66,11 +59,13 @@ public class ReactionRole {
      * Constructor for the Reaction role.
      * @param guildId the GuildID.
      * @param emoteId the EmoteId.
+     * @param formattedEmote the formatted Emote.
      * @param roleId the Role ID.
      * @param messageId the Message ID.
      */
     public ReactionRole(long guildId, long emoteId, String formattedEmote, long roleId, long messageId) {
-        this.guildId = guildId;
+        this.guildAndId = new GuildAndId(guildId);
+        this.formattedEmote = formattedEmote;
         this.emoteId = emoteId;
         this.roleId = roleId;
         this.messageId = messageId;

src/main/java/de/presti/ree6/sql/entities/ScheduledMessage.java

@@ -1,6 +1,7 @@
 package de.presti.ree6.sql.entities;
 
 import de.presti.ree6.sql.entities.webhook.WebhookScheduledMessage;
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -20,17 +21,10 @@
 public class ScheduledMessage {
 
     /**
-     * The ID of the entity.
+     * Key of the Entity.
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    long Id;
-
-    /**
-     * The ID of the Guild.
-     */
-    @Column(name = "guild")
-    long guildId;
+    @EmbeddedId
+    GuildAndId guildAndId;
 
     /**
      * Special message content.

src/main/java/de/presti/ree6/sql/entities/StreamAction.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.JsonElement;
 import de.presti.ree6.sql.converter.JsonAttributeConverter;
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,17 +14,10 @@
 public class StreamAction {
 
     /**
-     * The ID of the entity.
+     * The Key of the Entity.
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    long id;
-
-    /**
-     * The ID of the Guild.
-     */
-    @Column(name = "guildId")
-    long guildId;
+    @EmbeddedId
+    GuildAndId guildAndId;
 
     /**
      * The name of the action.

src/main/java/de/presti/ree6/sql/entities/Warning.java

@@ -1,5 +1,6 @@
 package de.presti.ree6.sql.entities;
 
+import de.presti.ree6.sql.keys.GuildUserId;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -18,21 +19,10 @@
 public class Warning {
 
     /**
-     * The id of the warning.
+     * The primary key for the entity.
      */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    long id;
-
-    /**
-     * The user id its bound to.
-     */
-    long userId;
-
-    /**
-     * The guild id its bound to.
-     */
-    long guildId;
+    @EmbeddedId
+    GuildUserId guildUserId;
 
     /**
      * The warnings that the user has.

src/main/java/de/presti/ree6/sql/entities/economy/MoneyHolder.java

@@ -35,4 +35,48 @@ public class MoneyHolder {
      */
     @Column(name = "bank")
     private double bankAmount;
+
+    /**
+     * Set the GuildID of the MoneyHolder.
+     * @param guildId The GuildID of the MoneyHolder.
+     */
+    public void setGuildId(long guildId) {
+        if (this.guildUserId == null)
+            this.guildUserId = new GuildUserId();
+
+        this.guildUserId.setGuildId(guildId);
+    }
+
+    /**
+     * Get the GuildID of the MoneyHolder.
+     * @return The GuildID of the MoneyHolder.
+     */
+    public long getGuildId() {
+        if (this.guildUserId == null)
+            return 0;
+
+        return this.guildUserId.getGuildId();
+    }
+
+    /**
+     * Set the UserID of the MoneyHolder.
+     * @param userId The UserID of the MoneyHolder.
+     */
+    public void setUserId(long userId) {
+        if (this.guildUserId == null)
+            this.guildUserId = new GuildUserId();
+
+        this.guildUserId.setUserId(userId);
+    }
+
+    /**
+     * Get the UserID of the MoneyHolder.
+     * @return The UserID of the MoneyHolder.
+     */
+    public long getUserId() {
+        if (this.guildUserId == null)
+            return 0;
+
+        return this.guildUserId.getUserId();
+    }
 }

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

@@ -1,6 +1,6 @@
 package de.presti.ree6.sql.entities.webhook.base;
 
-import de.presti.ree6.sql.keys.SocialWebhookId;
+import de.presti.ree6.sql.keys.GuildAndId;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -21,7 +21,7 @@ public class WebhookSocial {
      * The ID of the Entity.
      */
     @EmbeddedId
-    SocialWebhookId socialWebhookId;
+    GuildAndId guildAndId;
 
     @Column(name = "channel", nullable = false)
     long channelId = 0;
@@ -47,7 +47,7 @@ public class WebhookSocial {
      * @param token     The Token of the Webhook.
      */
     public WebhookSocial(long guildId, long channelId, long webhookId, String token) {
-        this.socialWebhookId = new SocialWebhookId(guildId);
+        this.guildAndId = new GuildAndId(guildId);
         this.channelId = channelId;
         this.webhookId = webhookId;
         this.token = token;
@@ -58,6 +58,9 @@ public WebhookSocial(long guildId, long channelId, long webhookId, String token)
      * @param guildId The GuildID of the Webhook.
      */
     public void setGuildId(long guildId) {
-        this.socialWebhookId.setGuildId(guildId);
+        if (guildAndId == null)
+            this.guildAndId = new GuildAndId(guildId);
+        else
+            this.guildAndId.setGuildId(guildId);
     }
 }

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

@@ -17,7 +17,7 @@
 @Embeddable
 @NoArgsConstructor
 @AllArgsConstructor
-public class SocialWebhookId implements Serializable {
+public class GuildAndId implements Serializable {
 
     /**
      * Unique ID of the Webhook.
@@ -33,16 +33,16 @@ public class SocialWebhookId implements Serializable {
     private long guildId;
 
     /**
-     * Constructor for the SocialWebhookId.
+     * Constructor for the GuildAndId.
      * @param guildId The Discord Guild ID.
      */
-    public SocialWebhookId(long guildId) {
+    public GuildAndId(long guildId) {
         this.guildId = guildId;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof SocialWebhookId settingId) {
+        if (obj instanceof GuildAndId settingId) {
             return settingId.getGuildId() == guildId && settingId.getId() == id;
         }