From 3c410b2de46b7f9359262e962c011c9896195c32 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Tue, 10 Mar 2020 14:27:45 +0100 Subject: [PATCH 1/2] create group with UI --- .../mops/gruppen2/controller/Gruppen2Controller.java | 12 +++++++++--- .../mops/gruppen2/domain/event/AddUserEvent.java | 7 +++++++ src/main/java/mops/gruppen2/security/Account.java | 2 +- .../java/mops/gruppen2/service/GroupService.java | 4 +++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 91e9e30..4b5b1e7 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -1,6 +1,9 @@ package mops.gruppen2.controller; +import mops.gruppen2.domain.Group; +import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.CreateGroupEvent; +import mops.gruppen2.security.Account; import mops.gruppen2.service.EventService; import mops.gruppen2.service.GroupService; import mops.gruppen2.service.KeyCloakService; @@ -59,10 +62,13 @@ public class Gruppen2Controller { @RequestParam(value = "beschreibung") String beschreibung) { //Hier muss alles in eine separate Klasse - CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "faker", title, beschreibung); - eventService.saveEvent(createGroupEvent); - groupService.buildGroupFromEvent(createGroupEvent); + Account account = keyCloakService.createAccountFromPrincipal(token); + CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), account.getName(), title, beschreibung); + AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()); + eventService.saveEvent(createGroupEvent); + eventService.saveEvent(addUserEvent); + Group group = groupService.buildGroupFromEvent(createGroupEvent,addUserEvent); return "redirect:/"; } diff --git a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java index 1fd066d..47bad11 100644 --- a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java @@ -23,6 +23,13 @@ public class AddUserEvent extends Event { 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; + this.familyname = familyname; + 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(); diff --git a/src/main/java/mops/gruppen2/security/Account.java b/src/main/java/mops/gruppen2/security/Account.java index c547f2a..bb97a8d 100644 --- a/src/main/java/mops/gruppen2/security/Account.java +++ b/src/main/java/mops/gruppen2/security/Account.java @@ -7,7 +7,7 @@ import lombok.Getter; @Getter @AllArgsConstructor public class Account { - private final String name; + private final String name; //user_id private final String email; private final String image; private final String givenname; diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index 9a3a582..3becda6 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -2,6 +2,7 @@ package mops.gruppen2.service; import mops.gruppen2.domain.Exceptions.EventException; import mops.gruppen2.domain.Group; +import mops.gruppen2.domain.event.AddUserEvent; import mops.gruppen2.domain.event.CreateGroupEvent; import mops.gruppen2.domain.event.Event; import org.springframework.stereotype.Service; @@ -31,11 +32,12 @@ public class GroupService { return newGroup; } - public Group buildGroupFromEvent(CreateGroupEvent createGroupEvent) { + public Group buildGroupFromEvent(CreateGroupEvent createGroupEvent, AddUserEvent addUserEvent) { Group newGroup = new Group(); try { newGroup.applyEvent(createGroupEvent); + newGroup.applyEvent(addUserEvent); } catch (EventException e) { e.printStackTrace(); } From 3113483b31b912c507a4ff635071d763d0802645 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Tue, 10 Mar 2020 14:37:11 +0100 Subject: [PATCH 2/2] change GroupService --- .../gruppen2/controller/Gruppen2Controller.java | 4 ++-- .../java/mops/gruppen2/service/GroupService.java | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 4b5b1e7..172d8cf 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -61,14 +61,14 @@ public class Gruppen2Controller { @RequestParam(value = "title") String title, @RequestParam(value = "beschreibung") String beschreibung) { - //Hier muss alles in eine separate Klasse + //Refoctor Account account = keyCloakService.createAccountFromPrincipal(token); CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), account.getName(), title, beschreibung); AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()); eventService.saveEvent(createGroupEvent); eventService.saveEvent(addUserEvent); - Group group = groupService.buildGroupFromEvent(createGroupEvent,addUserEvent); + return "redirect:/"; } diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index 3becda6..5aa675e 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -31,17 +31,4 @@ public class GroupService { return newGroup; } - - public Group buildGroupFromEvent(CreateGroupEvent createGroupEvent, AddUserEvent addUserEvent) { - Group newGroup = new Group(); - - try { - newGroup.applyEvent(createGroupEvent); - newGroup.applyEvent(addUserEvent); - } catch (EventException e) { - e.printStackTrace(); - } - - return newGroup; - } }