[AB-68] adding invite filter with commands to allow/disallow invites, remove stored filtered invite links and show filtered invite links

removing database entities from command context

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/Remind.java

@@ -9,6 +9,7 @@ import dev.sheldan.abstracto.core.command.execution.*;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.utility.config.features.UtilityFeature;
 import dev.sheldan.abstracto.utility.models.database.Reminder;
@@ -35,12 +36,15 @@ public class Remind extends AbstractConditionableCommand {
     @Autowired
     private ChannelService channelService;
 
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         List<Object> parameters = commandContext.getParameters().getParameters();
         Duration remindTime = (Duration) parameters.get(0);
         String text = (String) parameters.get(1);
-        AUserInAServer aUserInAServer = commandContext.getUserInitiatedContext().getAUserInAServer();
+        AUserInAServer aUserInAServer = userInServerManagementService.loadUser(commandContext.getAuthor());
         ReminderModel remindModel = (ReminderModel) ContextConverter.fromCommandContext(commandContext, ReminderModel.class);
         remindModel.setRemindText(text);
         Reminder createdReminder = remindService.createReminderInForUser(aUserInAServer, text, remindTime, commandContext.getMessage());

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/Reminders.java

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.execution.ContextConverter;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.utility.config.features.UtilityFeature;
 import dev.sheldan.abstracto.utility.models.database.Reminder;
@@ -33,10 +34,12 @@ public class Reminders extends AbstractConditionableCommand {
     @Autowired
     private ChannelService channelService;
 
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
 
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
-        AUserInAServer aUserInAServer = commandContext.getUserInitiatedContext().getAUserInAServer();
+        AUserInAServer aUserInAServer = userInServerManagementService.loadUser(commandContext.getAuthor());
         List<Reminder> activeReminders = reminderManagementService.getActiveRemindersForUser(aUserInAServer);
         RemindersModel model = (RemindersModel) ContextConverter.fromCommandContext(commandContext, RemindersModel.class);
         model.setReminders(activeReminders);

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/UnRemind.java

@@ -10,6 +10,7 @@ import dev.sheldan.abstracto.core.command.config.validator.MinIntegerValueValida
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
 import dev.sheldan.abstracto.core.config.FeatureEnum;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.utility.config.features.UtilityFeature;
 import dev.sheldan.abstracto.utility.service.ReminderService;
 import lombok.extern.slf4j.Slf4j;
@@ -27,10 +28,13 @@ public class UnRemind extends AbstractConditionableCommand {
     @Autowired
     private ReminderService reminderService;
 
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
     @Override
     public CommandResult execute(CommandContext commandContext) {
         Long reminderId = (Long) commandContext.getParameters().getParameters().get(0);
-        reminderService.unRemind(reminderId, commandContext.getUserInitiatedContext().getAUserInAServer());
+        reminderService.unRemind(reminderId, userInServerManagementService.loadUser(commandContext.getAuthor()));
         return CommandResult.fromSuccess();
     }
 

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedServiceBean.java

@@ -3,8 +3,6 @@ package dev.sheldan.abstracto.utility.service;
 import dev.sheldan.abstracto.core.models.template.listener.MessageEmbeddedModel;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
-import dev.sheldan.abstracto.core.models.database.AChannel;
-import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.BotService;
 import dev.sheldan.abstracto.core.service.ChannelService;
@@ -152,21 +150,14 @@ public class MessageEmbedServiceBean implements MessageEmbedService {
 
     @Transactional
     public MessageEmbeddedModel loadMessageEmbedModel(Message message, CachedMessage embeddedMessage, Member member) {
-        AServer server = serverManagementService.loadOrCreate(message.getGuild().getIdLong());
-        AUserInAServer user = userInServerManagementService.loadUser(message.getMember());
         Optional<TextChannel> textChannelFromServer = botService.getTextChannelFromServerOptional(embeddedMessage.getServerId(), embeddedMessage.getChannelId());
         TextChannel sourceChannel = textChannelFromServer.orElse(null);
-        AChannel channel = channelManagementService.loadChannel(message.getChannel().getIdLong());
         return MessageEmbeddedModel
                 .builder()
-                .channel(channel)
-                .server(server)
                 .member(message.getMember())
-                .aUserInAServer(user)
                 .author(member)
                 .sourceChannel(sourceChannel)
                 .embeddingUser(message.getMember())
-                .user(user.getUserReference())
                 .messageChannel(message.getChannel())
                 .guild(message.getGuild())
                 .embeddedMessage(embeddedMessage)

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java

@@ -131,7 +131,6 @@ public class StarboardServiceBean implements StarboardService {
             // TODO use model objects instead of building entity models
             AChannel aChannel = AChannel.builder().id(message.getChannelId()).build();
             AUser user = AUser.builder().id(message.getAuthor().getAuthorId()).build();
-            AServer server = AServer.builder().id(message.getServerId()).build();
             String starLevelEmote = getAppropriateEmote(message.getServerId(), starCount);
             return StarboardPostModel
                     .builder()
@@ -142,7 +141,6 @@ public class StarboardServiceBean implements StarboardService {
                     .starCount(starCount)
                     .guild(guild.orElse(null))
                     .user(user)
-                    .server(server)
                     .starLevelEmote(starLevelEmote)
                     .build();
         });

abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java

@@ -1,7 +1,9 @@
 package dev.sheldan.abstracto.utility.service;
 
+import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.CounterService;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
@@ -61,12 +63,17 @@ public class SuggestionServiceBean implements SuggestionService {
     @Autowired
     private CounterService counterService;
 
+    @Autowired
+    private ServerManagementService serverManagementService;
+
     @Override
     public CompletableFuture<Void> createSuggestionMessage(Member member, String text, SuggestionLog suggestionLog)  {
-        Long newSuggestionId = counterService.getNextCounterValue(suggestionLog.getServer(), SUGGESTION_COUNTER_KEY);
+        AServer server = serverManagementService.loadServer(member.getGuild());
+        AUserInAServer suggester = userInServerManagementService.loadUser(member);
+        Long newSuggestionId = counterService.getNextCounterValue(server, SUGGESTION_COUNTER_KEY);
         suggestionLog.setSuggestionId(newSuggestionId);
         suggestionLog.setState(SuggestionState.NEW);
-        suggestionLog.setSuggesterUser(suggestionLog.getAUserInAServer());
+        suggestionLog.setSuggesterUser(suggester);
         suggestionLog.setText(text);
         MessageToSend messageToSend = templateService.renderEmbedTemplate(SUGGESTION_LOG_TEMPLATE, suggestionLog);
         long guildId = member.getGuild().getIdLong();
@@ -136,7 +143,7 @@ public class SuggestionServiceBean implements SuggestionService {
             suggestionLog.setReason(text);
             suggestionLog.setText(suggestionEmbed.getDescription());
             MessageToSend messageToSend = templateService.renderEmbedTemplate(SUGGESTION_LOG_TEMPLATE, suggestionLog);
-            List<CompletableFuture<Message>> completableFutures = postTargetService.sendEmbedInPostTarget(messageToSend, SuggestionPostTarget.SUGGESTION, suggestionLog.getServer().getId());
+            List<CompletableFuture<Message>> completableFutures = postTargetService.sendEmbedInPostTarget(messageToSend, SuggestionPostTarget.SUGGESTION, suggestionLog.getGuild().getIdLong());
             return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0]));
         } else {
             log.warn("The message to update the suggestion for, did not contain an embed to update. Suggestions require an embed with a description as a container. MessageURL: {}", message.getJumpUrl());

abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/migrations/1.0-utility/utility-seedData/command.xml

@@ -155,6 +155,12 @@
             <column name="feature_id" valueComputed="${entertainmentFeature}"/>
             <column name="created" valueComputed="${today}"/>
         </insert>
+        <insert tableName="command">
+            <column name="name" value="choose"/>
+            <column name="module_id" valueComputed="${entertainmentModule}"/>
+            <column name="feature_id" valueComputed="${entertainmentFeature}"/>
+            <column name="created" valueComputed="${today}"/>
+        </insert>
     </changeSet>
 
 </databaseChangeLog>

abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/migrations/1.0-utility/utility-seedData/data.xml

@@ -11,6 +11,7 @@
     <include file="feature.xml" relativeToChangelogFile="true"/>
     <include file="default_feature_flag.xml" relativeToChangelogFile="true"/>
     <include file="default_posttarget.xml" relativeToChangelogFile="true"/>
+    <include file="module.xml" relativeToChangelogFile="true"/>
     <include file="command.xml" relativeToChangelogFile="true"/>
     <include file="reminder_job.xml" relativeToChangelogFile="true"/>
     <include file="default_feature_mode.xml" relativeToChangelogFile="true"/>

abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/commands/StarStatsTest.java

@@ -32,7 +32,6 @@ public class StarStatsTest {
     @Test
     public void executeCommand() {
         CommandContext noParameters = CommandTestUtilities.getNoParameters();
-        when(noParameters.getGuild().getIdLong()).thenReturn(noParameters.getUserInitiatedContext().getChannel().getId());
         StarStatsModel starStatsModel = StarStatsModel.builder().build();
         when(starboardService.retrieveStarStats(noParameters.getGuild().getIdLong())).thenReturn(CompletableFuture.completedFuture(starStatsModel));
         CompletableFuture<CommandResult> result = testUnit.executeAsync(noParameters);

abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/commands/remind/RemindTest.java

@@ -2,7 +2,9 @@ package dev.sheldan.abstracto.utility.commands.remind;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
 import dev.sheldan.abstracto.utility.models.template.commands.reminder.ReminderModel;
@@ -10,10 +12,7 @@ import dev.sheldan.abstracto.utility.service.ReminderService;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
+import org.mockito.*;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.time.Duration;
@@ -34,6 +33,9 @@ public class RemindTest {
     @Mock
     private ChannelService channelService;
 
+    @Mock
+    private UserInServerManagementService userInServerManagementService;
+
     @Captor
     private ArgumentCaptor<ReminderModel> captor;
 
@@ -42,8 +44,10 @@ public class RemindTest {
         String reminderText = "text";
         Duration duration = Duration.ofMinutes(10);
         CommandContext withParameters = CommandTestUtilities.getWithParameters(Arrays.asList(duration, reminderText));
+        AUserInAServer user = Mockito.mock(AUserInAServer.class);
+        when(userInServerManagementService.loadUser(withParameters.getAuthor())).thenReturn(user);
         CompletableFuture<CommandResult> result = testUnit.executeAsync(withParameters);
-        verify(remindService, times(1)).createReminderInForUser(withParameters.getUserInitiatedContext().getAUserInAServer(), reminderText, duration, withParameters.getMessage());
+        verify(remindService, times(1)).createReminderInForUser(user, reminderText, duration, withParameters.getMessage());
         verify(channelService, times(1)).sendEmbedTemplateInChannel(eq(Remind.REMINDER_EMBED_KEY), captor.capture(), eq(withParameters.getChannel()));
         ReminderModel reminderModel = captor.getValue();
         Assert.assertEquals(reminderText, reminderModel.getRemindText());

abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/commands/remind/RemindersTest.java

@@ -2,7 +2,9 @@ package dev.sheldan.abstracto.utility.commands.remind;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
 import dev.sheldan.abstracto.utility.models.database.Reminder;
@@ -11,10 +13,7 @@ import dev.sheldan.abstracto.utility.service.management.ReminderManagementServic
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
+import org.mockito.*;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Arrays;
@@ -35,6 +34,9 @@ public class RemindersTest {
     @Mock
     private ChannelService channelService;
 
+    @Mock
+    private UserInServerManagementService userInServerManagementService;
+
     @Captor
     private ArgumentCaptor<RemindersModel> modelCaptor;
 
@@ -44,7 +46,9 @@ public class RemindersTest {
         Reminder reminder = Reminder.builder().build();
         Reminder secondReminder = Reminder.builder().build();
         List<Reminder> reminders = Arrays.asList(reminder, secondReminder);
-        when(reminderManagementService.getActiveRemindersForUser(context.getUserInitiatedContext().getAUserInAServer())).thenReturn(reminders);
+        AUserInAServer user = Mockito.mock(AUserInAServer.class);
+        when(userInServerManagementService.loadUser(context.getAuthor())).thenReturn(user);
+        when(reminderManagementService.getActiveRemindersForUser(user)).thenReturn(reminders);
         CompletableFuture<CommandResult> result = testUnit.executeAsync(context);
         verify(channelService, times(1)).sendEmbedTemplateInChannel(eq(Reminders.REMINDERS_RESPONSE_TEMPLATE), modelCaptor.capture(), eq(context.getChannel()));
         RemindersModel usedModel = modelCaptor.getValue();

abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/commands/remind/UnRemindTest.java

@@ -2,6 +2,8 @@ package dev.sheldan.abstracto.utility.commands.remind;
 
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
 import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
 import dev.sheldan.abstracto.utility.service.ReminderService;
@@ -9,6 +11,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Arrays;
@@ -24,12 +27,17 @@ public class UnRemindTest {
     @Mock
     private ReminderService reminderService;
 
+    @Mock
+    private UserInServerManagementService userInServerManagementService;
+
     @Test
     public void testExecuteCommand() {
         Long reminderId = 6L;
         CommandContext withParameters = CommandTestUtilities.getWithParameters(Arrays.asList(reminderId));
+        AUserInAServer user = Mockito.mock(AUserInAServer.class);
+        when(userInServerManagementService.loadUser(withParameters.getAuthor())).thenReturn(user);
         CommandResult result = testUnit.execute(withParameters);
-        verify(reminderService, times(1)).unRemind(reminderId, withParameters.getUserInitiatedContext().getAUserInAServer());
+        verify(reminderService, times(1)).unRemind(reminderId, user);
         CommandTestUtilities.checkSuccessfulCompletion(result);
     }
 

abstracto-application/abstracto-modules/utility/utility-impl/src/test/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBeanTest.java

@@ -10,6 +10,8 @@ import dev.sheldan.abstracto.core.service.BotService;
 import dev.sheldan.abstracto.core.service.CounterService;
 import dev.sheldan.abstracto.core.service.MessageService;
 import dev.sheldan.abstracto.core.service.PostTargetService;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.templating.service.TemplateService;
 import dev.sheldan.abstracto.utility.config.posttargets.SuggestionPostTarget;
@@ -74,6 +76,12 @@ public class SuggestionServiceBeanTest {
     @Mock
     private CounterService counterService;
 
+    @Mock
+    private UserInServerManagementService userInServerManagementService;
+
+    @Mock
+    private ServerManagementService serverManagementService;
+
     @Mock
     private AServer server;
 
@@ -98,14 +106,16 @@ public class SuggestionServiceBeanTest {
     public void testCreateSuggestionMessage() {
         String suggestionText = "text";
         SuggestionLog log = Mockito.mock(SuggestionLog.class);
-        when(log.getServer()).thenReturn(server);
         when(suggestionCreator.getGuild()).thenReturn(guild);
         when(guild.getIdLong()).thenReturn(SERVER_ID);
         when(guild.getIdLong()).thenReturn(SERVER_ID);
+        when(serverManagementService.loadServer(suggestionCreator.getGuild())).thenReturn(server);
         MessageToSend messageToSend = MessageToSend.builder().build();
         when(templateService.renderEmbedTemplate(eq(SuggestionServiceBean.SUGGESTION_LOG_TEMPLATE), any(SuggestionLog.class))).thenReturn(messageToSend);
         Message suggestionMessage = Mockito.mock(Message.class);
         when(counterService.getNextCounterValue(server, SUGGESTION_COUNTER_KEY)).thenReturn(SUGGESTION_ID);
+        AUserInAServer aUserInAServer = Mockito.mock(AUserInAServer.class);
+        when(userInServerManagementService.loadUser(suggestionCreator)).thenReturn(aUserInAServer);
         List<CompletableFuture<Message>> postingFutures = Arrays.asList(CompletableFuture.completedFuture(suggestionMessage));
         when(postTargetService.sendEmbedInPostTarget(messageToSend, SuggestionPostTarget.SUGGESTION, SERVER_ID)).thenReturn(postingFutures);
         testUnit.createSuggestionMessage(suggestionCreator, suggestionText, log);
@@ -170,17 +180,18 @@ public class SuggestionServiceBeanTest {
 
     @Test
     public void testUpdateSuggestionMessageWithEmbed() {
-        SuggestionLog log = SuggestionLog.builder().server(server).build();
+        SuggestionLog log = Mockito.mock(SuggestionLog.class);
+        when(log.getGuild()).thenReturn(guild);
         MessageEmbed embed = Mockito.mock(MessageEmbed.class);
         when(embed.getDescription()).thenReturn("description");
         Message suggestionMessage = Mockito.mock(Message.class);
         when(suggestionMessage.getGuild()).thenReturn(guild);
-        when(guild.getId()).thenReturn("8");
+        when(guild.getIdLong()).thenReturn(SERVER_ID);
         when(suggestionMessage.getEmbeds()).thenReturn(Arrays.asList(embed));
         MessageToSend updatedMessage = MessageToSend.builder().build();
         when(templateService.renderEmbedTemplate(eq(SuggestionServiceBean.SUGGESTION_LOG_TEMPLATE), any(SuggestionLog.class))).thenReturn(updatedMessage);
         testUnit.updateSuggestionMessageText(CLOSING_TEXT, log, suggestionMessage);
-        verify(postTargetService, times(1)).sendEmbedInPostTarget(updatedMessage, SuggestionPostTarget.SUGGESTION, server.getId());
+        verify(postTargetService, times(1)).sendEmbedInPostTarget(updatedMessage, SuggestionPostTarget.SUGGESTION, SERVER_ID);
     }
 
     @Test