Merge remote-tracking branch 'origin/master' into updateGroupsAPI

# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java

src/main/java/mops/gruppen2/controller/Gruppen2Controller.java

@@ -80,7 +80,7 @@ public class Gruppen2Controller {
         Account account = keyCloakService.createAccountFromPrincipal(token);
         controllerService.createGroup(account, title, beschreibung);
 
-        return "redirect:/gruppen2";
+        return "redirect:/gruppen2/";
     }
 
 }

src/main/java/mops/gruppen2/controller/MopsController.java

@@ -0,0 +1,13 @@
+package mops.gruppen2.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class MopsController {
+
+    @GetMapping("")
+    public String redirect(){
+        return "redirect:/gruppen2/";
+    }
+}

src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java

@@ -15,7 +15,11 @@ public class UpdateRoleEvent extends Event {
 
     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;
     }
 }

src/main/java/mops/gruppen2/service/ControllerService.java

@@ -1,10 +1,12 @@
 package mops.gruppen2.service;
 
 import mops.gruppen2.domain.GroupType;
+import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.event.*;
 import mops.gruppen2.security.Account;
 import org.springframework.stereotype.Service;
+import java.util.*;
 
 @Service
 public class ControllerService {
@@ -15,15 +17,24 @@ public class ControllerService {
         this.eventService = eventService;
     }
 
-    public void createGroup(Account account, String title, String beschreibung) {
+    /**
-        CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, Visibility.PUBLIC);
+     * Erzeugt eine neue Gruppe, fügt den User, der die Gruppe erstellt hat, hinzu und setzt seine Rolle als Admin fest.
-        AddUserEvent addUserEvent = new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
+     * Zudem wird der Gruppentitel und die Gruppenbeschreibung erzeugt, welche vorher der Methode übergeben wurden.
-        UpdateGroupTitleEvent updateGroupTitleEvent = new UpdateGroupTitleEvent(eventService.checkGroup(), account.getName(), title);
+     * Aus diesen Event Objekten wird eine Liste erzeugt, welche daraufhin mithilfe des EventServices gesichert wird.
-        UpdateGroupDescriptionEvent updateGroupDescriptionEvent = new UpdateGroupDescriptionEvent(eventService.checkGroup(), account.getName(), beschreibung);
+     *
+     * @param account Keycloak-Account
+     * @param title Gruppentitel
+     * @param description Gruppenbeschreibung
+     */
+    public void createGroup(Account account, String title, String description) {
 
-        eventService.saveEvent(createGroupEvent);
+        List<Event> eventList = new ArrayList<>();
-        eventService.saveEvent(addUserEvent);
+        Collections.addAll(eventList, new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, Visibility.PUBLIC),
-        eventService.saveEvent(updateGroupTitleEvent);
+                new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()),
-        eventService.saveEvent(updateGroupDescriptionEvent);
+                new UpdateRoleEvent(eventService.checkGroup(), account.getName(), Role.ADMIN),
+                new UpdateGroupTitleEvent(eventService.checkGroup(), account.getName(), title),
+                new UpdateGroupDescriptionEvent(eventService.checkGroup(), account.getName(), description));
+
+        eventService.saveEventList(eventList);
     }
 }

src/main/java/mops/gruppen2/service/EventService.java

@@ -95,6 +95,17 @@ public class EventService {
         return events;
     }
 
+    /**
+     * Sichert eine Liste von Event Objekten mithilfe der Methode saveEvent(Event event)
+     *
+     * @param createGroupEvents Liste von Event Objekten
+     */
+    public void saveEventList(List<Event> createGroupEvents) {
+        for(Event event : createGroupEvents) {
+            saveEvent(event);
+        }
+    }
+
     public Long getMaxEvent_id(){
         return eventStore.getHighesEvent_ID();
     }

src/main/java/mops/gruppen2/service/SerializationService.java

@@ -22,11 +22,25 @@ public class SerializationService {
         this.eventStore = eventStore;
     }
 
+    /**
+     * Übersetzt mithilfe der Jackson-Library eine Java-Event-Repräsentation zu einem JSON-Event-Payload.
+     *
+     * @param event Java-Event-Repräsentation
+     * @return JSON-Event-Payload als String
+     * @throws JsonProcessingException
+     */
     public String serializeEvent(Event event) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
         return mapper.writeValueAsString(event);
     }
 
+    /**
+     * Übersetzt mithilfe der Jackson-Library einen JSON-Event-Payload zu einer Java-Event-Repräsentation.
+     *
+     * @param json JSON-Event-Payload als String
+     * @return Java-Event-Repräsentation
+     * @throws JsonProcessingException
+     */
     public Event deserializeEvent(String json) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
         return mapper.readValue(json, Event.class);

src/main/java/mops/gruppen2/service/UserService.java

@@ -19,6 +19,8 @@ public class UserService {
         this.groupService = groupService;
     }
 
+    //Test nötig??
+
     public List<Group> getUserGroups(String user_id) throws EventException {
         List<Long> group_ids = eventRepository.findGroup_idsWhereUser_id(user_id);
         List<Event> events =  groupService.getGroupEvents(group_ids);

src/main/resources/templates/create.html

@@ -35,12 +35,10 @@
                 </div>
                 <div class="form-group">
                     <label for="beschreibung">Beschreibung der Gruppe</label>
-                    <textarea type="text" class="form-control" id="beschreibung" th:name="beschreibung">
+                    <textarea th:name="beschreibung" class="form-control" id="beschreibung" rows="3"></textarea>
-
-                    </textarea>
                 </div>
                 <div class="form-group">
-                    <button type="submit">Erstellen</button>
+                    <button class="btn btn-primary" type="submit" style="background: #52a1eb; border-style: none">Erstellen</button>
                 </div>
             </div>
         </form>

src/main/resources/templates/index.html

@@ -30,9 +30,12 @@
         <form action="/" method="get">
             <div th:each="gruppe: ${gruppen}">
                 <div style="border: 10px solid aliceblue; background: aliceblue">
-                    <h4 th:href="url" style="color: dodgerblue; font-weight: bold" th:text="${gruppe.getTitle()}"></h4>
+                    <h3>
+                        <a href="url" style="color: dodgerblue; font-weight: bold" th:text="${gruppe.getTitle()}"></a>
+                    </h3>
                     <p th:text="${gruppe.getDescription()}"></p>
                 </div>
+                <br>
             </div>
         </form>
     </div>

src/main/resources/templates/search.html

@@ -35,16 +35,7 @@
                                 <label>Suchbegriff:</label>
                                 <input class="form-control" type="text" value="" name="suchbegriff" placeholder="z.B. Programmieren, Lerngruppe, ...">
                             </div>
-                            <div>
+                            <button type="button" class="btn btn-primary" style="background: #52a1eb; border-style: none">Suchen</button>
-                                <input type="checkbox" style="margin-left: 10px;"> Öffentliche Gruppen
-                                <input type="checkbox" style="margin-left: 24px;"> Private Gruppen
-                                <br>
-                                <input type="checkbox" style="margin-left: 10px;"> Suchbegriff im Namen
-                                <input type="checkbox" style="margin-left: 10px;"> Suchbegriff in der Beschreibung
-                                <input type="checkbox" style="margin-left: 10px;"> Suchbegriff in der Veranstaltung
-                            </div>
-                            <br>
-                            <button type="button" class="btn btn-primary" style="background: dodgerblue">Suchen</button>
                         </div>
                     </form>
                     <br>

src/test/java/mops/gruppen2/architecture/ControllerTest.java

@@ -37,14 +37,6 @@ public class ControllerTest {
             .that().resideInAPackage("..controller..")
             .should().haveSimpleNameEndingWith("Controller");
 
-    @ArchTest
-    public static final ArchRule controllerClassesShouldHaveRequestMappingAnnotation = classes()
-            .that().resideInAPackage("..controller..")
-            .and().haveSimpleNameEndingWith("Controller")
-            .and().areAnnotatedWith(Controller.class)
-            .or().areAnnotatedWith(RestController.class)
-            .should().beAnnotatedWith(RequestMapping.class);
-
     @ArchTest
     public static final ArchRule controllerClassesShouldNotDependOnEachOther = noClasses()
             .that().haveSimpleNameEndingWith("Controller")