From 528ca1a2c051c30bb3f1d7dc088bece669095384 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Thu, 12 Mar 2020 14:46:41 +0100
Subject: [PATCH] refactor projecteventlist

---
 .../mops/gruppen2/service/GroupService.java   | 20 ++++++++++++++-----
 .../gruppen2/service/GroupServiceTest.java    |  1 -
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index 867d95e..f6b7fac 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -1,12 +1,10 @@
 package mops.gruppen2.service;
 
-import lombok.EqualsAndHashCode;
+import mops.gruppen2.domain.EventDTO;
 import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.GroupDoesNotExistException;
 import mops.gruppen2.domain.Group;
-import mops.gruppen2.domain.event.CreateGroupEvent;
-import mops.gruppen2.domain.event.DeleteGroupEvent;
 import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.repository.EventRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -18,11 +16,23 @@ import java.util.Map;
 public class GroupService {
 
     private final EventService eventService;
+    private final EventRepository eventRepository;
 
-    public GroupService(EventService eventService) {
+    public GroupService(EventService eventService, EventRepository eventRepository) {
         this.eventService = eventService;
+        this.eventRepository = eventRepository;
     }
 
+    public List<Event> getGroupEvents(List<Long> group_ids) {
+        List<EventDTO> eventDTOS = new ArrayList<>();
+        List<Event> events = new ArrayList<>();
+        for (Long group_id: group_ids) {
+            eventDTOS.addAll(eventRepository.findEventDTOByGroup_id(group_id));
+        }
+        return events = eventService.translateEventDTOs(eventDTOS);
+    }
+
+
 
     public List<Group> projectEventList(List<Event> events) throws EventException {
         Map<Long, Group> groupMap = new HashMap<>();
diff --git a/src/test/java/mops/gruppen2/service/GroupServiceTest.java b/src/test/java/mops/gruppen2/service/GroupServiceTest.java
index a3bdfaa..8396b95 100644
--- a/src/test/java/mops/gruppen2/service/GroupServiceTest.java
+++ b/src/test/java/mops/gruppen2/service/GroupServiceTest.java
@@ -67,5 +67,4 @@ class GroupServiceTest {
 
         assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class);
     }
-
 }
\ No newline at end of file