[AB-203] restructuring listeners to use more common code and common interfaces for listeners and models

restructuring entity listener to be async and added models
fixing usage of repository save method
adding interface dependencies to bundle dependency management

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/CreateTrackedEmoteListener.java

@@ -2,9 +2,9 @@ package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
-import dev.sheldan.abstracto.core.config.ListenerPriority;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteCreatedListener;
-import dev.sheldan.abstracto.core.models.cache.CachedEmote;
+import dev.sheldan.abstracto.core.models.listener.EmoteCreatedModel;
 import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
 import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
 import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
@@ -28,24 +28,20 @@ public class CreateTrackedEmoteListener implements AsyncEmoteCreatedListener {
     @Autowired
     private TrackedEmoteManagementService trackedEmoteManagementService;
 
-    @Override
-    public void emoteCreated(CachedEmote createdEmote) {
-        log.info("Creating tracked emote {} in server {}.", createdEmote.getServerId(), createdEmote.getEmoteId());
-        trackedEmoteManagementService.createTrackedEmote(createdEmote);
-    }
-
     @Override
     public FeatureDefinition getFeature() {
         return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
-    @Override
-    public Integer getPriority() {
-        return ListenerPriority.MEDIUM;
-    }
-
     @Override
     public List<FeatureMode> getFeatureModeLimitations() {
         return Arrays.asList(EmoteTrackingMode.AUTO_TRACK);
     }
+
+    @Override
+    public DefaultListenerResult execute(EmoteCreatedModel model) {
+        log.info("Creating tracked emote {} in server {}.", model.getServerId(), model.getEmote().getIdLong());
+        trackedEmoteManagementService.createTrackedEmote(model.getEmote());
+        return DefaultListenerResult.PROCESSED;
+    }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/DeleteTrackedEmoteListener.java

@@ -2,9 +2,9 @@ package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
-import dev.sheldan.abstracto.core.config.ListenerPriority;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteDeletedListener;
-import dev.sheldan.abstracto.core.models.cache.CachedEmote;
+import dev.sheldan.abstracto.core.models.listener.EmoteDeletedModel;
 import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
 import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
 import dev.sheldan.abstracto.statistic.emote.service.management.TrackedEmoteManagementService;
@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This listener listens for deleted {@link Emote} in a {@link net.dv8tion.jda.api.entities.Guild} and markes respective
+ * This listener listens for deleted {@link Emote} in a {@link net.dv8tion.jda.api.entities.Guild} and marks respective
  * {@link dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote} as deleted, if the EMOTE_TRACKING feature is enabled and the AUTO_TRACK
  * feature mode as well.
  */
@@ -28,24 +28,21 @@ public class DeleteTrackedEmoteListener implements AsyncEmoteDeletedListener {
     @Autowired
     private TrackedEmoteManagementService trackedEmoteManagementService;
 
-    @Override
-    public void emoteDeleted(CachedEmote deletedEmote) {
-        log.info("Marking tracked emote {} in gild {} as deleted.", deletedEmote.getEmoteId(), deletedEmote.getServerId());
-        trackedEmoteManagementService.markAsDeleted(deletedEmote.getServerId(), deletedEmote.getEmoteId());
-    }
-
     @Override
     public FeatureDefinition getFeature() {
         return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
-    @Override
-    public Integer getPriority() {
-        return ListenerPriority.MEDIUM;
-    }
 
     @Override
     public List<FeatureMode> getFeatureModeLimitations() {
         return Arrays.asList(EmoteTrackingMode.AUTO_TRACK);
     }
+
+    @Override
+    public DefaultListenerResult execute(EmoteDeletedModel model) {
+        log.info("Marking tracked emote {} in gild {} as deleted.", model.getEmote().getIdLong(), model.getServerId());
+        trackedEmoteManagementService.markAsDeleted(model.getEmote());
+        return DefaultListenerResult.PROCESSED;
+    }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/EmoteTrackingListener.java

@@ -1,12 +1,13 @@
 package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
 import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageReceivedListener;
-import dev.sheldan.abstracto.core.models.cache.CachedEmote;
-import dev.sheldan.abstracto.core.models.cache.CachedMessage;
+import dev.sheldan.abstracto.core.models.listener.MessageReceivedModel;
 import dev.sheldan.abstracto.core.service.GuildService;
 import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
 import dev.sheldan.abstracto.statistic.emote.service.TrackedEmoteService;
+import net.dv8tion.jda.api.entities.Emote;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -27,17 +28,17 @@ public class EmoteTrackingListener implements AsyncMessageReceivedListener {
     @Autowired
     private GuildService guildService;
 
-    @Override
-    public void execute(CachedMessage message) {
-        Map<Long, List<CachedEmote>> collect = message.getEmotes().stream().collect(Collectors.groupingBy(CachedEmote::getEmoteId));
-        collect.values().forEach(groupedEmotes ->
-            trackedEmoteService.addEmoteToRuntimeStorage(groupedEmotes.get(0), guildService.getGuildById(message.getServerId()), (long) groupedEmotes.size())
-        );
-    }
-
     @Override
     public FeatureDefinition getFeature() {
         return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
+    @Override
+    public DefaultListenerResult execute(MessageReceivedModel model) {
+        Map<Long, List<Emote>> collect = model.getMessage().getEmotesBag().stream().collect(Collectors.groupingBy(Emote::getIdLong));
+        collect.values().forEach(groupedEmotes ->
+            trackedEmoteService.addEmoteToRuntimeStorage(groupedEmotes.get(0), guildService.getGuildById(model.getServerId()), (long) groupedEmotes.size())
+        );
+        return DefaultListenerResult.PROCESSED;
+    }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/listener/UpdateTrackedEmoteNameListener.java

@@ -2,9 +2,9 @@ package dev.sheldan.abstracto.statistic.emote.listener;
 
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
 import dev.sheldan.abstracto.core.config.FeatureMode;
-import dev.sheldan.abstracto.core.config.ListenerPriority;
-import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteUpdatedListener;
-import dev.sheldan.abstracto.core.models.cache.CachedEmote;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
+import dev.sheldan.abstracto.core.listener.async.jda.AsyncEmoteNameUpdatedListener;
+import dev.sheldan.abstracto.core.models.listener.EmoteNameUpdatedModel;
 import dev.sheldan.abstracto.statistic.config.StatisticFeatureDefinition;
 import dev.sheldan.abstracto.statistic.emote.config.EmoteTrackingMode;
 import dev.sheldan.abstracto.statistic.emote.model.database.TrackedEmote;
@@ -20,29 +20,25 @@ import java.util.List;
  * if the emote is tracked. This is only executed if the EMOTE_TRACKING feature is enabled,and if the AUTO_TRACK feature mode is enabled.
  */
 @Component
-public class UpdateTrackedEmoteListener implements AsyncEmoteUpdatedListener {
+public class UpdateTrackedEmoteNameListener implements AsyncEmoteNameUpdatedListener {
 
     @Autowired
     private TrackedEmoteManagementService trackedEmoteManagementService;
 
-    @Override
-    public void emoteUpdated(CachedEmote updatedEmote, String oldValue, String newValue) {
-        TrackedEmote trackedEmote = trackedEmoteManagementService.loadByEmoteId(updatedEmote.getEmoteId(), updatedEmote.getServerId());
-        trackedEmoteManagementService.changeName(trackedEmote, newValue);
-    }
-
     @Override
     public FeatureDefinition getFeature() {
         return StatisticFeatureDefinition.EMOTE_TRACKING;
     }
 
-    @Override
-    public Integer getPriority() {
-        return ListenerPriority.MEDIUM;
-    }
-
     @Override
     public List<FeatureMode> getFeatureModeLimitations() {
         return Arrays.asList(EmoteTrackingMode.AUTO_TRACK);
     }
+
+    @Override
+    public DefaultListenerResult execute(EmoteNameUpdatedModel model) {
+        TrackedEmote trackedEmote = trackedEmoteManagementService.loadByEmote(model.getEmote());
+        trackedEmoteManagementService.changeName(trackedEmote, model.getNewValue());
+        return DefaultListenerResult.PROCESSED;
+    }
 }

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBean.java

@@ -4,6 +4,7 @@ import dev.sheldan.abstracto.core.metric.service.CounterMetric;
 import dev.sheldan.abstracto.core.metric.service.MetricService;
 import dev.sheldan.abstracto.core.models.ServerSpecificId;
 import dev.sheldan.abstracto.core.models.cache.CachedEmote;
+import dev.sheldan.abstracto.core.service.CacheEntityService;
 import dev.sheldan.abstracto.core.service.EmoteService;
 import dev.sheldan.abstracto.core.service.FeatureModeService;
 import dev.sheldan.abstracto.core.service.GuildService;
@@ -54,6 +55,9 @@ public class TrackedEmoteServiceBean implements TrackedEmoteService {
     @Autowired
     private MetricService metricService;
 
+    @Autowired
+    private CacheEntityService cacheEntityService;
+
     public static final String EMOTE_USAGES_TRACKED_METRIC = "emote.usages";
     private static final CounterMetric EMOTE_USAGES_TRACKED =
             CounterMetric
@@ -82,6 +86,11 @@ public class TrackedEmoteServiceBean implements TrackedEmoteService {
         }
     }
 
+    @Override
+    public void addEmoteToRuntimeStorage(Emote emote, Guild guild, Long count) {
+        addEmoteToRuntimeStorage(cacheEntityService.getCachedEmoteFromEmote(emote, guild), guild, count);
+    }
+
     @Override
     @Transactional
     public void storeEmoteStatistics(Map<Long, List<PersistingEmote>> usagesToStore) {

abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/TrackedEmoteManagementServiceBean.java

@@ -38,6 +38,11 @@ public class TrackedEmoteManagementServiceBean implements TrackedEmoteManagement
         return createTrackedEmote(emote.getIdLong(), emote.getName(), emote.isAnimated(), true, server);
     }
 
+    @Override
+    public TrackedEmote createTrackedEmote(Emote emote) {
+        return createTrackedEmote(emote, emote.getGuild());
+    }
+
     @Override
     public TrackedEmote createTrackedEmote(CachedEmote emote) {
         AServer server = serverManagementService.loadServer(emote.getServerId());
@@ -109,6 +114,11 @@ public class TrackedEmoteManagementServiceBean implements TrackedEmoteManagement
         markAsDeleted(emote);
     }
 
+    @Override
+    public void markAsDeleted(Emote emote) {
+        markAsDeleted(emote.getGuild().getIdLong(), emote.getIdLong());
+    }
+
     @Override
     public void markAsDeleted(TrackedEmote trackedemote) {
         log.info("Marking tracked emote {} in server {} as deleted.", trackedemote.getTrackedEmoteId().getId(), trackedemote.getTrackedEmoteId().getServerId());