From b5498ab79a7909edd1951b70cc9fb8ccdfb28018 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Mon, 4 Jul 2022 23:04:39 +0200
Subject: [PATCH] [SIS-7] only showing confirmed meetups in meetup list
 command, fixing #7

---
 .../dev/sheldan/sissi/module/meetup/commands/ListMeetups.java | 2 +-
 .../sissi/module/meetup/repository/MeetupRepository.java      | 1 +
 .../service/management/MeetupManagementServiceBean.java       | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ListMeetups.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ListMeetups.java
index 914281e7..c65e669a 100644
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ListMeetups.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ListMeetups.java
@@ -61,7 +61,7 @@ public class ListMeetups extends AbstractConditionableCommand {
     }
 
     private MessageToSend getMessageToSend(Long serverId) {
-        List<Meetup> meetups = meetupManagementServiceBean.getFutureMeetups();
+        List<Meetup> meetups = meetupManagementServiceBean.getIncomingMeetups();
         List<MeetupListItemModel> listItems = meetups
                 .stream()
                 .map(MeetupListItemModel::fromMeetup)
diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/repository/MeetupRepository.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/repository/MeetupRepository.java
index a9fc84d6..312f21e7 100644
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/repository/MeetupRepository.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/repository/MeetupRepository.java
@@ -13,5 +13,6 @@ import java.util.List;
 public interface MeetupRepository extends JpaRepository<Meetup, ServerSpecificId> {
     List<Meetup> findByMeetupTimeLessThan(Instant date);
     List<Meetup> findByMeetupTimeGreaterThan(Instant date);
+    List<Meetup> findByMeetupTimeGreaterThanAndState(Instant date, MeetupState state);
     List<Meetup> findByState(MeetupState state);
 }
diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/management/MeetupManagementServiceBean.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/management/MeetupManagementServiceBean.java
index eaee103a..6e056e0c 100644
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/management/MeetupManagementServiceBean.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/management/MeetupManagementServiceBean.java
@@ -66,6 +66,10 @@ public class MeetupManagementServiceBean {
         return meetupRepository.findByMeetupTimeGreaterThan(Instant.now());
     }
 
+    public List<Meetup> getIncomingMeetups() {
+        return meetupRepository.findByMeetupTimeGreaterThanAndState(Instant.now(), MeetupState.CONFIRMED);
+    }
+
     public void deleteMeetups(List<Meetup> meetups) {
         meetupRepository.deleteAll(meetups);
     }