[AB-192] removing second level cache

changing assignable role place module name
fixing starboard retrieving the starstats incorrectly
fixing removing user assigned roles when removing a role from assignable role place
fixing not being able to remove external emote for assignable role place

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/command/AssignableRoleModule.java

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class AssignableRoleModule implements ModuleInterface {
-    public static final String ASSIGNABLE_ROLES = "assignableRoles";
+    public static final String ASSIGNABLE_ROLES = "assignableRole";
 
     @Override
     public ModuleInfo getInfo() {

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionAdded.java

@@ -19,6 +19,7 @@ import dev.sheldan.abstracto.core.models.cache.CachedReaction;
 import dev.sheldan.abstracto.core.models.cache.CachedReactions;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.EmoteService;
+import dev.sheldan.abstracto.core.service.MemberService;
 import dev.sheldan.abstracto.core.service.ReactionService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import lombok.extern.slf4j.Slf4j;
@@ -65,6 +66,9 @@ public class AssignablePostReactionAdded implements AsyncReactionAddedListener {
     @Autowired
     private ReactionService reactionService;
 
+    @Autowired
+    private MemberService memberService;
+
     @Override
     public void executeReactionAdded(CachedMessage message, CachedReactions cachedReaction, ServerUser serverUser) {
         Optional<AssignableRolePlacePost> messageOptional = service.findByMessageIdOptional(message.getMessageId());
@@ -113,12 +117,15 @@ public class AssignablePostReactionAdded implements AsyncReactionAddedListener {
         }
         if(!validReaction) {
             log.trace("Reaction was not found in the configuration of assignable role place {}, removing reaction.", assignableRolePlace.getId());
-            futures.add(reactionService.removeReactionFromMessage(cachedReaction, message));
+            futures.add(reactionService.removeReaction(message, cachedReaction.getEmote(), serverUser));
         }
         Long assignableRolePlaceId = assignableRolePlace.getId();
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).thenAccept(aVoid ->
             self.updateStoredAssignableRoles(assignableRolePlaceId, serverUser, cachedReaction)
-        );
+        ).exceptionally(throwable -> {
+            log.error("Failed to add role or remove emote for assignable role place {}.", assignableRolePlaceId, throwable);
+            return null;
+        });
     }
 
     @Transactional

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/repository/AssignableRolePlacePostRepository.java

@@ -3,17 +3,14 @@ package dev.sheldan.abstracto.assignableroles.repository;
 import dev.sheldan.abstracto.assignableroles.models.database.AssignableRolePlacePost;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.QueryHint;
 import java.util.Optional;
 
 @Repository
 public interface AssignableRolePlacePostRepository extends JpaRepository<AssignableRolePlacePost, Long> {
     @NotNull
     @Override
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     Optional<AssignableRolePlacePost> findById(@NonNull Long aLong);
 }

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/repository/AssignableRolePlaceRepository.java

@@ -4,28 +4,22 @@ import dev.sheldan.abstracto.assignableroles.models.database.AssignableRolePlace
 import dev.sheldan.abstracto.core.models.database.AServer;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.QueryHint;
 import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface AssignableRolePlaceRepository extends JpaRepository<AssignableRolePlace, Long> {
 
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     boolean existsByServerAndKey(AServer server, String key);
 
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     Optional<AssignableRolePlace> findByServerAndKey(AServer server, String key);
 
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     List<AssignableRolePlace> findByServer(AServer server);
 
     @NotNull
     @Override
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     Optional<AssignableRolePlace> findById(@NonNull Long aLong);
 }

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/repository/AssignableRoleRepository.java

@@ -3,17 +3,14 @@ package dev.sheldan.abstracto.assignableroles.repository;
 import dev.sheldan.abstracto.assignableroles.models.database.AssignableRole;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.QueryHint;
 import java.util.Optional;
 
 @Repository
 public interface AssignableRoleRepository extends JpaRepository<AssignableRole, Long> {
     @NotNull
     @Override
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     Optional<AssignableRole> findById(@NonNull Long aLong);
 }

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/repository/AssignedRoleUserRepository.java

@@ -3,21 +3,17 @@ package dev.sheldan.abstracto.assignableroles.repository;
 import dev.sheldan.abstracto.assignableroles.models.database.AssignedRoleUser;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.QueryHint;
 import java.util.Optional;
 
 @Repository
 public interface AssignedRoleUserRepository extends JpaRepository<AssignedRoleUser, Long> {
     @NotNull
     @Override
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     Optional<AssignedRoleUser> findById(@NonNull Long aLong);
 
     @Override
-    @QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
     boolean existsById(@NonNull Long aLong);
 }

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java

@@ -9,10 +9,7 @@ import dev.sheldan.abstracto.assignableroles.models.database.AssignableRolePlace
 import dev.sheldan.abstracto.assignableroles.models.database.AssignableRolePlacePost;
 import dev.sheldan.abstracto.assignableroles.models.database.AssignedRoleUser;
 import dev.sheldan.abstracto.assignableroles.models.templates.*;
-import dev.sheldan.abstracto.assignableroles.service.management.AssignableRoleManagementService;
-import dev.sheldan.abstracto.assignableroles.service.management.AssignableRolePlaceManagementService;
-import dev.sheldan.abstracto.assignableroles.service.management.AssignableRolePlacePostManagementService;
-import dev.sheldan.abstracto.assignableroles.service.management.AssignableRolePlacePostManagementServiceBean;
+import dev.sheldan.abstracto.assignableroles.service.management.*;
 import dev.sheldan.abstracto.core.command.exception.AbstractoTemplatedException;
 import dev.sheldan.abstracto.core.command.exception.CommandParameterKeyValueWrongTypeException;
 import dev.sheldan.abstracto.core.exception.ChannelNotInGuildException;
@@ -124,11 +121,10 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic
         if(!hasAssignableRolePlaceEmote(server, placeName, emote.getFakeEmote())) {
             throw new AbstractoTemplatedException("Place does not have emote assigned.", "assignable_role_place_position_exists_exception");
         }
-        Integer emoteId = emote.getFakeEmote().getId();
         AssignableRolePlace assignableRolePlace = rolePlaceManagementService.findByServerAndKey(server, placeName);
-        log.info("Setting emote {} to position {} in assignable role place {} in server {}.",
-                emoteId, position, assignableRolePlace.getId(), assignableRolePlace.getServer().getId());
-        Optional<AssignableRole> emoteOptional = assignableRolePlace.getAssignableRoles().stream().filter(role -> role.getEmote().getId().equals(emoteId)).findFirst();
+        log.info("Setting emote to position {} in assignable role place {} in server {}.",
+                position, assignableRolePlace.getId(), assignableRolePlace.getServer().getId());
+        Optional<AssignableRole> emoteOptional = assignableRolePlace.getAssignableRoles().stream().filter(role -> emoteService.compareAEmote(emote.getFakeEmote(), role.getEmote())).findFirst();
         if(emoteOptional.isPresent()) {
             AssignableRole toChange = emoteOptional.get();
             toChange.setPosition(position);
@@ -290,6 +286,8 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic
         Optional<AssignableRole> roleToRemoveOptional = assignableRolePlace.getAssignableRoles().stream().filter(role -> role.getId().equals(assignableRoleId)).findAny();
         roleToRemoveOptional.ifPresent(assignableRole -> {
             assignableRolePlace.getAssignableRoles().remove(assignableRole);
+            assignableRole.getAssignedUsers().forEach(assignedRoleUser -> assignedRoleUser.getRoles().remove(assignableRole));
+            assignableRole.getAssignedUsers().clear();
             assignableRole.setAssignablePlace(null);
         });
     }
@@ -319,6 +317,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic
         AssignableRolePlace assignableRolePlace = rolePlaceManagementService.findByServerAndKey(server, name);
         log.info("Setting up assignable role place {} in server {} towards channel {}.", assignableRolePlace.getId(), server.getId(), assignableRolePlace.getChannel().getId());
         List<CompletableFuture<Void>> oldPostDeletionFutures = deleteExistingMessagePostsForPlace(assignableRolePlace);
+        assignableRolePlace.getMessagePosts().forEach(assignableRolePlacePost -> assignableRolePlacePost.setAssignablePlace(null));
         assignableRolePlace.getMessagePosts().clear();
         assignableRolePlace.getAssignableRoles().forEach(assignableRole ->
             assignableRole.setAssignableRolePlacePost(null)
@@ -765,7 +764,11 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic
             reactionFutures.add(firstMessageFuture);
         }
         return CompletableFuture.allOf(reactionFutures.toArray(new CompletableFuture[0])).thenCompose(aVoid -> {
-            self.storeCreatedAssignableRolePlacePosts(assignablePlaceId, serverId, assignablePlacePostsMessageFutures);
+            try {
+                self.storeCreatedAssignableRolePlacePosts(assignablePlaceId, serverId, assignablePlacePostsMessageFutures);
+            } catch (Exception e) {
+                log.error("Failed to persist assignable role place posts. ", e);
+            }
             return CompletableFuture.completedFuture(null);
         });
     }
@@ -778,21 +781,16 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic
         int usedEmotes = 0;
         for (int i = 0; i < futures.size(); i++) {
             CompletableFuture<Message> messageCompletableFuture = futures.get(i);
-            try {
-                Message message = messageCompletableFuture.get();
-                Message sentMessage = messageCompletableFuture.get();
-                // this uses the actual embed count as a limit, so this relies on fields to be used for description, if this changes, this needs to be changed
-                MessageEmbed embed = sentMessage.getEmbeds().get(0);
-                log.trace("Storing post {} with {} fields.", message.getId(), embed.getFields().size());
-                List<AssignableRole> firstRoles = rolesToAdd.subList(usedEmotes, usedEmotes +  embed.getFields().size());
-                usedEmotes += embed.getFields().size();
-                AssignableRolePlacePost post = assignableRolePlacePostManagementServiceBean.createAssignableRolePlacePost(updatedPlace, message.getIdLong());
-                firstRoles.forEach(assignableRole ->
-                    assignableRole.setAssignableRolePlacePost(post)
-                );
-            } catch (Exception e) {
-                log.error("Failed to get future.", e);
-            }
+            Message message = messageCompletableFuture.join();
+            // this uses the actual embed count as a limit, so this relies on fields to be used for description, if this changes, this needs to be changed
+            MessageEmbed embed = message.getEmbeds().get(0);
+            log.trace("Storing post {} with {} fields.", message.getId(), embed.getFields().size());
+            List<AssignableRole> firstRoles = rolesToAdd.subList(usedEmotes, usedEmotes +  embed.getFields().size());
+            usedEmotes += embed.getFields().size();
+            AssignableRolePlacePost post = assignableRolePlacePostManagementServiceBean.createAssignableRolePlacePost(updatedPlace, message.getIdLong());
+            firstRoles.forEach(assignableRole ->
+                assignableRole.setAssignableRolePlacePost(post)
+            );
         }
     }
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/management/AssignableRolePlacePostManagementServiceBean.java

@@ -34,7 +34,7 @@ public class AssignableRolePlacePostManagementServiceBean implements AssignableR
                 .server(updatedPlace.getServer())
                 .assignablePlace(updatedPlace)
                 .build();
-        repository.save(post);
+        updatedPlace.getMessagePosts().add(post);
         return post;
     }
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/management/AssignedRoleUserManagementServiceBean.java

@@ -40,6 +40,10 @@ public class AssignedRoleUserManagementServiceBean implements AssignedRoleUserMa
                 assignableRole.getId(), aUserInAServer.getUserReference().getId(), aUserInAServer.getServerReference().getId(),
                 assignableRole.getAssignablePlace().getId());
         AssignedRoleUser user = findByUserInServer(aUserInAServer);
+        removeAssignedRoleFromUser(assignableRole, user);
+    }
+
+    public void removeAssignedRoleFromUser(AssignableRole assignableRole, AssignedRoleUser user) {
         assignableRole.getAssignedUsers().remove(user);
         user.getRoles().remove(assignableRole);
     }

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/models/database/AssignableRole.java

@@ -4,7 +4,6 @@ import dev.sheldan.abstracto.core.models.database.AEmote;
 import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -20,8 +19,6 @@ import java.util.List;
 @Getter
 @Setter
 @EqualsAndHashCode
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class AssignableRole implements Serializable {
 
     @Id
@@ -50,7 +47,6 @@ public class AssignableRole implements Serializable {
 
     @ManyToMany(mappedBy = "roles")
     @Builder.Default
-    @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     private List<AssignedRoleUser> assignedUsers = new ArrayList<>();
 
     @Column(name = "description")

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/models/database/AssignableRolePlace.java

@@ -3,7 +3,6 @@ package dev.sheldan.abstracto.assignableroles.models.database;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -19,8 +18,6 @@ import java.util.List;
 @Getter
 @Setter
 @EqualsAndHashCode
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class AssignableRolePlace implements Serializable {
 
     public static final Long ASSIGNABLE_PLACE_NAME_LIMIT = 255L;
@@ -49,7 +46,6 @@ public class AssignableRolePlace implements Serializable {
             mappedBy = "assignablePlace"
     )
     @Builder.Default
-    @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     private List<AssignableRolePlacePost> messagePosts = new ArrayList<>();
 
     @OneToMany(
@@ -59,7 +55,6 @@ public class AssignableRolePlace implements Serializable {
             mappedBy = "assignablePlace"
     )
     @Builder.Default
-    @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     private List<AssignableRole> assignableRoles = new ArrayList<>();
 
     @Column(name = "text")

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/models/database/AssignableRolePlacePost.java

@@ -3,7 +3,6 @@ package dev.sheldan.abstracto.assignableroles.models.database;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -19,8 +18,6 @@ import java.util.List;
 @Getter
 @Setter
 @EqualsAndHashCode
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class AssignableRolePlacePost implements Serializable {
 
     @Id
@@ -50,7 +47,6 @@ public class AssignableRolePlacePost implements Serializable {
             cascade = {CascadeType.PERSIST, CascadeType.MERGE},
             mappedBy = "assignableRolePlacePost")
     @Builder.Default
-    @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     private List<AssignableRole> assignableRoles = new ArrayList<>();
 
 }

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/models/database/AssignedRoleUser.java

@@ -2,7 +2,6 @@ package dev.sheldan.abstracto.assignableroles.models.database;
 
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -18,8 +17,6 @@ import java.util.List;
 @Getter
 @Setter
 @EqualsAndHashCode
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class AssignedRoleUser implements Serializable {
 
     @Id
@@ -35,7 +32,6 @@ public class AssignedRoleUser implements Serializable {
             name = "assigned_role_in_user",
             joinColumns = @JoinColumn(name = "user_in_server_id"),
             inverseJoinColumns = @JoinColumn(name = "assigned_role_id"))
-    @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     @Builder.Default
     private List<AssignableRole> roles = new ArrayList<>();
 

abstracto-application/abstracto-modules/assignable-roles/assignable-roles-int/src/main/java/dev/sheldan/abstracto/assignableroles/service/management/AssignedRoleUserManagementService.java

@@ -10,6 +10,7 @@ import java.util.Optional;
 public interface AssignedRoleUserManagementService {
     void addAssignedRoleToUser(AssignableRole assignableRole, AUserInAServer aUserInAServer);
     void removeAssignedRoleFromUser(AssignableRole assignableRole, AUserInAServer aUserInAServer);
+    void removeAssignedRoleFromUser(AssignableRole assignableRole, AssignedRoleUser user);
     AssignedRoleUser createAssignedRoleUser(AUserInAServer aUserInAServer);
     void clearAllAssignedRolesOfUser(AUserInAServer userInAServer);
     boolean doesAssignedRoleUserExist(AUserInAServer aUserInAServer);