From 7b5f70745cd928c6b71cf3926239e8b4c23632d3 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Thu, 12 Mar 2020 14:03:48 +0100
Subject: [PATCH] fix Methods

---
 .../java/mops/gruppen2/service/EventService.java |  2 +-
 .../java/mops/gruppen2/service/GroupService.java |  2 +-
 .../java/mops/gruppen2/service/UserService.java  | 16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/mops/gruppen2/service/EventService.java b/src/main/java/mops/gruppen2/service/EventService.java
index aba10cc..5f8e4fb 100644
--- a/src/main/java/mops/gruppen2/service/EventService.java
+++ b/src/main/java/mops/gruppen2/service/EventService.java
@@ -60,7 +60,7 @@ public class EventService {
         return translateEventDTOs(eventDTOS);
     }
 
-    private List<Event> translateEventDTOs(Iterable<EventDTO> eventDTOS){
+    public List<Event> translateEventDTOs(Iterable<EventDTO> eventDTOS){
         List<Event> events = new ArrayList<>();
 
         for (EventDTO eventDTO : eventDTOS) {
diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index d08b532..57a1fd4 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -32,7 +32,7 @@ public class GroupService {
         for (Long group_id: group_ids) {
             eventDTOS.addAll(eventRepository.findEventDTOByGroup_id(group_id));
         }
-        return null;
+        return events = eventService.translateEventDTOs(eventDTOS);
     }
 
     public List<Group> projectEventList(Map<Long, Group> groupMap, List<Event> events) throws EventException {
diff --git a/src/main/java/mops/gruppen2/service/UserService.java b/src/main/java/mops/gruppen2/service/UserService.java
index e296b67..a767e7a 100644
--- a/src/main/java/mops/gruppen2/service/UserService.java
+++ b/src/main/java/mops/gruppen2/service/UserService.java
@@ -1,25 +1,27 @@
 package mops.gruppen2.service;
 
-import mops.gruppen2.domain.EventDTO;
+import mops.gruppen2.domain.Exceptions.EventException;
+import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.event.Event;
 import mops.gruppen2.repository.EventRepository;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class UserService {
 
     final EventRepository eventRepository;
+    final GroupService groupService;
 
-    public UserService(EventRepository eventRepository) {
+    public UserService(EventRepository eventRepository, GroupService groupService) {
         this.eventRepository = eventRepository;
+        this.groupService = groupService;
     }
 
-    public List<Long> getUserGroups(Long user_id) {
+    public List<Group> getUserGroups(Long user_id) throws EventException {
         List<Long> group_ids = eventRepository.findGroup_idsWhereUser_id(user_id);
-
-        return null;
+        List<Event> events =  groupService.getGroupEvents(group_ids);
+        return groupService.projectEventList(events);
     }
 }