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

[AB-72] adding joined reminders to list of reminders

Browse Source 
refactored reminder display to not use entities
This commit is contained in:
Sheldan
2022-10-06 00:01:48 +02:00
parent 8c101793a3
commit e2a7d3b9e8
7 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/abstracto-modules/remind/remind-int/src/main/java/dev/sheldan/abstracto/remind/model/database/ReminderParticipant.java
View File

@@ -29,7 +29,7 @@ public class ReminderParticipant {
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@MapsId("participantUserInServerId")
@JoinColumn(name = "reminder_participant_user_in_server_id", nullable = false)
private AUserInAServer participator;
private AUserInAServer participant;
@ManyToOne(fetch = FetchType.LAZY)

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

@@ -6,10 +6,36 @@ import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import java.time.Instant;
@Getter
@Setter
@Builder
public class ReminderDisplay {
private Reminder reminder;
private Long id;
private Boolean reminded;
private String text;
private Instant targetDate;
private Instant creationDate;
@Builder.Default
private Boolean joined = false;
private ServerChannelMessage message;
public static ReminderDisplay fromReminder(Reminder reminder) {
ServerChannelMessage message = ServerChannelMessage
.builder()
.messageId(reminder.getMessageId())
.channelId(reminder.getChannel().getId())
.serverId(reminder.getServer().getId())
.build();
return ReminderDisplay
.builder()
.creationDate(reminder.getReminderDate())
.targetDate(reminder.getTargetDate())
.id(reminder.getId())
.reminded(reminder.isReminded())
.message(message)
.text(reminder.getText())
.build();
}
}

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

@@ -15,4 +15,6 @@ public interface ReminderParticipantManagementService {
Optional<ReminderParticipant> getReminderParticipant(Reminder reminder, AUserInAServer aUserInAServer);
boolean isReminderParticipator(Reminder reminder, AUserInAServer aUserInAServer);
List<ReminderParticipant> getReminderParticipants(Reminder reminder);
List<ReminderParticipant> getReminders(AUserInAServer participant);
List<ReminderParticipant> getActiveReminders(AUserInAServer participant);
}