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

cleanup of the search function

Browse Source
This commit is contained in:
AndiBuls
2020-03-18 15:25:37 +01:00
parent 2b1d6507e6
commit 22172b5406
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,12 +72,10 @@ public class GroupService {
return groups.get(group_id); return groups.get(group_id);
} }
private List<Long> removeUserGroups(List<Long> group_ids, List<Long> user_groups){ private List<Long> removeUserGroups(List<Long> group_ids, List<Long> user_groups) {
for (Long group_id: user_groups) { for (Long group_id: user_groups) {
if(group_ids.contains(group_id)){
group_ids.remove(group_id); group_ids.remove(group_id);
} }
}
return group_ids; return group_ids;
} }
@ -88,7 +86,8 @@ public class GroupService {
* @throws EventException * @throws EventException
*/ */
public List<Group> getAllGroupWithVisibilityPublic(String user_id) throws EventException { public List<Group> getAllGroupWithVisibilityPublic(String user_id) throws EventException {
List<EventDTO> eventDTOS = eventRepository.findAllEventsOfGroups(removeUserGroups(eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE), eventRepository.findGroup_idsWhereUser_id(user_id))); List<Long> group_ids = removeUserGroups(eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE), eventRepository.findGroup_idsWhereUser_id(user_id));
List<EventDTO> eventDTOS = eventRepository.findAllEventsOfGroups(group_ids);
List<Event> events = eventService.translateEventDTOs(eventDTOS); List<Event> events = eventService.translateEventDTOs(eventDTOS);
List<Group> groups = projectEventList(events); List<Group> groups = projectEventList(events);
return groups; return groups;