Merge remote-tracking branch 'origin/master'

Author: DxsSucuk

.github/workflows/cli.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3

.github/workflows/sonar-analytics.yml

@@ -10,7 +10,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 17

.jpb/jpb-settings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DatabaseMigrationSettings" lastSelectedDirectory="src\main\resources\sql\migration" />
+  <component name="DatabaseMigrationSettings" lastSelectedDirectory="src/main/resources/sql/migrations" />
   <component name="PersistenceUnitSettings">
     <persistence-units>
       <persistence-unit name="Default">

pom.xml

@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.43.0.0</version>
+            <version>3.43.2.1</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -93,12 +93,12 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>9.22.2</version>
+            <version>9.22.3</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-mysql</artifactId>
-            <version>9.22.2</version>
+            <version>9.22.3</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
@@ -130,7 +130,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry</artifactId>
-            <version>6.30.0</version>
+            <version>6.32.0</version>
         </dependency>
     </dependencies>
 

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

@@ -1,6 +1,8 @@
 package de.presti.ree6.sql.entities;
 
+import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -11,9 +13,11 @@
 /**
  * A Class that represents the Giveaway Entity
  */
+@Entity
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
+@Table(name = "Giveaway")
 public class Giveaway {
 
     /**
@@ -61,8 +65,9 @@ public class Giveaway {
     /**
      * Constructor with the needed data.
      */
-    public Giveaway(long messageId, long guildId, long channelId, String prize, long winners, Timestamp ending) {
+    public Giveaway(long messageId, long creatorId, long guildId, long channelId, String prize, long winners, Timestamp ending) {
         this.messageId = messageId;
+        this.creatorId = creatorId;
         this.guildId = guildId;
         this.channelId = channelId;
         this.prize = prize;

src/main/resources/sql/migrations/V2__Add_Giveaway.sql

@@ -0,0 +1,12 @@
+CREATE TABLE Giveaway
+(
+    messageId BIGINT NOT NULL,
+    creatorId BIGINT NOT NULL,
+    guildId   BIGINT NOT NULL,
+    channelId BIGINT NOT NULL,
+    prize     VARCHAR(255) NULL,
+    winners   BIGINT NOT NULL,
+    created   datetime NULL,
+    ending    datetime NULL,
+    CONSTRAINT pk_giveaway PRIMARY KEY (messageId)
+);