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

refactor projecteventlist

Browse Source
This commit is contained in:
killerber4t
2020-03-12 14:46:41 +01:00
parent 13e1cf0e36
commit 528ca1a2c0
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,10 @@
package mops.gruppen2.service; package mops.gruppen2.service;
import lombok.EqualsAndHashCode; import mops.gruppen2.domain.EventDTO;
import mops.gruppen2.domain.Exceptions.EventException; import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.GroupDoesNotExistException;
import mops.gruppen2.domain.Group; 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.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@ -18,11 +16,23 @@ import java.util.Map;
public class GroupService { public class GroupService {
private final EventService eventService; private final EventService eventService;
private final EventRepository eventRepository;
public GroupService(EventService eventService) { public GroupService(EventService eventService, EventRepository eventRepository) {
this.eventService = eventService; 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 { public List<Group> projectEventList(List<Event> events) throws EventException {
Map<Long, Group> groupMap = new HashMap<>(); Map<Long, Group> groupMap = new HashMap<>();

1
src/test/java/mops/gruppen2/service/GroupServiceTest.java
View File

@ -67,5 +67,4 @@ class GroupServiceTest {
assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class); assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class);
} }
} }