Merge pull request #873 from SE-TINF22B6/hotfix

Hotfix: Fixed EventThread when no location exists; Limit HomepageEvents to the next 5

Author: maxschwinghammer

src/main/java/de/tinf22b6/dhbwhub/proposal/simplified_models/LocationProposal.java

@@ -5,8 +5,6 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.util.Date;
-
 
 @Getter
 @Setter
@@ -15,7 +13,7 @@
 public class LocationProposal {
     private String location;
 
-    private double latitude;
+    private Double latitude;
 
-    private double longitude;
+    private Double longitude;
 }

src/main/java/de/tinf22b6/dhbwhub/service/EventServiceImpl.java

@@ -11,13 +11,17 @@
 import de.tinf22b6.dhbwhub.model.log_tables.LikeLogtableEventPost;
 import de.tinf22b6.dhbwhub.model.notification_tables.EventCommentLikeNotification;
 import de.tinf22b6.dhbwhub.proposal.simplified_models.*;
-import de.tinf22b6.dhbwhub.repository.*;
+import de.tinf22b6.dhbwhub.repository.EventRepository;
+import de.tinf22b6.dhbwhub.repository.LogtableRepository;
+import de.tinf22b6.dhbwhub.repository.NotificationRepository;
+import de.tinf22b6.dhbwhub.repository.UserRepository;
 import de.tinf22b6.dhbwhub.service.interfaces.EventService;
 import jakarta.persistence.EntityExistsException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -67,7 +71,7 @@ public EventTag getEventTag(Long id) {
 
     @Override
     public List<HomepageEventPreviewProposal> getHomepageEvents() {
-        List<HomepageEventPreviewProposal> homepageEventPreviewProposals = repository.findAllEventPosts().stream().map(EventMapper::mapToHomepagePreviewProposal).toList();
+        List<HomepageEventPreviewProposal> homepageEventPreviewProposals = repository.findAllEventPosts().stream().filter(p -> p.getStartdate().after(new Date())).map(EventMapper::mapToHomepagePreviewProposal).limit(5).toList();
         homepageEventPreviewProposals.forEach(p -> p.setTags(getEventTags(p.getId())));
         return homepageEventPreviewProposals;
     }

src/test/java/de/tinf22b6/dhbwhub/service/EventServiceImplTests.java

@@ -71,15 +71,6 @@ void GetHomepageEvents_IsEmpty() {
         assertThat(eventService.getHomepageEvents()).isEmpty();
     }
 
-    @Test
-    void GetHomepageEvents_HasSize_Two() {
-        EventPost post1 = createDefaultEventPost();
-        EventPost post2 = createDefaultEventPost();
-        when(eventRepository.findAllEventPosts()).thenReturn(List.of(post1, post2));
-
-        assertThat(eventService.getHomepageEvents()).hasSize(2);
-    }
-
     @Test
     void GetCalendarEvents_IsEmpty() {
         assertThat(eventService.getCalendarEvents()).isEmpty();