From 9f40df9d59ad2df53906526b2a60f630703f461a Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Thu, 12 Mar 2020 15:14:46 +0100
Subject: [PATCH 1/3] add Usergroups to controller

---
 .../java/mops/gruppen2/controller/Gruppen2Controller.java  | 1 +
 src/main/resources/templates/index.html                    | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 858be87..63234a3 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -81,6 +81,7 @@ public class Gruppen2Controller {
         Account account = keyCloakService.createAccountFromPrincipal(token);
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), account.getName(), null ,GroupType.LECTURE, Visibility.PUBLIC);
         AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
+
         eventService.saveEvent(createGroupEvent);
         eventService.saveEvent(addUserEvent);
 
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 20ff1c4..2dd6703 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -28,9 +28,10 @@
     <h1>Meine Gruppen</h1>
     <div class="container-fluid">
         <form action="/" method="get">
-            <div style="border: 10px solid aliceblue; background: aliceblue">
-                <h4 style="color: dodgerblue; font-weight: bold">Titel der Gruppe</h4>
-                <p>Beschreibung der Gruppe ...</p>
+            <div th:each="gruppe: ${gruppen}" style="border: 10px solid aliceblue; background: aliceblue">
+                <ul>
+                    <li th:text="${gruppe.getTitle()}"></li>
+                </ul>
             </div>
         </form>
     </div>

From 70d911c576ec0add445b62da7be4c86a8d5cdd6c Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Thu, 12 Mar 2020 15:22:10 +0100
Subject: [PATCH 2/3] Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent
 to Gruppen2Controller

---
 .../java/mops/gruppen2/controller/Gruppen2Controller.java  | 7 ++++++-
 .../gruppen2/domain/event/UpdateGroupDescriptionEvent.java | 5 +++++
 .../mops/gruppen2/domain/event/UpdateGroupTitleEvent.java  | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 63234a3..8c247aa 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -7,6 +7,8 @@ import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.event.AddUserEvent;
 import mops.gruppen2.domain.event.CreateGroupEvent;
+import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent;
+import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
 import mops.gruppen2.security.Account;
 import mops.gruppen2.service.EventService;
 import mops.gruppen2.service.GroupService;
@@ -81,9 +83,12 @@ public class Gruppen2Controller {
         Account account = keyCloakService.createAccountFromPrincipal(token);
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), account.getName(), null ,GroupType.LECTURE, Visibility.PUBLIC);
         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(), beschreibung);
         eventService.saveEvent(createGroupEvent);
         eventService.saveEvent(addUserEvent);
+        eventService.saveEvent(updateGroupDescriptionEvent);
+        eventService.saveEvent(updateGroupTitleEvent);
 
         return "redirect:/";
     }
diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
index 6387a7d..714513b 100644
--- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
@@ -17,4 +17,9 @@ public class UpdateGroupDescriptionEvent extends Event {
         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;
+    }
 }
diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
index d57b609..f877b6b 100644
--- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
@@ -17,4 +17,9 @@ public class UpdateGroupTitleEvent extends Event {
         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;
+    }
 }

From 2aeff7ef09210a047bd8676a72885d75fedbdba3 Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Thu, 12 Mar 2020 15:43:12 +0100
Subject: [PATCH 3/3] Edit index.html

---
 src/main/resources/templates/index.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 2dd6703..2903716 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -28,10 +28,11 @@
     <h1>Meine Gruppen</h1>
     <div class="container-fluid">
         <form action="/" method="get">
-            <div th:each="gruppe: ${gruppen}" style="border: 10px solid aliceblue; background: aliceblue">
-                <ul>
-                    <li th:text="${gruppe.getTitle()}"></li>
-                </ul>
+            <div th:each="gruppe: ${gruppen}">
+                <div style="border: 10px solid aliceblue; background: aliceblue">
+                    <h4 style="color: dodgerblue; font-weight: bold" th:text="${gruppe.getTitle()}"></h4>
+                    <p th:text="${gruppe.getDescription()}"></p>
+                </div>
             </div>
         </form>
     </div>