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

partial fix search: group is displayed again after leaving

Browse Source 
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
This commit is contained in:
Christoph
2020-03-25 13:56:43 +01:00
parent 8e914d8011
commit 473d58ae3b
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/mops/gruppen2/repository/EventRepository.java
View File

@ -31,4 +31,7 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
@Query("SELECT * FROM event WHERE event_type = :type") @Query("SELECT * FROM event WHERE event_type = :type")
List<EventDTO> findAllEventsByType(@Param("type") String type); List<EventDTO> findAllEventsByType(@Param("type") String type);
@Query("SELECT * FROM event WHERE event_type = :type AND user_id = :userId")
List<EventDTO> findEventsByTypeAndUserId(@Param("type") String type, @Param("userId") String userId);
} }

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

@ -127,13 +127,9 @@ public class EventService {
} }
public List<UUID> findGroupIdsByUser(String userId) { public List<UUID> findGroupIdsByUser(String userId) {
List<String> groupIDs = eventStore.findGroup_idsWhereUser_id(userId); return eventStore.findGroup_idsWhereUser_id(userId).stream()
.map(UUID::fromString)
System.out.println(groupIDs); .collect(Collectors.toList());
return groupIDs.stream()
.map(UUID::fromString)
.collect(Collectors.toList());
} }
} }

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

@ -70,43 +70,43 @@ public class GroupService {
} }
/** /**
* Sucht alle Zeilen in der DB mit visibility=true. * Wird verwendet bei der Suche nach Gruppen: Titel, Beschreibung werden benötigt.
* Erstellt eine Liste aus öffentlichen Gruppen (ohen bereits beigetretenen Gruppen). * Außerdem wird beachtet, ob der eingeloggte User bereits in entsprechenden Gruppen mitglied ist.
* *
* @return Liste von projizierten Gruppen * @return Liste von projizierten Gruppen
* @throws EventException Projektionsfehler * @throws EventException Projektionsfehler
*/ */
public List<Group> getAllGroupWithVisibilityPublic(String userId) throws EventException { public List<Group> getAllGroupWithVisibilityPublic(String userId) throws EventException {
List<Event> createEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent")); List<Event> groupEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent"));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupDescriptionEvent"))); groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupDescriptionEvent")));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent"))); groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent")));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent"))); groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("AddUserEvent"))); groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateUserMaxEvent")));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteUserEvent")));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateUserMaxEvent")));
List<Group> visibleGroups = projectEventList(createEvents);
User user = new User(userId, null, null, null); groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findEventsByTypeAndUserId("AddUserEvent", userId)));
List<UUID> groupIds = eventService.findGroupIdsByUser(user.getId()); groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findEventsByTypeAndUserId("DeleteUserEvent", userId)));
List<Event> events = getGroupEvents(groupIds);
List<Group> groups = projectEventList(events); List<Group> visibleGroups = projectEventList(groupEvents);
List<UUID> userGroupIds = new ArrayList<>();
for (Group group : groups) { User currentUserDummy = new User(userId, null, null, null);
if (group.getMembers().contains(user)) {
userGroupIds.add(group.getId());
}
}
return visibleGroups.parallelStream() return visibleGroups.parallelStream()
.filter(group -> group.getType() != null) .filter(group -> group.getType() != null)
.filter(group -> !userGroupIds.contains(group.getId())) .filter(group -> !group.getMembers().contains(currentUserDummy))
.filter(group -> group.getVisibility() == Visibility.PUBLIC) .filter(group -> group.getVisibility() == Visibility.PUBLIC)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
/**
* Wird verwendet beim Gruppe erstellen bei der Parent-Auswahl: nur Titel benötigt.
*
* @return
* @throws EventException
*/
public List<Group> getAllLecturesWithVisibilityPublic() throws EventException { public List<Group> getAllLecturesWithVisibilityPublic() throws EventException {
List<Event> createEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent")); List<Event> createEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent"));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent"))); createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent")));
List<Group> visibleGroups = projectEventList(createEvents); List<Group> visibleGroups = projectEventList(createEvents);