From 2ea7d0768bc6a96a489494e0ffa241cd3e6c0049 Mon Sep 17 00:00:00 2001
From: Benedikt Elser <benedikt.elser@th-deg.de>
Date: Fri, 30 Apr 2021 16:48:43 +0200
Subject: [PATCH] Fixes
---
src/main/java/de/thd/pms/controller/BootController.java | 2 +-
src/main/java/de/thd/pms/repository/FahrtRepository.java | 2 +-
src/main/java/de/thd/pms/service/PersonService.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thd/pms/controller/BootController.java b/src/main/java/de/thd/pms/controller/BootController.java
index 8296cfa..ee9ee8f 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 ee5c4a9..f5abc7a 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 f3820a1..6d27f78 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 {
--
GitLab