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

Merge pull request #84 from hhu-propra2/change-to-polymorphie

Browse Source 
Change to polymorphie
This commit is contained in:
XXNitram
2020-03-17 13:49:39 +01:00
committed by GitHub
parent f05b92994f 0467d3c6a6
commit bddffd48c1
19 changed files with 159 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ 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;
@ -79,6 +80,7 @@ public class Gruppen2Controller {
return "search";
}
@PostMapping("/createGroup")
public String pCreateGroup(KeycloakAuthenticationToken token,
@RequestParam(value = "title") String title,

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;
}
}
}

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!");
}
}
}

16
src/main/java/mops/gruppen2/domain/event/AddUserEvent.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.User;
/**
@ -16,13 +17,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 +24,8 @@ 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) {
User user = new User(this.user_id, this.givenname, this.familyname, this.email);
group.getMembers().add(user);
}
}

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);
}
}

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

@ -1,15 +1,26 @@
package mops.gruppen2.domain.event;
import lombok.*;
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);
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) {
for (User user : group.getMembers()) {
if (user.getUser_id().equals(this.user_id)) {
group.getMembers().remove(user);
group.getRoles().remove(user.getUser_id());
return;
}
}
}
}

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

@ -6,11 +6,12 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import mops.gruppen2.domain.Group;
@Getter
@AllArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@JsonTypeInfo(
include = JsonTypeInfo.As.PROPERTY,
use = JsonTypeInfo.Id.NAME,
@ -26,13 +27,9 @@ 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){}
}

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);
}
}

15
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,14 @@ 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) {
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);

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

@ -29,24 +29,40 @@ public class ControllerService {
*/
public void createGroup(Account account, String title, String description, Boolean visibility) {
Visibility visibility1;
Long group_id = eventService.checkGroup();
if (visibility){
visibility1 = Visibility.PUBLIC;
}else{
visibility1 = Visibility.PRIVATE;
}
List<Event> eventList = new ArrayList<>();
Collections.addAll(eventList, new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, visibility1),
new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()),
new UpdateRoleEvent(eventService.checkGroup(), account.getName(), Role.ADMIN),
new UpdateGroupTitleEvent(eventService.checkGroup(), account.getName(), title),
new UpdateGroupDescriptionEvent(eventService.checkGroup(), account.getName(), description),
new UpdateRoleEvent(eventService.checkGroup(),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);
}
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);
}
}

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

@ -3,6 +3,7 @@ package mops.gruppen2.service;
import mops.gruppen2.domain.EventDTO;
import mops.gruppen2.domain.Exceptions.EventException;
import mops.gruppen2.domain.Group;
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);
}
}