Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-12 19:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

added unremind command

Browse Source
This commit is contained in:
Sheldan
2020-05-01 23:24:05 +02:00
parent 70365ca556
commit cf713cc561
10 changed files with 98 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/UnRemind.java Normal file
View File

@@ -0,0 +1,53 @@
package dev.sheldan.abstracto.utility.commands.remind;
import dev.sheldan.abstracto.core.command.UtilityModuleInterface;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
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.utility.config.features.UtilityFeature;
import dev.sheldan.abstracto.utility.service.ReminderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Component
public class UnRemind extends AbstractConditionableCommand {
@Autowired
private ReminderService reminderService;
@Override
public CommandResult execute(CommandContext commandContext) {
Long reminderId = (Long) commandContext.getParameters().getParameters().get(0);
reminderService.unRemind(reminderId, commandContext.getUserInitiatedContext().getAUserInAServer());
return CommandResult.fromSuccess();
}
@Override
public CommandConfiguration getConfiguration() {
List<Parameter> parameters = new ArrayList<>();
parameters.add(Parameter.builder().name("reminderId").type(Long.class).build());
HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
return CommandConfiguration.builder()
.name("unRemind")
.module(UtilityModuleInterface.UTILITY)
.templated(true)
.causesReaction(true)
.parameters(parameters)
.help(helpInfo)
.build();
}
@Override
public FeatureEnum getFeature() {
return UtilityFeature.REMIND;
}
}

3
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/ReminderRepository.java
View File

@@ -14,4 +14,7 @@ public interface ReminderRepository extends JpaRepository<Reminder, Long> {
@QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
List<Reminder> getByRemindedUserAndRemindedFalse(AUserInAServer aUserInAServer);
@QueryHints(@QueryHint(name = org.hibernate.annotations.QueryHints.CACHEABLE, value = "true"))
Reminder getByIdAndRemindedUserAndRemindedFalse(Long reminderId, AUserInAServer aUserInAServer);
}

22
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/RemindServiceBean.java
View File

@@ -1,5 +1,6 @@
package dev.sheldan.abstracto.utility.service;
import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
import dev.sheldan.abstracto.core.models.AServerAChannelAUser;
@@ -88,7 +89,9 @@ public class RemindServiceBean implements ReminderService {
log.trace("Starting scheduled job to execute reminder.");
JobDataMap parameters = new JobDataMap();
parameters.putAsString("reminderId", reminder.getId());
schedulerService.executeJobWithParametersOnce("reminderJob", "utility", parameters, Date.from(reminder.getTargetDate()));
String triggerKey = schedulerService.executeJobWithParametersOnce("reminderJob", "utility", parameters, Date.from(reminder.getTargetDate()));
reminder.setJobTriggerKey(triggerKey);
reminderManagementService.saveReminder(reminder);
}
}
@@ -96,6 +99,9 @@ public class RemindServiceBean implements ReminderService {
@Transactional
public void executeReminder(Long reminderId) {
Reminder reminderToRemindFor = reminderManagementService.loadReminder(reminderId);
if(reminderToRemindFor.isReminded()) {
return;
}
AServer server = reminderToRemindFor.getServer();
AChannel channel = reminderToRemindFor.getChannel();
log.info("Executing reminder {}.", reminderId);
@@ -123,4 +129,18 @@ public class RemindServiceBean implements ReminderService {
}
reminderManagementService.setReminded(reminderToRemindFor);
}
@Override
public void unRemind(Long reminderId, AUserInAServer aUserInAServer) {
Reminder reminder = reminderManagementService.getReminderByAndByUserNotReminded(aUserInAServer, reminderId);
if(reminder != null) {
reminder.setReminded(true);
if(reminder.getJobTriggerKey() != null) {
schedulerService.stopTrigger(reminder.getJobTriggerKey());
}
reminderManagementService.saveReminder(reminder);
} else {
throw new AbstractoRunTimeException("Reminder does not exist, was already reminded or does not belong to you.");
}
}
}

11
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementServiceBean.java
View File

@@ -44,9 +44,20 @@ public class ReminderManagementServiceBean implements ReminderManagementService
reminderRepository.save(reminder);
}
@Override
public Reminder saveReminder(Reminder reminder) {
return reminderRepository.save(reminder);
}
@Override
public List<Reminder> getActiveRemindersForUser(AUserInAServer aUserInAServer) {
return reminderRepository.getByRemindedUserAndRemindedFalse(aUserInAServer);
}
@Override
public Reminder getReminderByAndByUserNotReminded(AUserInAServer aUserInAServer, Long reminderId) {
return reminderRepository.getByIdAndRemindedUserAndRemindedFalse(reminderId, aUserInAServer);
}
}

4
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Reminder.java
View File

@@ -56,6 +56,10 @@ public class Reminder {
@Getter
private boolean reminded;
@Getter
@Setter
private String jobTriggerKey;
@Override
public boolean equals(Object o) {
if (this == o) return true;

1
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/ReminderService.java
View File

@@ -8,4 +8,5 @@ import java.time.Duration;
public interface ReminderService {
void createReminderInForUser(AUserInAServer user, String remindText, Duration remindIn, ReminderModel reminderModel);
void executeReminder(Long reminderId);
void unRemind(Long reminderId, AUserInAServer userInAServer);
}

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementService.java
View File

@@ -11,5 +11,7 @@ public interface ReminderManagementService {
Reminder createReminder(AServerAChannelAUser userToBeReminded, String text, Instant timeToBeRemindedAt, Long messageId);
Reminder loadReminder(Long reminderId);
void setReminded(Reminder reminder);
Reminder saveReminder(Reminder reminder);
List<Reminder> getActiveRemindersForUser(AUserInAServer aUserInAServer);
Reminder getReminderByAndByUserNotReminded(AUserInAServer aUserInAServer, Long reminderId);
}

1
abstracto-application/template-config/src/main/resources/templates/en_US/commands/utility/unRemind/help/unRemind_description_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
Cancels the given reminder.

1
abstracto-application/template-config/src/main/resources/templates/en_US/commands/utility/unRemind/help/unRemind_long_help_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
Cancels the given reminder to not be executed anymore.

1
abstracto-application/template-config/src/main/resources/templates/en_US/commands/utility/unRemind/help/unRemind_usage_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
unRemind <reminderId>