Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts.

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

@@ -53,7 +53,7 @@ public class SwaggerAPIControllerExample {
         return "Product saved successfully";
     }
 
-    /*@GetMapping("/json")       //just for testing
+    @GetMapping("/json")
     public void json() {
         AddUserEvent aEvent = new AddUserEvent(
                 1,

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

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

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

@@ -41,4 +41,10 @@ public class SerializationService {
         }
 
     }
+
+    public Event deserializeEvent(String json) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        Event event = mapper.readValue(json, Event.class);
+        return event;
+    }
 }