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

slight changes

Browse Source 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
This commit is contained in:
Christoph
2020-03-25 15:57:07 +01:00
parent ed4a9b5728
commit f0e49dfc55
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ import mops.gruppen2.security.Account;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -87,7 +86,7 @@ public class GroupService {
sortByGroupType(visibleGroups); sortByGroupType(visibleGroups);
return visibleGroups.parallelStream() return visibleGroups.stream()
.filter(group -> group.getType() != null) .filter(group -> group.getType() != null)
.filter(group -> !eventService.userInGroup(group.getId(), userId)) .filter(group -> !eventService.userInGroup(group.getId(), userId))
.filter(group -> group.getVisibility() == Visibility.PUBLIC) .filter(group -> group.getVisibility() == Visibility.PUBLIC)
@ -107,7 +106,7 @@ public class GroupService {
List<Group> visibleGroups = projectEventList(createEvents); List<Group> visibleGroups = projectEventList(createEvents);
return visibleGroups.parallelStream() return visibleGroups.stream()
.filter(group -> group.getType() != null) .filter(group -> group.getType() != null)
.filter(group -> group.getType() == GroupType.LECTURE) .filter(group -> group.getType() == GroupType.LECTURE)
.filter(group -> group.getVisibility() == Visibility.PUBLIC) .filter(group -> group.getVisibility() == Visibility.PUBLIC)
@ -130,25 +129,21 @@ public class GroupService {
return getAllGroupWithVisibilityPublic(account.getName()) return getAllGroupWithVisibilityPublic(account.getName())
.parallelStream() .parallelStream()
.filter(group -> .filter(group -> group.getTitle().toLowerCase().contains(search.toLowerCase())
group.getTitle().toLowerCase().contains(search.toLowerCase()) || || group.getDescription().toLowerCase().contains(search.toLowerCase()))
group.getDescription().toLowerCase().contains(search.toLowerCase()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public void sortByGroupType(List<Group> groups) { public void sortByGroupType(List<Group> groups) {
groups.sort(new Comparator<Group>() { groups.sort((g1, g2) -> {
@Override if (g1.getType() == GroupType.LECTURE) {
public int compare(Group g1, Group g2) { return -1;
if (g1.getType() == GroupType.LECTURE) {
return -1;
}
if (g2.getType() == GroupType.LECTURE) {
return 0;
}
return 1;
} }
if (g2.getType() == GroupType.LECTURE) {
return 0;
}
return 1;
}); });
} }
} }