change createGroup Methode in ControllerService
This commit is contained in:
@ -36,10 +36,24 @@ public class ControllerService {
|
||||
}
|
||||
List<Event> eventList = new ArrayList<>();
|
||||
Group group = new Group();
|
||||
//Erstellen der Events
|
||||
CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, visibility1);
|
||||
AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(),account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
|
||||
UpdateGroupTitleEvent updateGroupTitleEvent = new UpdateGroupTitleEvent(eventService.checkGroup(),account.getName(),title);
|
||||
UpdateGroupDescriptionEvent updateGroupDescriptionEvent = new UpdateGroupDescriptionEvent(eventService.checkGroup(),account.getName(),description);
|
||||
UpdateRoleEvent updateRoleEvent = new UpdateRoleEvent(eventService.checkGroup(),account.getName(),Role.ADMIN);
|
||||
//Gruppe erzeugen aber eigentlich unnötig?
|
||||
createGroupEvent.apply(group);
|
||||
addUserEvent.apply(group);
|
||||
updateGroupTitleEvent.apply(group);
|
||||
updateGroupDescriptionEvent.apply(group);
|
||||
updateRoleEvent.apply(group);
|
||||
//Speichern in DB
|
||||
eventList.add(createGroupEvent);
|
||||
System.out.println(group.getId() + "" + group.getVisibility().toString());;
|
||||
eventList.add(addUserEvent);
|
||||
eventList.add(updateGroupTitleEvent);
|
||||
eventList.add(updateGroupDescriptionEvent);
|
||||
eventList.add(updateRoleEvent);
|
||||
eventService.saveEventList(eventList);
|
||||
}
|
||||
|
||||
|
||||
@ -31,11 +31,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.
|
||||
@ -82,6 +81,9 @@ public class GroupService {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Filtert alle öffentliche Gruppen nach dem suchbegriff und gibt diese als Liste von Gruppen zurück.
|
||||
* Groß und kleinschreibung wird beachtet.
|
||||
|
||||
Reference in New Issue
Block a user