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

Merge remote-tracking branch 'origin/master' into group-invite-links

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
This commit is contained in:
[Mahgs]
2020-03-18 13:18:34 +01:00
parent aa67bd2e88 e412c051f7
commit 722cd80831
25 changed files with 303 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -4,6 +4,7 @@ import mops.gruppen2.config.Gruppen2Config;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.security.Account;
import mops.gruppen2.service.*;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
@ -55,8 +56,8 @@ public class Gruppen2Controller {
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
model.addAttribute("gruppen", userService.getUserGroups(user.getUser_id()));
model.addAttribute("user", user);
model.addAttribute("gruppen", userService.getUserGroups(user));
model.addAttribute("user",user);
return "index";
}
@ -107,6 +108,15 @@ public class Gruppen2Controller {
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@PostMapping("/detailsBeitreten")
public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "id") Long id) throws EventException {
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
Account account = keyCloakService.createAccountFromPrincipal (token);
controllerService.addUser(account,id);
return "redirect:/gruppen2/";
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@GetMapping("/detailsSearch")
public String showGroupDetailsNoMember(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "id") Long id) throws EventException {
@ -130,4 +140,11 @@ public class Gruppen2Controller {
}
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
}
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@PostMapping("/leaveGroup")
public String pLeaveGroup(KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) {
Account account = keyCloakService.createAccountFromPrincipal(token);
controllerService.deleteUser(account, id);
return "redirect:/gruppen2/";
}
}

42
src/main/java/mops/gruppen2/domain/Aggregate.java
View File

@ -1,42 +0,0 @@
package mops.gruppen2.domain;
import com.google.common.base.Throwables;
import lombok.Getter;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.event.Event;
import javax.swing.table.TableRowSorter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import static java.lang.String.format;
/**
* Repräsentiert viele Events als aggregiertes Objekt.
*/
@Getter
public abstract class Aggregate {
protected long id;
/**
* Ruft die spezifische applyEvent-Methode im entsprechenden Aggregat auf.
*
* @param event Event, welches aggregiert wird
*/
public void applyEvent(Event event) throws EventException {
try {
Method method = this.getClass().getDeclaredMethod("applyEvent", event.getClass());
method.setAccessible(true);
method.invoke(this, event);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
EventException f = (EventException) e.getTargetException();
throw f;
}
}
}

9
src/main/java/mops/gruppen2/domain/Exceptions/GroupDoesNotExistException.java
View File

@ -1,9 +0,0 @@
package mops.gruppen2.domain.Exceptions;
import mops.gruppen2.domain.event.Event;
public class GroupDoesNotExistException extends EventException {
public GroupDoesNotExistException(String msg) {
super(msg);
}
}

61
src/main/java/mops/gruppen2/domain/Group.java
View File

@ -1,7 +1,9 @@
package mops.gruppen2.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.event.*;
@ -13,7 +15,10 @@ import java.util.*;
*/
@EqualsAndHashCode(callSuper = false)
@Getter
public class Group extends Aggregate {
@Setter
@AllArgsConstructor
public class Group {
private long id;
private String title;
private String description;
private final List<User> members;
@ -28,58 +33,4 @@ public class Group extends Aggregate {
this.roles = new HashMap<>();
}
private void applyEvent(CreateGroupEvent event) {
id = event.getGroup_id();
visibility = event.getGroupVisibility();
parent = event.getGroupParent();
type = event.getGroupType();
}
private void applyEvent(UpdateRoleEvent event) throws UserNotFoundException {
User user;
Optional<User> userOptional = members.stream()
.filter(u -> u.getUser_id().equals(event.getUser_id()))
.findFirst();
if (userOptional.isPresent()) {
user = userOptional.get();
} else {
throw new UserNotFoundException("Nutzer wurde nicht gefunden!");
}
if (roles.containsKey(user) && event.getNewRole() == Role.MEMBER) {
roles.remove(user);
} else {
roles.put(user.getUser_id(), event.getNewRole());
}
}
private void applyEvent(AddUserEvent event) throws UserAlreadyExistsException {
User user = new User(event.getUser_id(), event.getGivenname(), event.getFamilyname(), event.getEmail());
if (!this.members.contains(user)) {
this.members.add(user);
} else {
throw new UserAlreadyExistsException("Nutzer bereits in Gruppe vorhanden!");
}
}
private void applyEvent(UpdateGroupTitleEvent event) {
this.title = event.getNewGroupTitle();
}
private void applyEvent(UpdateGroupDescriptionEvent event) {
this.description = event.getNewGroupDescription();
}
private void applyEvent(DeleteUserEvent event) throws UserNotFoundException {
User user = new User(event.getUser_id(), "", "", "");
if (this.members.contains(user)) {
this.members.remove(user);
} else {
throw new UserNotFoundException("Nutzer wurde nicht gefunden!");
}
}
}

25
src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
View File

@ -3,6 +3,10 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.User;
/**
@ -16,13 +20,6 @@ public class AddUserEvent extends Event {
String familyname;
String email;
public AddUserEvent(Long event_id, Long group_id, String user_id, String givenname, String familyname, String email) {
super(event_id, group_id, user_id);
this.givenname = givenname;
this.familyname = familyname;
this.email = email;
}
public AddUserEvent(Long group_id, String user_id, String givenname, String familyname, String email) {
super(group_id, user_id);
this.givenname = givenname;
@ -30,10 +27,14 @@ public class AddUserEvent extends Event {
this.email = email;
}
public AddUserEvent(Long event_id, Long group_id, User user) {
super(event_id, group_id, user.getUser_id());
this.givenname = user.getGivenname();
this.familyname = user.getFamilyname();
this.email = user.getEmail();
public void apply(Group group) throws EventException{
User user = new User(this.user_id, this.givenname, this.familyname, this.email);
if (group.getMembers().contains(user)){
throw new UserAlreadyExistsException("Der User existiert bereits");
}
group.getMembers().add(user);
group.getRoles().put(user_id, Role.MEMBER);
}
}

10
src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
View File

@ -3,6 +3,7 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility;
@ -14,10 +15,19 @@ public class CreateGroupEvent extends Event {
private Long groupParent;
private GroupType groupType;
public CreateGroupEvent(Long group_id, String user_id, Long parent, GroupType type, Visibility visibility) {
super(group_id, user_id);
this.groupParent = parent;
this.groupType = type;
this.groupVisibility = visibility;
}
public void apply(Group group) {
group.setId(this.group_id);
group.setParent(this.groupParent);
group.setType(this.groupType);
group.setVisibility(this.groupVisibility);
}
}

16
src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java
View File

@ -2,12 +2,24 @@ package mops.gruppen2.domain.event;
import lombok.EqualsAndHashCode;
import lombok.Value;
import mops.gruppen2.domain.Group;
@EqualsAndHashCode(callSuper = true)
@Value
public class DeleteGroupEvent extends Event {
public DeleteGroupEvent(long event_id, long group_id, String user_id) {
super(event_id, group_id, user_id);
public DeleteGroupEvent(long group_id, String user_id) {
super(group_id, user_id);
}
@Override
public void apply(Group group) {
group.getRoles().clear();
group.getMembers().clear();
group.setTitle(null);
group.setDescription(null);
group.setVisibility(null);
group.setType(null);
group.setParent(null);
}
}

23
src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
View File

@ -1,15 +1,30 @@
package mops.gruppen2.domain.event;
import lombok.*;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.Group;
/**
* Entfernt ein einzelnes Mitglied einer Gruppe.
*/
@Getter
public class DeleteUserEvent extends Event {
public DeleteUserEvent(Long event_id, Long group_id, String user_id) {
super(event_id, group_id, user_id);
@NoArgsConstructor
public class DeleteUserEvent extends Event {
public DeleteUserEvent(Long group_id, String user_id) {
super(group_id, user_id);
}
public DeleteUserEvent() {}
public void apply(Group group) throws EventException {
for (User user : group.getMembers()) {
if (user.getUser_id().equals(this.user_id)) {
group.getMembers().remove(user);
group.getRoles().remove(user.getUser_id());
return;
}
}
throw new UserNotFoundException("Der User existiert nicht");
}
}

9
src/main/java/mops/gruppen2/domain/event/Event.java
View File

@ -6,11 +6,13 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
@Getter
@AllArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@JsonTypeInfo(
include = JsonTypeInfo.As.PROPERTY,
use = JsonTypeInfo.Id.NAME,
@ -26,13 +28,10 @@ import lombok.Setter;
})
@Setter
public class Event {
Long event_id;
Long group_id;
String user_id;
public Event(Long group_id,String user_id){
this.group_id = group_id;
this.user_id = user_id;
public void apply(Group group) throws EventException {
}
}

10
src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
View File

@ -3,6 +3,7 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Group;
/**
* Ändert nur die Gruppenbeschreibung.
@ -13,13 +14,12 @@ import lombok.NoArgsConstructor;
public class UpdateGroupDescriptionEvent extends Event {
String newGroupDescription;
public UpdateGroupDescriptionEvent(Long event_id, Long group_id, String user_id, String newGroupDescription) {
super(event_id, group_id, user_id);
this.newGroupDescription = newGroupDescription;
}
public UpdateGroupDescriptionEvent(Long group_id, String user_id, String newGroupDescription) {
super(group_id, user_id);
this.newGroupDescription = newGroupDescription;
}
public void apply(Group group) {
group.setDescription(this.newGroupDescription);
}
}

11
src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
View File

@ -3,6 +3,7 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Group;
/**
* Ändert nur den Gruppentitel.
@ -13,13 +14,13 @@ import lombok.NoArgsConstructor;
public class UpdateGroupTitleEvent extends Event {
String newGroupTitle;
public UpdateGroupTitleEvent(Long event_id, Long group_id, String user_id, String newGroupTitle) {
super(event_id, group_id, user_id);
this.newGroupTitle = newGroupTitle;
}
public UpdateGroupTitleEvent(Long group_id, String user_id, String newGroupTitle) {
super(group_id, user_id);
this.newGroupTitle = newGroupTitle;
}
public void apply(Group group) {
group.setTitle(this.newGroupTitle);
}
}

18
src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
View File

@ -1,7 +1,13 @@
package mops.gruppen2.domain.event;
import lombok.*;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.User;
import java.util.Optional;
/**
* Aktualisiert die Gruppenrolle eines Teilnehmers.
@ -12,15 +18,17 @@ import mops.gruppen2.domain.Role;
public class UpdateRoleEvent extends Event {
Role newRole;
public UpdateRoleEvent(Long event_id, Long group_id, String user_id, Role newRole) {
super(event_id, group_id, user_id);
this.newRole = newRole;
}
public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
super(group_id, user_id);
this.newRole = newRole;
}
public void apply(Group group) throws UserNotFoundException{
if (!group.getRoles().containsKey(user_id)){
throw new UserNotFoundException("Der User wurde nicht gefunden");
}
group.getRoles().put(this.user_id, this.newRole);
}
}

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

@ -19,8 +19,8 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
//@Query("SELECT * FROM event WHERE event_id > ?#{[0]}")
//Iterable<EventDTO> findNewEventSinceStatus(@Param("status") Long status);
@Query("select * from event where visibility =:vis")
List<EventDTO> findEventDTOByVisibility(@Param("vis") Boolean visibility);
@Query("select distinct group_id from event where visibility =:vis")
List<Long> findGroup_idsWhereVisibility(@Param("vis") Boolean visibility);
@Query("SELECT DISTINCT group_id FROM event WHERE event_id > :status")
public List<Long> findNewEventSinceStatus(@Param("status") Long status);

44
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -34,31 +34,51 @@ public class ControllerService {
* @param description Gruppenbeschreibung
*/
public void createGroup(Account account, String title, String description, Boolean visibility) {
Long groupID = eventService.checkGroup();
Long group_id = eventService.checkGroup();
Visibility visibility1;
if (visibility) {
visibility1 = Visibility.PUBLIC;
} else {
visibility1 = Visibility.PRIVATE;
createInviteLink(groupID);
createInviteLink(group_id);
}
List<Event> eventList = new ArrayList<>();
Collections.addAll(eventList, new CreateGroupEvent(groupID, account.getName(), null, GroupType.LECTURE, visibility1),
new AddUserEvent(groupID, account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()),
new UpdateRoleEvent(groupID, account.getName(), Role.ADMIN),
new UpdateGroupTitleEvent(groupID, account.getName(), title),
new UpdateGroupDescriptionEvent(groupID, account.getName(), description),
new UpdateRoleEvent(groupID, account.getName(), Role.ADMIN));
eventService.saveEventList(eventList);
CreateGroupEvent createGroupEvent = new CreateGroupEvent(group_id, account.getName(), null , GroupType.LECTURE, visibility1);
eventService.saveEvent(createGroupEvent);
addUser(account, group_id);
updateTitle(account, group_id, title);
updateDescription(account, group_id, description);
updateRole(account, group_id);
}
private void createInviteLink(Long group_id) {
inviteLinkRepositoryService.saveInvite(group_id, UUID.randomUUID());
}
public void addUser(Account account, Group group) {
AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), group.getId(), account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
public void addUser(Account account, Long group_id){
AddUserEvent addUserEvent = new AddUserEvent(group_id,account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
eventService.saveEvent(addUserEvent);
}
public void updateTitle(Account account, Long group_id, String title){
UpdateGroupTitleEvent updateGroupTitleEvent = new UpdateGroupTitleEvent(group_id,account.getName(),title);
eventService.saveEvent(updateGroupTitleEvent);
}
public void updateDescription(Account account, Long group_id, String description){
UpdateGroupDescriptionEvent updateGroupDescriptionEvent = new UpdateGroupDescriptionEvent(group_id,account.getName(),description);
eventService.saveEvent(updateGroupDescriptionEvent);
}
public void updateRole(Account account,Long group_id){
UpdateRoleEvent updateRoleEvent = new UpdateRoleEvent(group_id,account.getName(),Role.ADMIN);
eventService.saveEvent(updateRoleEvent);
}
public void deleteUser(Account account, Long group_id){
DeleteUserEvent deleteUserEvent = new DeleteUserEvent(group_id,account.getName());
eventService.saveEvent(deleteUserEvent);
}
}

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

@ -1,8 +1,9 @@
package mops.gruppen2.service;
import mops.gruppen2.domain.EventDTO;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import org.springframework.stereotype.Service;
@ -31,11 +32,10 @@ public class GroupService {
*/
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);
return eventService.translateEventDTOs(eventDTOS);
}
/** Erzeugt eine neue Map wo Gruppen aus den Events erzeugt und den Gruppen_ids zugeordnet werden.
@ -49,7 +49,8 @@ public class GroupService {
Map<Long, Group> groupMap = new HashMap<>();
for (Event event : events) {
getOrCreateGroup(groupMap, event.getGroup_id()).applyEvent(event);
Group group = getOrCreateGroup(groupMap, event.getGroup_id());
event.apply(group);
}
return new ArrayList<>(groupMap.values());
@ -76,8 +77,13 @@ public class GroupService {
* @return
* @throws EventException
*/
public List<Group> getAllGroupWithVisibilityPublic() throws EventException {
return projectEventList(eventService.translateEventDTOs(eventRepository.findEventDTOByVisibility(Boolean.TRUE)));
List<Long> group_ids = eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE);
List<EventDTO> eventDTOS = eventRepository.findAllEventsOfGroups(group_ids);
List<Event> events = eventService.translateEventDTOs(eventDTOS);
List<Group> groups = projectEventList(events);
return groups;
}
@ -91,7 +97,7 @@ public class GroupService {
public List<Group> findGroupWith(String search) throws EventException {
List<Group> groups = new ArrayList<>();
for (Group group: getAllGroupWithVisibilityPublic()) {
if (group.getTitle().contains(search)){
if (group.getTitle().contains(search)|| group.getDescription().contains(search)){
groups.add(group);
}
}

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

@ -2,13 +2,14 @@ package mops.gruppen2.service;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
//Hallo
@Service
public class UserService {
@ -22,10 +23,17 @@ public class UserService {
//Test nötig??
public List<Group> getUserGroups(String user_id) throws EventException {
List<Long> group_ids = eventRepository.findGroup_idsWhereUser_id(user_id);
public List<Group> getUserGroups(User user) throws EventException {
List<Long> group_ids = eventRepository.findGroup_idsWhereUser_id(user.getUser_id());
List<Event> events = groupService.getGroupEvents(group_ids);
return groupService.projectEventList(events);
List<Group> groups = groupService.projectEventList(events);
List<Group> newGroups = new ArrayList<>();
for (Group group: groups) {
if(group.getMembers().contains(user)){
newGroups.add(group);
}
}
return newGroups;
}
public Group getGroupById(Long group_id) throws EventException {