optimized code

TomasGnG · Oct 1, 2023 · 3358564 · 3358564
1 parent cc9135e
commit 3358564
Showing 1 changed file with 39 additions and 29 deletions.
diff --git a/src/main/java/de/efi23a/bot/features/alert/AlertFeature.java b/src/main/java/de/efi23a/bot/features/alert/AlertFeature.java
@@ -22,8 +22,10 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import org.bson.Document;
+import org.bson.conversions.Bson;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -54,7 +56,7 @@ void postConstruct() {
   }
 
   private void registerAlertCommand() {
-    var cmd = Commands.slash("alert", "Verwalte die Erinnerungen.")
+    SlashCommandData cmd = Commands.slash("alert", "Verwalte die Erinnerungen.")
         .addSubcommands(
             new SubcommandData("info", "Zeigt alle Details zu einer Erinnerung.")
                 .addOption(OptionType.STRING, "name", "Name der Erinnerung", true),
@@ -87,35 +89,43 @@ private void registerAlertCommand() {
 
   @Scheduled(fixedDelay = 5, timeUnit = TimeUnit.MINUTES)
   private void startAlertCheckerTask() {
-    var alerts = getAlerts();
+    FindIterable<Document> alerts = getAlerts();
 
     for (var alert : alerts) {
-      var alertDate = Duration.between(Instant.now(), alert.getDate("date").toInstant());
-      var lastReminder = getAlertLastReminder(alert);
+      Duration alertDate = Duration.between(Instant.now(), alert.getDate("date").toInstant());
+      Date lastReminder = getAlertLastReminder(alert);
       int firstReminderHours = Integer.parseInt(System.getenv(ALERT_FIRST_REMINDER));
       int lastReminderHours = Integer.parseInt(System.getenv(ALERT_LAST_REMINDER));
 
-      if ((alertDate.get(ChronoUnit.SECONDS) / 60 / 60) < lastReminderHours
-          && lastReminder == null
-          || (Duration.between(Instant.now(), lastReminder.toInstant())
-          .getSeconds() / 60 / 60) > lastReminderHours) {
-        alert.replace("lastReminder", Instant.now());
-        updateAlert(alert);
-        sendAlert(alert);
-        return;
-      }
+      processAlert(alert, alertDate, lastReminder, firstReminderHours, lastReminderHours);
+    }
+  }
 
-      if (Duration.between(Instant.now(), lastReminder.toInstant())
-          .getSeconds() / 60 / 60 > firstReminderHours) {
-        alert.replace("lastReminder", Instant.now());
-        updateAlert(alert);
-        sendAlert(alert);
-        return;
-      }
+  private void processAlert(Document alert,
+                            Duration alertDate,
+                            Date lastReminder,
+                            int firstReminderHours,
+                            int lastReminderHours) {
+    if ((alertDate.get(ChronoUnit.SECONDS) / 60 / 60) < lastReminderHours
+        && lastReminder == null
+        || (Duration.between(Instant.now(), lastReminder.toInstant())
+        .getSeconds() / 60 / 60) > lastReminderHours) {
+      alert.replace("lastReminder", Instant.now());
+      updateAlert(alert);
+      sendAlert(alert);
+      return;
+    }
 
-      if ((alertDate.getSeconds() / 60 / 60) < -36) {
-        removeAlert(alert.getString("name"));
-      }
+    if (Duration.between(Instant.now(), lastReminder.toInstant())
+        .getSeconds() / 60 / 60 > firstReminderHours) {
+      alert.replace("lastReminder", Instant.now());
+      updateAlert(alert);
+      sendAlert(alert);
+      return;
+    }
+
+    if ((alertDate.getSeconds() / 60 / 60) < -36) {
+      removeAlert(alert.getString("name"));
     }
   }
 
@@ -124,7 +134,7 @@ public boolean exists(String name) {
   }
 
   public void addAlert(String name, Date date, String description, String createdBy) {
-    var document = new Document();
+    Document document = new Document();
 
     document.put("name", name);
     document.put("date", date);
@@ -136,18 +146,18 @@ public void addAlert(String name, Date date, String description, String createdB
   }
 
   private void updateAlert(Document updatedAlert) {
-    var filter = eq("_id", updatedAlert.get("_id"));
+    Bson filter = eq("_id", updatedAlert.get("_id"));
 
     if (alerts.find(filter).first() != null) {
       alerts.replaceOne(filter, updatedAlert);
     }
   }
 
   public void editAlert(String name, String property, Object value) {
-    var filter = eq("name", name);
+    Bson filter = eq("name", name);
 
     if (exists(name)) {
-      var doc = alerts.find(filter).first();
+      Document doc = alerts.find(filter).first();
       doc.replace(property, value);
 
       if (property.equalsIgnoreCase("date")) {
@@ -181,7 +191,7 @@ private Date getAlertLastReminder(Document document) {
   }
 
   private void sendAlert(Document alert) {
-    var embed = new EmbedBuilder()
+    MessageEmbed embed = new EmbedBuilder()
         .setColor(Color.ORANGE)
         .setTitle("Erinnerung")
         .addField("Name", alert.getString("name"), false)
@@ -198,7 +208,7 @@ private void sendAlert(Document alert) {
   }
 
   public MessageEmbed getAlertEmbedMessage(String name) {
-    var alert = getAlertByName(name);
+    Document alert = getAlertByName(name);
     return new EmbedBuilder()
         .setColor(Color.ORANGE)
         .setTitle("Erinnerung")