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

Merge remote-tracking branch 'origin/master' into feature-orga-csv

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
This commit is contained in:
XXNitram
2020-03-18 14:38:50 +01:00
parent f292700c78 9541188350
commit ba4a531337
6 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
}
if (tmpId <= event.getGroup_id()) {
tmpId++;
}
Long maxGroupID = eventStore.getMaxGroupID();
if (maxGroupID == null) {
return 1L;
}
return tmpId;
return maxGroupID + 1;
}
/**