christoph/lecture-professional-software-development
1
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
Christoph
2020-03-09 16:12:17 +01:00
parent 23cff2c3d3
commit 0a9922b8fe
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java
View File

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

1
src/main/java/mops/gruppen2/repository/EventRepository.java
View File

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

6
src/main/java/mops/gruppen2/service/SerializationService.java
View File

@ -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;
}
} }

13
src/test/java/mops/gruppen2/service/SerializationServiceTest.java
View File

@ -1,7 +1,6 @@
package mops.gruppen2.service; package mops.gruppen2.service;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import mops.gruppen2.domain.event.AddUserEvent;
import mops.gruppen2.domain.event.Event; import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository; import mops.gruppen2.repository.EventRepository;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -14,10 +13,9 @@ import static org.junit.jupiter.api.Assertions.*;
class SerializationServiceTest { class SerializationServiceTest {
EventRepository eventRepository; EventRepository eventRepository;
Event event;
@BeforeEach @BeforeEach
public void setUp(){ public void setUp() {
} }
@ -28,7 +26,7 @@ class SerializationServiceTest {
@Test @Test
void serializeEventTest() { void serializeEventTest() {
event = new Event(1,1,"1"); Event event = new Event(1,1,"1");
SerializationService serializationService = new SerializationService(eventRepository); SerializationService serializationService = new SerializationService(eventRepository);
try { try {
assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"Event\":{\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}}"); assertThat(serializationService.serializeEvent(event)).isEqualTo("{\"Event\":{\"event_id\":1,\"group_id\":1,\"user_id\":\"1\"}}");
@ -37,5 +35,12 @@ class SerializationServiceTest {
} }
} }
@Test
void deserializeAddUserEvent() {
SerializationService serializationService = new SerializationService();
Event event = EventBuilder.randomAddUserEvent();
}
} }