Merge remote-tracking branch 'origin/event-db'

# Conflicts:
#	src/main/java/mops/gruppen2/domain/Aggregate.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/test/java/mops/gruppen2/domain/GroupTest.java

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

@@ -1,22 +1,29 @@
 package mops.gruppen2.controller;
 
+import mops.gruppen2.domain.event.CreateGroupEvent;
+import mops.gruppen2.service.EventService;
+import mops.gruppen2.service.GroupService;
 import mops.gruppen2.service.KeyCloakService;
 import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.security.RolesAllowed;
+import javax.swing.*;
 
 @Controller
 @RequestMapping("/gruppen2")
 public class Gruppen2Controller {
 
     private final KeyCloakService keyCloakService;
+    private final EventService eventService;
+    private final GroupService groupService;
 
-    public Gruppen2Controller(KeyCloakService keyCloakService) {
+    public Gruppen2Controller(KeyCloakService keyCloakService, EventService eventService, GroupService groupService) {
         this.keyCloakService = keyCloakService;
+        this.eventService = eventService;
+        this.groupService = groupService;
     }
 
     /**Zeigt die index.html an.
@@ -31,4 +38,32 @@ public class Gruppen2Controller {
         model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
         return "index";
     }
+
+    @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
+    @GetMapping("/createGroup")
+    public String createGroup(KeycloakAuthenticationToken token, Model model) {
+        model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
+        return "create";
+    }
+
+    @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
+    @GetMapping("/findGroup")
+    public String findGroup(KeycloakAuthenticationToken token, Model model) {
+        model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
+        return "search";
+    }
+
+    @PostMapping("/createGroup")
+    public String pCreateGroup(KeycloakAuthenticationToken token,
+                               @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);
+        eventService.saveEvent(createGroupEvent);
+        groupService.buildGroupFromEvent(createGroupEvent);
+
+        return "redirect:/";
+    }
+
 }

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

@@ -1,10 +1,13 @@
 package mops.gruppen2.controller;
 
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.javafaker.Faker;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import mops.gruppen2.domain.ProductSwaggerExample;
+import mops.gruppen2.domain.event.AddUserEvent;
+import mops.gruppen2.service.SerializationService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -19,6 +22,11 @@ public class SwaggerAPIController {
 
     private final Faker faker = new Faker();
     private final List<ProductSwaggerExample> products = new ArrayList<>();
+    private final SerializationService serializationService;
+
+    public SwaggerAPIControllerExample(SerializationService serializationService) {
+        this.serializationService = serializationService;
+    }
 
     @GetMapping("/get/all")
     @ApiOperation(value = "Erzeugt eine Liste mit allen gespeicherten Produkten")
@@ -44,4 +52,5 @@ public class SwaggerAPIController {
 
         return "Product saved successfully";
     }
+
 }

src/main/java/mops/gruppen2/domain/EventDTO.java

@@ -0,0 +1,15 @@
+package mops.gruppen2.domain;
+
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("event")
+@Data
+public class EventDTO {
+    @Id
+    Long event_id;
+    Long group_id;
+    String user_id;
+    String event_payload;
+}

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

@@ -1,27 +1,29 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import mops.gruppen2.domain.User;
 
 /**
  * Fügt einen einzelnen Nutzer einer Gruppe hinzu.
  */
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class AddUserEvent extends Event {
     String givenname;
     String familyname;
     String email;
 
-    public AddUserEvent(long event_id, long group_id, String user_id, String givenname, String familyname, String email) {
+    public AddUserEvent(Long event_id, Long group_id, String user_id, String givenname, String familyname, String email) {
         super(event_id, group_id, user_id);
         this.givenname = givenname;
         this.familyname = familyname;
         this.email = email;
     }
 
-    public AddUserEvent(long event_id, long group_id, User user) {
+    public AddUserEvent(Long event_id, Long group_id, User user) {
         super(event_id, group_id, user.getUser_id());
         this.givenname = user.getGivenname();
         this.familyname = user.getFamilyname();

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

@@ -1,17 +1,24 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class CreateGroupEvent extends Event {
     String groupTitle;
     String groupDescription;
 
-    public CreateGroupEvent(long event_id, long group_id, String user_id, String groupTitle, String groupDescription) {
+    public CreateGroupEvent(long event_id, Long group_id, String user_id, String groupTitle, String groupDescription) {
         super(event_id, group_id, user_id);
         this.groupTitle = groupTitle;
         this.groupDescription = groupDescription;
     }
+    public CreateGroupEvent(Long group_id, String user_id, String groupTitle, String groupDescription) {
+        super(group_id, user_id);
+        this.groupTitle = groupTitle;
+        this.groupDescription = groupDescription;
+    }
 }

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

@@ -1,16 +1,14 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.*;
 
 /**
  * Entfernt ein einzelnes Mitglied einer Gruppe.
  */
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
 public class DeleteUserEvent extends Event {
 
-    public DeleteUserEvent(long event_id, long group_id, String user_id) {
+    public DeleteUserEvent(Long event_id, Long group_id, String user_id) {
         super(event_id, group_id, user_id);
     }
 }

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

@@ -1,12 +1,35 @@
 package mops.gruppen2.domain.event;
 
-import lombok.Value;
-import lombok.experimental.NonFinal;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
-@Value
-@NonFinal
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonTypeInfo(
+        include = JsonTypeInfo.As.PROPERTY,
+        use = JsonTypeInfo.Id.NAME,
+        property = "type"
+)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = AddUserEvent.class, name = "AddUserEvent"),
+        @JsonSubTypes.Type(value = CreateGroupEvent.class, name = "CreateGroupEvent"),
+        @JsonSubTypes.Type(value = DeleteUserEvent.class, name = "DeleteUserEvent"),
+        @JsonSubTypes.Type(value = UpdateGroupDescriptionEvent.class, name = "UpdateGroupDescriptionEvent"),
+        @JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"),
+        @JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"),
+})
 public class Event {
-    long event_id;
-    long group_id;
+    Long event_id;
+    Long group_id;
     String user_id;
+
+    public Event(Long group_id,String user_id){
+        this.group_id = group_id;
+        this.user_id = user_id;
+    }
 }

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

@@ -1,17 +1,19 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 /**
  * Ändert nur die Gruppenbeschreibung.
  */
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class UpdateGroupDescriptionEvent extends Event {
     String newGroupDescription;
 
-    public UpdateGroupDescriptionEvent(long event_id, long group_id, String user_id, String newGroupDescription) {
+    public UpdateGroupDescriptionEvent(Long event_id, Long group_id, String user_id, String newGroupDescription) {
         super(event_id, group_id, user_id);
         this.newGroupDescription = newGroupDescription;
     }

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

@@ -1,17 +1,19 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 /**
  * Ändert nur den Gruppentitel.
  */
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class UpdateGroupTitleEvent extends Event {
     String newGroupTitle;
 
-    public UpdateGroupTitleEvent(long event_id, long group_id, String user_id, String newGroupTitle) {
+    public UpdateGroupTitleEvent(Long event_id, Long group_id, String user_id, String newGroupTitle) {
         super(event_id, group_id, user_id);
         this.newGroupTitle = newGroupTitle;
     }

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

@@ -1,19 +1,19 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.*;
 import mops.gruppen2.domain.Role;
 
 /**
  * Aktualisiert die Gruppenrolle eines Teilnehmers.
  */
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
 public class UpdateRoleEvent extends Event {
 
     Role newRole;
 
-    public UpdateRoleEvent(long event_id, long group_id, String user_id, Role newRole) {
+    public UpdateRoleEvent(Long event_id, Long group_id, String user_id, Role newRole) {
         super(event_id, group_id, user_id);
 
         this.newRole = newRole;

src/main/java/mops/gruppen2/repository/EventRepository.java

@@ -1,7 +1,7 @@
 package mops.gruppen2.repository;
 
-import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.domain.EventDTO;
 import org.springframework.data.repository.CrudRepository;
 
-public interface EventRepository extends CrudRepository<Event, Long> {
+public interface EventRepository extends CrudRepository<EventDTO, Long> {
 }

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

@@ -0,0 +1,51 @@
+package mops.gruppen2.service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import mops.gruppen2.domain.EventDTO;
+import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.repository.EventRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EventService {
+    private final SerializationService serializationService;
+    private final EventRepository eventStore;
+
+    public EventService(SerializationService serializationService, EventRepository eventStore) {
+        this.serializationService = serializationService;
+        this.eventStore = eventStore;
+    }
+
+
+    public void saveEvent(Event event){
+        EventDTO eventDTO = getDTO(event);
+        eventStore.save(eventDTO);
+
+    }
+
+    public EventDTO getDTO(Event event){
+        EventDTO eventDTO = new EventDTO();
+        eventDTO.setGroup_id(event.getGroup_id());
+        eventDTO.setUser_id(event.getUser_id());
+        try {
+            eventDTO.setEvent_payload(serializationService.serializeEvent(event));
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return  eventDTO;
+    }
+
+    public Long checkGroup() {
+        Long tmpId = 1L;
+        Iterable<EventDTO> eventDTOS = eventStore.findAll();
+        for (EventDTO event : eventDTOS) {
+            if (event.getGroup_id() == null) {
+                return tmpId;
+            }
+            if (tmpId <= event.getGroup_id()) {
+                tmpId++;
+            }
+        }
+        return tmpId;
+    }
+}

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

@@ -13,7 +13,6 @@ public class GroupService {
     /**
      * Konstruiert eine vollständige Gruppe aus Events, welche dieselbe Gruppe betreffen.
      *
-     * @param event Initiales CreateGroup-Event
      * @param eventList Die restlichen Events für diese Gruppe
      * @return Gruppe auf aktuellem Stand
      */

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

@@ -1,5 +1,12 @@
 package mops.gruppen2.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import mops.gruppen2.domain.EventDTO;
+import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.repository.EventRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /**
@@ -7,4 +14,21 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SerializationService {
+
+    private final EventRepository eventStore;
+    private final Logger log = LoggerFactory.getLogger(SerializationService.class);
+
+    public SerializationService(EventRepository eventStore) {
+        this.eventStore = eventStore;
+    }
+
+    public String serializeEvent(Event event) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writeValueAsString(event);
+    }
+  
+    public Event deserializeEvent(String json) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.readValue(json, Event.class);
+    }
 }