Editing slot and squad settings is now possible

Blocked slot can be revoked while editing the event
Alf-Melmac · Feb 2, 2022 · 8205c27 · 8205c27
1 parent 148bbb9
commit 8205c27
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 5 deletions.
diff --git a/src/main/java/de/webalf/slotbot/controller/EventController.java b/src/main/java/de/webalf/slotbot/controller/EventController.java
@@ -58,6 +58,14 @@ public EventReferencelessDto updateEvent(@PathVariable(value = "id") long eventI
 		return EventAssembler.toReferencelessDto(eventService.updateEvent(event));
 	}
 
+	@PutMapping("/{id}/slotlist")
+	@PreAuthorize(HAS_POTENTIALLY_ROLE_EVENT_MANAGE)
+	public EventReferencelessDto updateSlotList(@PathVariable(value = "id") long eventId, @RequestBody EventDto event) {
+		permissionChecker.assertEventManagePermission(eventService.getGuildByEventId(eventId));
+
+		return EventAssembler.toReferencelessDto(eventService.updateSquadList(eventId, event));
+	}
+
 	@PostMapping("/editable")
 	@PreAuthorize(HAS_POTENTIALLY_ROLE_EVENT_MANAGE)
 	public EventReferencelessDto updateEventEditable(long pk, String name, String value) {

diff --git a/src/main/java/de/webalf/slotbot/controller/website/EventWebController.java b/src/main/java/de/webalf/slotbot/controller/website/EventWebController.java
@@ -121,6 +121,7 @@ public ModelAndView getEventEditHtml(@PathVariable(value = "id") long eventId) {
 		mav.addObject("putEventEditableUrl", linkTo(methodOn(EventController.class).updateEventEditable(eventId, null, null)).toUri().toString());
 		mav.addObject("eventDetailsUrl", linkTo(methodOn(EventWebController.class).getEventDetailsHtml(eventId)).toUri().toString());
 		mav.addObject("putEventUrl", linkTo(methodOn(EventController.class).updateEvent(eventId, null)).toUri().toString());
+		mav.addObject("putSlotListUrl", linkTo(methodOn(EventController.class).updateSlotList(eventId, null)).toUri().toString());
 		return mav;
 	}
 

diff --git a/src/main/java/de/webalf/slotbot/model/Event.java b/src/main/java/de/webalf/slotbot/model/Event.java
@@ -20,8 +20,10 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import static de.webalf.slotbot.model.Guild.GUILD_PLACEHOLDER;
 import static de.webalf.slotbot.model.Squad.RESERVE_NAME;
 import static de.webalf.slotbot.util.MaxLength.*;
 
@@ -350,6 +352,20 @@ public void setChilds() {
 		}
 	}
 
+	public void removeReservedForDefaultGuild() {
+		getSquadList().forEach(squad -> {
+			removeDefaultGuild(squad.getReservedFor(), squad::setReservedFor);
+			squad.getSlotList().forEach(slot ->
+					removeDefaultGuild(slot.getReservedFor(), slot::setReservedFor));
+		});
+	}
+
+	private void removeDefaultGuild(Guild reservedFor, Consumer<Guild> consumer) {
+		if (reservedFor != null && reservedFor.getId() == GUILD_PLACEHOLDER) {
+			consumer.accept(null);
+		}
+	}
+
 	void removeSquad(Squad squad) {
 		getSquadList().remove(squad);
 	}

diff --git a/src/main/java/de/webalf/slotbot/service/EventService.java b/src/main/java/de/webalf/slotbot/service/EventService.java
@@ -252,12 +252,21 @@ public Event updateEvent(@NonNull AbstractEventDto dto) {
 	public Event updateEvent(@NonNull EventDto dto) {
 		Event event = updateEvent((AbstractEventDto) dto);
 
-		DtoUtils.ifPresent(dto.getSquadList(), squadList -> squadService.updateSquadList(squadList, event));
+//		DtoUtils.ifPresent(dto.getSquadList(), squadList -> squadService.updateSquadList(squadList, event));
 		DtoUtils.ifPresent(dto.getDetails(), details -> eventFieldService.updateEventDetails(details, event));
 
 		return event;
 	}
 
+	public Event updateSquadList(long eventId, EventDto dto) {
+		Event event = findById(eventId);
+
+		squadService.updateSquadList(dto.getSquadList(), event);
+		event.removeReservedForDefaultGuild();
+
+		return event;
+	}
+
 	/**
 	 * Searches for the given event by id and archives it
 	 *

diff --git a/src/main/java/de/webalf/slotbot/service/SlotService.java b/src/main/java/de/webalf/slotbot/service/SlotService.java
@@ -7,6 +7,7 @@
 import de.webalf.slotbot.model.Slot;
 import de.webalf.slotbot.model.Squad;
 import de.webalf.slotbot.model.User;
+import de.webalf.slotbot.model.dtos.GuildDto;
 import de.webalf.slotbot.model.dtos.SlotDto;
 import de.webalf.slotbot.model.enums.LogAction;
 import de.webalf.slotbot.repository.SlotRepository;
@@ -33,6 +34,7 @@
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class SlotService {
 	private final SlotRepository slotRepository;
+	private final GuildService guildService;
 	private final UserService userService;
 	private final ActionLogService actionLogService;
 
@@ -80,7 +82,17 @@ private Slot updateOrCreateSlot(@NonNull SlotDto dto, @NonNull Squad squad) {
 
 		DtoUtils.ifPresent(dto.getName(), slot::setName);
 		DtoUtils.ifPresent(dto.getNumber(), slot::setNumber);
-		DtoUtils.ifPresent(dto.getUser(), slot::setUser);
+		final GuildDto reservedFor = dto.getReservedFor();
+		if (reservedFor != null) {
+			slot.setReservedFor(guildService.findByDiscordGuild(Long.parseLong(reservedFor.getId())));
+		} else {
+			slot.setReservedFor(null);
+		}
+		if (slot.isBlocked() && dto.getUser() == null) {
+			slot.setUser(null);
+		} else {
+			DtoUtils.ifPresent(dto.getUser(), slot::setUser);
+		}
 		if (slot.isBlocked()) {
 			slot.setReplacementText(getFirstNotEmpty("Gesperrt", dto.getReplacementText(), slot.getReplacementText()));
 		}

diff --git a/src/main/java/de/webalf/slotbot/service/SquadService.java b/src/main/java/de/webalf/slotbot/service/SquadService.java
@@ -2,6 +2,7 @@
 
 import de.webalf.slotbot.model.Event;
 import de.webalf.slotbot.model.Squad;
+import de.webalf.slotbot.model.dtos.GuildDto;
 import de.webalf.slotbot.model.dtos.SquadDto;
 import de.webalf.slotbot.repository.SquadRepository;
 import de.webalf.slotbot.util.DtoUtils;
@@ -24,6 +25,7 @@
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class SquadService {
 	private final SquadRepository squadRepository;
+	private final GuildService guildService;
 	private final SlotService slotService;
 
 	/**
@@ -61,6 +63,12 @@ private Squad updateOrCreateSquad(@NonNull SquadDto dto, @NonNull Event event) {
 		Squad squad = squadRepository.findById(dto.getId()).orElseGet(() -> Squad.builder().event(event).build());
 
 		DtoUtils.ifPresent(dto.getName(), squad::setName);
+		final GuildDto reservedFor = dto.getReservedFor();
+		if (reservedFor != null) {
+			squad.setReservedFor(guildService.findByDiscordGuild(Long.parseLong(reservedFor.getId())));
+		} else {
+			squad.setReservedFor(null);
+		}
 
 		if (dto.getSlotList() != null) {
 			slotService.updateSlotList(dto.getSlotList(), squad);

diff --git a/src/main/resources/static/assets/js/eventEdit.js b/src/main/resources/static/assets/js/eventEdit.js
@@ -118,7 +118,7 @@ $(function () {
             return;
         }
 
-        putUpdate({squadList: getSquads(true)}, showSavedToast);
+        putSlotList({squadList: getSquads(true)}, showSavedToast);
     });
 });
 
@@ -135,8 +135,8 @@ function requiredField(value) {
     }
 }
 
-function putUpdate(data, callback) {
-    $.ajax(putEventUrl, {
+function putUpdate(data, callback, url = putEventUrl) {
+    $.ajax(url, {
         method: 'PUT',
         headers: {
             'Content-Type': 'application/json'
@@ -146,3 +146,7 @@ function putUpdate(data, callback) {
         .done(callback)
         .fail(showErrorToast);
 }
+
+function putSlotList(data, callback) {
+    putUpdate(data, callback, putSlotListUrl);
+}
diff --git a/src/main/resources/templates/eventEdit.html b/src/main/resources/templates/eventEdit.html
@@ -318,6 +318,7 @@ <h3>Teilnahmeplatzaufzählung</h3>
 	const putEventEditableUrl = /*[[${putEventEditableUrl}]]*/ '';
 	const eventDetailsUrl = /*[[${eventDetailsUrl}]]*/ '';
 	const putEventUrl = /*[[${putEventUrl}]]*/ '';
+	const putSlotListUrl = /*[[${putSlotListUrl}]]*/ '';
 
 	const defaultUserId = /*[[${T(de.webalf.slotbot.model.User).DEFAULT_USER_ID}]]*/ '';
 	/*]]>*/