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

Merge remote-tracking branch 'origin/master' into JavaDocComments

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/EventService.java
#	src/main/java/mops/gruppen2/service/UserService.java
This commit is contained in:
[Mahgs]
2020-03-27 14:56:41 +01:00
parent 215a10c8fc e387206205
commit d0114a5a58
32 changed files with 433 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import mops.gruppen2.domain.User;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.GroupNotFoundException;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@ -27,6 +28,7 @@ public class UserService {
* @param user Der User
* @return Liste aus Gruppen
*/
@Cacheable("groups")
public List<Group> getUserGroups(User user) {
List<UUID> groupIds = eventService.findGroupIdsByUser(user.getId());
List<Event> events = groupService.getGroupEvents(groupIds);
@ -43,6 +45,11 @@ public class UserService {
return newGroups;
}
@Cacheable("groups")
public List<Group> getUserGroups(String userId) throws EventException {
return getUserGroups(new User(userId, null, null, null));
}
/**
* Gibt die Gruppe zurück, die zu der übergebenen Id passt.
* @param groupId Die Id der gesuchten Gruppe