Refactor event handling and group assignment logic

Replaced `fight.event` with `event.eventID` for consistency and improved event handling. Adjusted `setGroup` to accept `Integer` instead of `EventGroup` to simplify group assignment logic. Removed unused `event` field in `CreateEventFight` and streamlined related processing.
This commit is contained in:
2025-05-22 19:42:49 +02:00
parent b0be06136d
commit 8768fd7d81
2 changed files with 8 additions and 7 deletions
@@ -153,9 +153,9 @@ public class EventFight implements Comparable<EventFight> {
setFight.update(fight, fightID);
}
public void setGroup(EventGroup group) {
setGroup.update(group.getId(), fightID);
this.groupId = group.getId();
public void setGroup(Integer group) {
setGroup.update(group, fightID);
this.groupId = group;
}
public boolean hasFinished() {
@@ -74,7 +74,6 @@ data class UpdateEventFight(
@Serializable
data class CreateEventFight(
val event: Int,
val spielmodus: String,
val map: String,
val blueTeam: Int,
@@ -91,6 +90,8 @@ fun Route.configureEventFightRoutes() {
call.respond(EventFight.getEvent(event.eventID).map { ResponseEventFight(it) })
}
post {
val event = call.receiveEvent() ?: return@post
val fight = call.receiveNullable<CreateEventFight>()
if (fight == null) {
call.respond(HttpStatusCode.BadRequest, ResponseError("Invalid body"))
@@ -98,7 +99,7 @@ fun Route.configureEventFightRoutes() {
}
val eventFight = EventFight.create(
fight.event,
event.eventID,
Timestamp.from(Instant.ofEpochMilli(fight.start)),
fight.spielmodus,
fight.map,
@@ -129,9 +130,9 @@ fun Route.configureEventFightRoutes() {
if (updateFight.group != null) {
if (updateFight.group == -1) {
fight.groupId = null
fight.setGroup(null)
} else {
fight.groupId = updateFight.group
fight.setGroup(updateFight.group)
}
}