Respond to the user if the slot to be renamed doesn't exist

Alf-Melmac · Aug 5, 2023 · e69d341 · e69d341
1 parent 66cf466
commit e69d341
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/de/webalf/slotbot/repository/SlotRepository.java b/src/main/java/de/webalf/slotbot/repository/SlotRepository.java
@@ -3,12 +3,10 @@
 import de.webalf.slotbot.model.Event;
 import de.webalf.slotbot.model.Slot;
 import de.webalf.slotbot.model.User;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 /**
  * @author Alf
@@ -18,7 +16,5 @@
 public interface SlotRepository extends SuperIdEntityJpaRepository<Slot> {
 	long countByUserAndSquadEventDateTimeBefore(User user, LocalDateTime dateTime);
 
-	@Modifying
-	@Query("UPDATE Slot s SET s.name = :name WHERE s.number = :number AND s.squad IN (SELECT sq FROM Squad sq WHERE s.squad = sq AND sq.event = :event)")
-	void updateNameByEventAndNumber(@Param("name") String newSlotName, @Param("event") Event event, @Param("number") int slotNumber);
+	Optional<Slot> findByNumberAndSquadEvent(int number, Event event);
 }
diff --git a/src/main/java/de/webalf/slotbot/service/SlotService.java b/src/main/java/de/webalf/slotbot/service/SlotService.java
@@ -138,7 +138,8 @@ void unslot(@NonNull Slot slot, User user) {
 	 * @param slotName   new slot name
 	 */
 	public void renameSlot(@NonNull Event event, int slotNumber, @NotBlank String slotName) {
-		slotRepository.updateNameByEventAndNumber(slotName, event, slotNumber);
+		final Slot slot = slotRepository.findByNumberAndSquadEvent(slotNumber, event).orElseThrow(ResourceNotFoundException::new);
+		slot.setName(slotName);
 	}
 
 	/**