From 80a9566d6f8f0ac03dc4db896f54d3953d75ef38 Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Thu, 12 Mar 2020 16:18:15 +0100
Subject: [PATCH] Add ControllerService and refactor Gruppen2Controller

---
 .../controller/Gruppen2Controller.java        | 22 ++++----------
 .../gruppen2/service/ControllerService.java   | 29 +++++++++++++++++++
 2 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/mops/gruppen2/service/ControllerService.java

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 8c247aa..e7b5bf1 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -10,10 +10,7 @@ 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;
-import mops.gruppen2.service.KeyCloakService;
-import mops.gruppen2.service.UserService;
+import mops.gruppen2.service.*;
 import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,12 +30,14 @@ public class Gruppen2Controller {
     private final EventService eventService;
     private final GroupService groupService;
     private final UserService userService;
+    private final ControllerService controllerService;
 
-    public Gruppen2Controller(KeyCloakService keyCloakService, EventService eventService, GroupService groupService, UserService userService) {
+    public Gruppen2Controller(KeyCloakService keyCloakService, EventService eventService, GroupService groupService, UserService userService, ControllerService controllerService) {
         this.keyCloakService = keyCloakService;
         this.eventService = eventService;
         this.groupService = groupService;
         this.userService = userService;
+        this.controllerService = controllerService;
     }
 
     /**
@@ -78,19 +77,10 @@ public class Gruppen2Controller {
                                @RequestParam(value = "title") String title,
                                @RequestParam(value = "beschreibung") String beschreibung) {
 
-
-        //Refoctor
         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);
+        controllerService.createGroup(account, title, beschreibung);
 
-        return "redirect:/";
+        return "redirect:/gruppen2";
     }
 
 }
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
new file mode 100644
index 0000000..75f0b78
--- /dev/null
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -0,0 +1,29 @@
+package mops.gruppen2.service;
+
+import mops.gruppen2.domain.GroupType;
+import mops.gruppen2.domain.Visibility;
+import mops.gruppen2.domain.event.*;
+import mops.gruppen2.security.Account;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ControllerService {
+
+    private final EventService eventService;
+
+    public ControllerService(EventService eventService) {
+        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);
+        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(updateGroupTitleEvent);
+        eventService.saveEvent(updateGroupDescriptionEvent);
+    }
+}