diff --git a/src/main/java/de/thd/pms/controller/BootController.java b/src/main/java/de/thd/pms/controller/BootController.java index 8296cfa000d52ae861185c8d62fca745dfa766ee..ee9ee8fa52e9313d1fa0cc704c1e5a23f16b5a95 100644 --- a/src/main/java/de/thd/pms/controller/BootController.java +++ b/src/main/java/de/thd/pms/controller/BootController.java @@ -134,7 +134,7 @@ public class BootController { * @return Success or error */ @Operation(summary = "Create or modify a boat") - @Parameter(name="boot", required = true) + @io.swagger.v3.oas.annotations.parameters.RequestBody(description="Das Boot was gespeichert werde soll") @RequestMapping(value="/", method={RequestMethod.POST, RequestMethod.PUT}) @ResponseBody public ResponseEntity<Boot> rest_save( diff --git a/src/main/java/de/thd/pms/repository/FahrtRepository.java b/src/main/java/de/thd/pms/repository/FahrtRepository.java index ee5c4a92e265ad87e286b0340f00f54e3df652be..f5abc7a8645627c36fd433180204bcbe8dd625ba 100644 --- a/src/main/java/de/thd/pms/repository/FahrtRepository.java +++ b/src/main/java/de/thd/pms/repository/FahrtRepository.java @@ -19,7 +19,7 @@ public interface FahrtRepository extends CrudRepository<Fahrt, Long> { List<Fahrt> findByAnkunftIsNull(); - @Query("select f from Fahrt f where f.ruderer = ?1") + @Query("select distinct f from Fahrt f JOIN f.ruderer r where r = ?1") List<Fahrt> findByRuderer(Person person); } diff --git a/src/main/java/de/thd/pms/service/PersonService.java b/src/main/java/de/thd/pms/service/PersonService.java index f3820a1ba7d956a9d910ef9c0b000949ed951b93..6d27f78f71dffd7068ee60ee6a7073b9d6ad7936 100644 --- a/src/main/java/de/thd/pms/service/PersonService.java +++ b/src/main/java/de/thd/pms/service/PersonService.java @@ -58,7 +58,7 @@ public class PersonService { public void delete(Long id) throws DaoException { Person ruderer = personRepository.findById(id).get(); - boolean keineFahrt = fahrtRepository.findByRuderer(ruderer ).isEmpty(); + boolean keineFahrt = fahrtRepository.findByRuderer(ruderer).isEmpty(); if (keineFahrt) { personRepository.deleteById(id); } else {