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

Merge pull request #95 from hhu-propra2/updateCheckGroup

Browse Source 
Update check group
This commit is contained in:
Christoph
2020-03-18 14:25:36 +01:00
committed by GitHub
parent 9934249cb5 69141705ab
commit 9541188350
3 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,4 +30,7 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
@Query("SELECT MAX(event_id) FROM event")
public Long getHighesEvent_ID();
@Query("SELECT MAX(group_id) FROM event")
public Long getMaxGroupID();
}

17
src/main/java/mops/gruppen2/service/EventService.java
View File

@ -59,22 +59,17 @@ public class EventService {
}
/**
* Sorgt dafür die Group_id immer um 1 zu erhöhen
* Gibt die nächst höhere groupID zurück die belegt werden kann.
* Gibt 1 zurück, falls keine Gruppe vorhanden ist.
*
* @return Gibt Long zurück
*/
public Long checkGroup() {
Long tmpId = 1L;
Iterable<EventDTO> eventDTOS = eventStore.findAll();
for (EventDTO event : eventDTOS) {
if (event.getGroup_id() == null) {
return tmpId;
Long maxGroupID = eventStore.getMaxGroupID();
if (maxGroupID == null) {
return 1L;
}
if (tmpId <= event.getGroup_id()) {
tmpId++;
}
}
return tmpId;
return maxGroupID + 1;
}
/**

24
src/test/java/mops/gruppen2/service/EventServiceTest.java
View File

@ -28,21 +28,6 @@ class EventServiceTest {
eventService = new EventService(mock(SerializationService.class), eventRepositoryMock);
}
@Test
void checkGroupTest() {
EventDTO eventDTO = new EventDTO();
EventDTO eventDTO1 = new EventDTO();
eventDTO1.setGroup_id(1L);
eventDTO.setUser_id("realer");
eventDTO.setUser_id("faker");
eventDTO.setGroup_id(0L);
List<EventDTO> eventDTOS = new ArrayList<>();
eventDTOS.add(eventDTO);
eventDTOS.add(eventDTO1);
when(eventRepositoryMock.findAll()).thenReturn(eventDTOS);
assertEquals(eventDTO1.getGroup_id() + 1, eventService.checkGroup());
}
@Test
void getMaxID() {
when(eventRepositoryMock.getHighesEvent_ID()).thenReturn(42L);
@ -52,14 +37,7 @@ class EventServiceTest {
@Test
void checkGroupReturnNextValue() {
List<EventDTO> eventDTOS = new ArrayList<>();
EventDTO eventDTO1 = new EventDTO();
EventDTO eventDTO2 = new EventDTO();
eventDTO1.setGroup_id(1L);
eventDTO2.setGroup_id(2L);
eventDTOS.add(eventDTO1);
eventDTOS.add(eventDTO2);
when(eventRepositoryMock.findAll()).thenReturn(eventDTOS);
when(eventRepositoryMock.getMaxGroupID()).thenReturn(2L);
assertEquals(eventService.checkGroup(), 3L);
}