christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix Methods

Browse Source
This commit is contained in:
killerber4t
2020-03-12 14:03:48 +01:00
parent 8ddf9f2d64
commit 7b5f70745c
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/service/EventService.java
View File

@ -60,7 +60,7 @@ public class EventService {
return translateEventDTOs(eventDTOS); return translateEventDTOs(eventDTOS);
} }
private List<Event> translateEventDTOs(Iterable<EventDTO> eventDTOS){ public List<Event> translateEventDTOs(Iterable<EventDTO> eventDTOS){
List<Event> events = new ArrayList<>(); List<Event> events = new ArrayList<>();
for (EventDTO eventDTO : eventDTOS) { for (EventDTO eventDTO : eventDTOS) {

2
src/main/java/mops/gruppen2/service/GroupService.java
View File

@ -32,7 +32,7 @@ public class GroupService {
for (Long group_id: group_ids) { for (Long group_id: group_ids) {
eventDTOS.addAll(eventRepository.findEventDTOByGroup_id(group_id)); 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 { public List<Group> projectEventList(Map<Long, Group> groupMap, List<Event> events) throws EventException {

16
src/main/java/mops/gruppen2/service/UserService.java
View File

@ -1,25 +1,27 @@
package mops.gruppen2.service; 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 mops.gruppen2.repository.EventRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Optional;
@Service @Service
public class UserService { public class UserService {
final EventRepository eventRepository; final EventRepository eventRepository;
final GroupService groupService;
public UserService(EventRepository eventRepository) { public UserService(EventRepository eventRepository, GroupService groupService) {
this.eventRepository = eventRepository; 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); List<Long> group_ids = eventRepository.findGroup_idsWhereUser_id(user_id);
List<Event> events = groupService.getGroupEvents(group_ids);
return null; return groupService.projectEventList(events);
} }
} }