added concept of undo actions

used undo actions to delete the mod mail thread channel, if it already reached a certain state when initially setting up the mod mail thread
This commit is contained in:
Sheldan
2020-05-09 00:19:19 +02:00
parent 271ea7364a
commit 379db1ff73
8 changed files with 129 additions and 12 deletions

View File

@@ -168,11 +168,16 @@ public class ChannelServiceBean implements ChannelService {
@Override
public CompletableFuture<Void> deleteTextChannel(AChannel channel) {
TextChannel textChannelById = botService.getInstance().getTextChannelById(channel.getId());
return deleteTextChannel(channel.getServer().getId(), channel.getId());
}
@Override
public CompletableFuture<Void> deleteTextChannel(Long serverId, Long channelId) {
TextChannel textChannelById = botService.getInstance().getTextChannelById(channelId);
if(textChannelById != null) {
return textChannelById.delete().submit();
}
throw new ChannelException(String.format("Failed to delete channel %s in server %s", channel.getId(), channel.getServer().getId()));
throw new ChannelException(String.format("Failed to delete channel %s in server %s", channelId, serverId));
}
@Override

View File

@@ -0,0 +1,43 @@
package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.exception.UndoActionException;
import dev.sheldan.abstracto.core.models.UndoAction;
import dev.sheldan.abstracto.core.models.UndoActionInstance;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@Slf4j
public class UndoActionServiceBean implements UndoActionService {
@Autowired
private BotService botService;
@Autowired
private ChannelService channelService;
@Override
public void performActions(List<UndoActionInstance> actionsToPerform) {
actionsToPerform.forEach(undoActionInstance -> {
UndoAction action = undoActionInstance.getAction();
switch (action) {
case DELETE_CHANNEL:
if(undoActionInstance.getIds().size() != 2) {
throw new UndoActionException("Not the correct amount of ides provided for the channel deletion undo action");
}
deleteChannel(undoActionInstance.getIds().get(0), undoActionInstance.getIds().get(1));
break;
}
});
}
private void deleteChannel(Long serverId, Long channelId) {
channelService.deleteTextChannel(serverId, channelId).exceptionally((throwable) -> {
log.error("Failed to execute undo action channel delete for channel {} in server {}", channelId, serverId, throwable);
return null;
});
}
}

View File

@@ -0,0 +1,7 @@
package dev.sheldan.abstracto.core.exception;
public class UndoActionException extends AbstractoRunTimeException {
public UndoActionException(String message) {
super(message);
}
}

View File

@@ -0,0 +1,5 @@
package dev.sheldan.abstracto.core.models;
public enum UndoAction {
DELETE_CHANNEL, DELETE_MESSAGE
}

View File

@@ -0,0 +1,24 @@
package dev.sheldan.abstracto.core.models;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import java.util.Arrays;
import java.util.List;
@Getter
@Builder
@Setter
public class UndoActionInstance {
private List<Long> ids;
private UndoAction action;
public static UndoActionInstance getChannelDeleteAction(Long channelId, Long serverId) {
return UndoActionInstance
.builder()
.action(UndoAction.DELETE_CHANNEL)
.ids(Arrays.asList(serverId, channelId))
.build();
}
}

View File

@@ -27,6 +27,7 @@ public interface ChannelService {
void editMessageInAChannel(MessageToSend messageToSend, AChannel channel, Long messageId);
void editMessageInAChannel(MessageToSend messageToSend, MessageChannel channel, Long messageId);
CompletableFuture<Void> deleteTextChannel(AChannel channel);
CompletableFuture<Void> deleteTextChannel(Long serverId, Long channelId);
List<CompletableFuture<Message>> sendTemplateInChannel(String templateKey, Object model, MessageChannel channel);
CompletableFuture<TextChannel> createTextChannel(String name, AServer server, Long categoryId);

View File

@@ -0,0 +1,9 @@
package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.models.UndoActionInstance;
import java.util.List;
public interface UndoActionService {
void performActions(List<UndoActionInstance> actionsToPerform);
}