Adding database support + fixing issues with the backend

.gitignore

@@ -40,3 +40,4 @@ bin/
 .DS_Store
 codecov
 *.log
+gradle.properties

README.md

@@ -33,7 +33,7 @@ Once you have added the bot to your server, you will need to create a .env file
 TOKEN=
 GUILD_ID=
 OWNER_ID=
-//for the excutor default is 1;
+//for the excutor default is 1.
 CORE_POOL_SIZE=
 ```
 

build.gradle

@@ -1,10 +1,18 @@
+import nu.studer.gradle.jooq.JooqEdition
+
+buildscript {
+    dependencies {
+        classpath 'org.postgresql:postgresql:42.4.0'
+    }
+}
+
 plugins {
     id 'java'
     id "com.diffplug.spotless" version "6.6.1"
     id "application"
+    id "nu.studer.jooq" version "6.0.1"
 }
 
-
 group 'io.github.org.programming'
 version '1.0-SNAPSHOT'
 
@@ -24,16 +32,21 @@ dependencies {
     implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.11'
     //config
     implementation group: 'io.github.yusufsdiscordbot', name: 'config', version: '1.0.4'
-    //Reflection
-    implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'
     //json
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.3'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.13.3'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
-    //MongoDB
-    implementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.12.11'
+    //database
+    implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.0'
+    implementation group: 'org.postgresql', name: 'postgresql', version: '42.4.0'
+    //jooq
+    implementation group: 'org.jooq', name: 'jooq', version: '3.15.5'
+    implementation group: 'org.jooq', name: 'jooq-codegen', version: '3.16.6'
+    implementation group: 'org.jooq', name: 'jooq-meta', version: '3.16.6'
     //test
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    //jooq
+    jooqGenerator "org.postgresql:postgresql:42.4.0"
 }
 
 apply plugin: 'jacoco' // code coverage reports
@@ -131,4 +144,42 @@ task downloadDependencies {
     }
 }
 
+//def props = new Properties()
+//file(".env").withInputStream { props.load(it) }
+
+jooq {
+    version = '3.15.2'
+    edition = JooqEdition.OSS
+    configurations {
+        main {
+            generateSchemaSourceOnCompilation = false
+            generationTool {
+                logging = org.jooq.meta.jaxb.Logging.WARN
+                jdbc {
+                    driver = 'org.postgresql.Driver'
+                    url = "jdbc:postgresql://localhost:5432/postgres"
+                }
+                generator {
+                    name = 'org.jooq.codegen.JavaGenerator'
+                    database {
+                        name = 'org.jooq.meta.postgres.PostgresDatabase'
+                        includes = '.*'
+                        excludes = ''
+                    }
+                    generate {
+                        records = true
+                        immutablePojos = true
+                        fluentSetters = true
+                    }
+                    target {
+                        packageName = 'io.github.org.programming.db.generated'
+                        directory = "build/generated/java"
+                    }
+                    strategy.name = "org.jooq.codegen.DefaultGeneratorStrategy"
+                }
+            }
+        }
+    }
+}
+
 check.dependsOn jacocoTestReport

src/main/java/io/github/org/programming/backend/extension/MessageCommandExtender.java

@@ -11,11 +11,7 @@
 
 import javax.annotation.Nonnull;
 
-public abstract class MessageCommandExtender extends MessageCommand {
-
-    public MessageCommandExtender(CommandData commandData) {
-        super(commandData);
-    }
+public abstract class MessageCommandExtender {
 
     public abstract void onMessageContextInteraction(@Nonnull MessageContextInteractionEvent event);
 
@@ -35,5 +31,5 @@ public void onSelectMenu(@Nonnull SelectMenuInteractionEvent event) {
 
     }
 
-    protected abstract SlashCommand build();
+    public abstract MessageCommand build();
 }

src/main/java/io/github/org/programming/backend/extension/SlashCommandExtender.java

@@ -11,11 +11,7 @@
 
 import javax.annotation.Nonnull;
 
-public abstract class SlashCommandExtender extends SlashCommand {
-
-    protected SlashCommandExtender(SlashCommandData commandData) {
-        super(commandData);
-    }
+public abstract class SlashCommandExtender {
 
     // This method is called when the command is executed.
     public abstract void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event);
@@ -36,5 +32,5 @@ public void onSelectMenu(@Nonnull SelectMenuInteractionEvent event) {
 
     }
 
-    protected abstract SlashCommand build();
+    public abstract SlashCommand build();
 }

src/main/java/io/github/org/programming/backend/extension/UserCommandExtender.java

@@ -11,10 +11,7 @@
 
 import javax.annotation.Nonnull;
 
-public abstract class UserCommandExtender extends UserCommand {
-    public UserCommandExtender(CommandData commandData) {
-        super(commandData);
-    }
+public abstract class UserCommandExtender {
 
     public abstract void onUserContextInteraction(@NotNull UserContextInteractionEvent event);
 
@@ -34,5 +31,5 @@ public void onSelectMenu(@Nonnull SelectMenuInteractionEvent event) {
 
     }
 
-    protected abstract UserCommand build();
+    public abstract UserCommand build();
 }

src/main/java/io/github/org/programming/backend/handler/BaseHandler.java

@@ -2,6 +2,8 @@
 
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
+import java.util.Objects;
+
 public abstract class BaseHandler extends ListenerAdapter {
     /**
      *
@@ -10,4 +12,9 @@ public abstract class BaseHandler extends ListenerAdapter {
     protected abstract long botOwnerId();
 
 
+    public static void checkIfBuildIsNull(Object build) {
+        if (Objects.isNull(build)) {
+            throw new IllegalArgumentException("Build is null");
+        }
+    }
 }

src/main/java/io/github/org/programming/backend/handler/MessageCommandHandler.java

@@ -44,18 +44,20 @@ protected MessageCommandHandler(@NotNull JDA jda, @NotNull Guild guild) {
      *        The Command class is an interface class which contains all the need methods for the
      *        making of the command. <br>
      *        <br>
-     *        The boolean {@link MessageCommandExtender#isGuildOnly()} ()} ()} is used to determine
+     *        The boolean {@link MessageCommandExtender#build#isGuildOnly()} is used to determine
      *        whether the command should be global or guild only. determines whether the command
      *        should be Global or Guild only.
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
     private void addMessageCommand(@NotNull MessageCommandExtender command) {
-        jda.addEventListener(command);
-        messageCommand.put(command.getCommandData().getName(), command);
-        if (command.isGuildOnly()) {
-            guildCommandsData.addCommands(command.getCommandData());
+
+        BaseHandler.checkIfBuildIsNull(command.build());
+
+        messageCommand.put(command.build().getCommandData().getName(), command);
+        if (command.build().isGuildOnly()) {
+            guildCommandsData.addCommands(command.build().getCommandData());
         } else {
-            globalCommandsData.addCommands(command.getCommandData());
+            globalCommandsData.addCommands(command.build().getCommandData());
         }
     }
 
@@ -88,22 +90,27 @@ private void onFinishedRegistration() {
     public void onMessageContextInteraction(@Nonnull MessageContextInteractionEvent event) {
         final MessageCommandExtender cmd = messageCommand.get(event.getName());
 
-        if (cmd.isOwnerOnly() && event.getUser().getIdLong() != botOwnerId()) {
+        if (cmd.build().isOwnerOnly() && event.getUser().getIdLong() != botOwnerId()) {
             event.reply("You do not have permission to use this command.")
                 .setEphemeral(true)
                 .queue();
             return;
         }
 
-        if (Objects.requireNonNull(event.getMember()).hasPermission(cmd.getUserPerms())
-                || Objects.requireNonNull(event.getGuild())
-                    .getSelfMember()
-                    .hasPermission(cmd.getBotPerms())) {
-            cmd.onMessageContextInteraction(event);
-        } else {
+        if (cmd.build().getUserPerms() != null
+                && event.getMember().hasPermission(cmd.build().getUserPerms())) {
             event.reply("You do not have permission to use this command.")
                 .setEphemeral(true)
                 .queue();
+        } else {
+            cmd.onMessageContextInteraction(event);
+        }
+
+        if (cmd.build().getBotPerms() != null
+                && event.getGuild().getSelfMember().hasPermission(cmd.build().getBotPerms())) {
+            event.reply("I do not have permission to use this command.").setEphemeral(true).queue();
+        } else {
+            cmd.onMessageContextInteraction(event);
         }
     }
 

src/main/java/io/github/org/programming/backend/handler/SlashCommandHandler.java

@@ -66,18 +66,20 @@ protected SlashCommandHandler(@NotNull JDA jda, @NotNull Guild guild) {
      *        The Command class is an interface class which contains all the need methods for the
      *        making of the command. <br>
      *        <br>
-     *        The boolean {@link SlashCommandExtender#isGuildOnly()} ()} ()} is used to determine
+     *        The boolean {@link SlashCommandExtender#build()#isGuildOnly()} is used to determine
      *        whether the command should be global or guild only. determines whether the command
      *        should be Global or Guild only.
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
     private void addSlashCommand(@NotNull SlashCommandExtender command) {
-        jda.addEventListener(command);
-        slashCommand.put(command.getSlashCommandData().getName(), command);
-        if (command.isGuildOnly()) {
-            guildCommandsData.addCommands(command.getSlashCommandData());
+
+        BaseHandler.checkIfBuildIsNull(command.build());
+
+        slashCommand.put(command.build().getSlashCommandData().getName(), command);
+        if (command.build().isGuildOnly()) {
+            guildCommandsData.addCommands(command.build().getSlashCommandData());
         } else {
-            globalCommandsData.addCommands(command.getSlashCommandData());
+            globalCommandsData.addCommands(command.build().getSlashCommandData());
         }
     }
 
@@ -110,22 +112,27 @@ private void onFinishedRegistration() {
     public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
         final SlashCommandExtender cmd = slashCommand.get(event.getName());
 
-        if (cmd.isOwnerOnly() && event.getUser().getIdLong() != botOwnerId()) {
+        if (cmd.build().isOwnerOnly() && event.getUser().getIdLong() != botOwnerId()) {
             event.reply("You do not have permission to use this command.")
                 .setEphemeral(true)
                 .queue();
             return;
         }
 
-        if (Objects.requireNonNull(event.getMember()).hasPermission(cmd.getUserPerms())
-                || Objects.requireNonNull(event.getGuild())
-                    .getSelfMember()
-                    .hasPermission(cmd.getBotPerms())) {
-            cmd.onSlashCommandInteraction(event);
-        } else {
+        if (cmd.build().getUserPerms() != null
+                && event.getMember().hasPermission(cmd.build().getUserPerms())) {
             event.reply("You do not have permission to use this command.")
                 .setEphemeral(true)
                 .queue();
+        } else {
+            cmd.onSlashCommandInteraction(event);
+        }
+
+        if (cmd.build().getBotPerms() != null
+                && event.getGuild().getSelfMember().hasPermission(cmd.build().getBotPerms())) {
+            event.reply("I do not have permission to use this command.").setEphemeral(true).queue();
+        } else {
+            cmd.onSlashCommandInteraction(event);
         }
     }
 

src/main/java/io/github/org/programming/backend/handler/UserCommandHandler.java

@@ -45,18 +45,20 @@ protected UserCommandHandler(@NotNull JDA jda, @NotNull Guild guild) {
      *        The Command class is an interface class which contains all the need methods for the
      *        making of the command. <br>
      *        <br>
-     *        The boolean {@link UserCommandExtender#isGuildOnly()} ()} ()} is used to determine
+     *        The boolean {@link UserCommandExtender#build#isGuildOnly()} is used to determine
      *        whether the command should be global or guild only. determines whether the command
      *        should be Global or Guild only.
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
     private void addUserCommand(@NotNull UserCommandExtender command) {
-        jda.addEventListener(command);
-        userCommand.put(command.getCommandData().getName(), command);
-        if (command.isGuildOnly()) {
-            guildCommandsData.addCommands(command.getCommandData());
+
+        BaseHandler.checkIfBuildIsNull(command.build());
+
+        userCommand.put(command.build().getCommandData().getName(), command);
+        if (command.build().isGuildOnly()) {
+            guildCommandsData.addCommands(command.build().getCommandData());
         } else {
-            globalCommandsData.addCommands(command.getCommandData());
+            globalCommandsData.addCommands(command.build().getCommandData());
         }
     }
 
@@ -89,22 +91,27 @@ private void onFinishedRegistration() {
     public void onUserContextInteraction(@NotNull UserContextInteractionEvent event) {
         final UserCommandExtender cmd = userCommand.get(event.getName());
 
-        if (cmd.isOwnerOnly() && event.getUser().getIdLong() != botOwnerId()) {
+        if (cmd.build().isOwnerOnly() && event.getUser().getIdLong() != botOwnerId()) {
             event.reply("You do not have permission to use this command.")
                 .setEphemeral(true)
                 .queue();
             return;
         }
 
-        if (Objects.requireNonNull(event.getMember()).hasPermission(cmd.getUserPerms())
-                || Objects.requireNonNull(event.getGuild())
-                    .getSelfMember()
-                    .hasPermission(cmd.getBotPerms())) {
-            cmd.onUserContextInteraction(event);
-        } else {
+        if (cmd.build().getUserPerms() != null
+                && event.getMember().hasPermission(cmd.build().getUserPerms())) {
             event.reply("You do not have permission to use this command.")
                 .setEphemeral(true)
                 .queue();
+        } else {
+            cmd.onUserContextInteraction(event);
+        }
+
+        if (cmd.build().getBotPerms() != null
+                && event.getGuild().getSelfMember().hasPermission(cmd.build().getBotPerms())) {
+            event.reply("I do not have permission to use this command.").setEphemeral(true).queue();
+        } else {
+            cmd.onUserContextInteraction(event);
         }
     }