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

[AB-73] refactoring reminder notification model to not use entities

Browse Source
This commit is contained in:
Sheldan
2022-10-06 00:10:32 +02:00
parent e2a7d3b9e8
commit 8ab0eaedda
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/command/Remind.java
View File

@@ -26,6 +26,7 @@ import dev.sheldan.abstracto.core.utils.SnowflakeUtils;
import dev.sheldan.abstracto.remind.config.RemindFeatureDefinition; import dev.sheldan.abstracto.remind.config.RemindFeatureDefinition;
import dev.sheldan.abstracto.remind.config.RemindSlashCommandNames; import dev.sheldan.abstracto.remind.config.RemindSlashCommandNames;
import dev.sheldan.abstracto.remind.model.database.Reminder; import dev.sheldan.abstracto.remind.model.database.Reminder;
import dev.sheldan.abstracto.remind.model.template.commands.ReminderDisplay;
import dev.sheldan.abstracto.remind.model.template.commands.ReminderModel; import dev.sheldan.abstracto.remind.model.template.commands.ReminderModel;
import dev.sheldan.abstracto.remind.payload.JoinReminderPayload; import dev.sheldan.abstracto.remind.payload.JoinReminderPayload;
import dev.sheldan.abstracto.remind.service.ReminderService; import dev.sheldan.abstracto.remind.service.ReminderService;
@@ -86,7 +87,7 @@ public class Remind extends AbstractConditionableCommand {
.remindText(text) .remindText(text)
.memberDisplay(MemberNameDisplay.fromMember(commandContext.getAuthor())) .memberDisplay(MemberNameDisplay.fromMember(commandContext.getAuthor()))
.joinButtonId(joinButtonId) .joinButtonId(joinButtonId)
.reminder(createdReminder) .reminder(ReminderDisplay.fromReminder(createdReminder))
.message(ServerChannelMessage.fromMessage(commandContext.getMessage())) .message(ServerChannelMessage.fromMessage(commandContext.getMessage()))
.build(); .build();
@@ -120,9 +121,8 @@ public class Remind extends AbstractConditionableCommand {
.remindText(reminderText) .remindText(reminderText)
.joinButtonId(joinButtonId) .joinButtonId(joinButtonId)
.memberDisplay(MemberNameDisplay.fromMember(event.getMember())) .memberDisplay(MemberNameDisplay.fromMember(event.getMember()))
.reminder(createdReminder) .reminder(ReminderDisplay.fromReminder(createdReminder))
.build(); .build();
remindModel.setReminder(createdReminder);
JoinReminderPayload payload = JoinReminderPayload JoinReminderPayload payload = JoinReminderPayload
.builder() .builder()

3
abstracto-application/abstracto-modules/remind/remind-int/src/main/java/dev/sheldan/abstracto/remind/model/template/commands/ReminderModel.java
View File

@@ -2,7 +2,6 @@ package dev.sheldan.abstracto.remind.model.template.commands;
import dev.sheldan.abstracto.core.models.ServerChannelMessage; import dev.sheldan.abstracto.core.models.ServerChannelMessage;
import dev.sheldan.abstracto.core.models.template.display.MemberNameDisplay; import dev.sheldan.abstracto.core.models.template.display.MemberNameDisplay;
import dev.sheldan.abstracto.remind.model.database.Reminder;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -13,7 +12,7 @@ import lombok.Setter;
public class ReminderModel { public class ReminderModel {
private String remindText; private String remindText;
private MemberNameDisplay memberDisplay; private MemberNameDisplay memberDisplay;
private Reminder reminder; private ReminderDisplay reminder;
private ServerChannelMessage message; private ServerChannelMessage message;
private String joinButtonId; private String joinButtonId;