Merge pull request #53 from hhu-propra2/createGroup

Create group with UI

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;
@@ -58,10 +61,13 @@ public class Gruppen2Controller {
                                @RequestParam(value = "title") String title,
                                @RequestParam(value = "beschreibung") String beschreibung) {
 
-        //Hier muss alles in eine separate Klasse
+
-        CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "faker", title, beschreibung);
+        //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);
-        groupService.buildGroupFromEvent(createGroupEvent);
+        eventService.saveEvent(addUserEvent);
 
         return "redirect:/";
     }

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

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;

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;
@@ -30,16 +31,4 @@ public class GroupService {
 
         return newGroup;
     }
-
-    public Group buildGroupFromEvent(CreateGroupEvent createGroupEvent) {
-        Group newGroup = new Group();
-
-        try {
-            newGroup.applyEvent(createGroupEvent);
-        } catch (EventException e) {
-            e.printStackTrace();
-        }
-
-        return newGroup;
-    }
 }