diff --git a/airport-manager-api/src/main/java/cz/muni/fi/pa165/api/flight/requests/FlightRequest.java b/airport-manager-api/src/main/java/cz/muni/fi/pa165/api/flight/requests/FlightRequest.java index 77ec211ff070dde577ff68d26175d538e601b234..4affa050180917296cfb2c551b3acfc68868f1bf 100644 --- a/airport-manager-api/src/main/java/cz/muni/fi/pa165/api/flight/requests/FlightRequest.java +++ b/airport-manager-api/src/main/java/cz/muni/fi/pa165/api/flight/requests/FlightRequest.java @@ -13,4 +13,5 @@ public class FlightRequest { private String origin; private String destination; + private Long planeId; } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java index 367770f6af7f6878a586c1445a0e317e1a05ba35..7e1190a836826a01083cdb12d03f65f23ce37b09 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/dao/Flight.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; import java.util.UUID; @Data @@ -18,4 +19,11 @@ public class Flight implements Serializable { private Long id; private String origin; private String destination; + + private Long planeId; + +// @ElementCollection +// private List<Long> pilotIds; +// @ElementCollection +// private List<Long> stewardIds; } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java index 87bc6bcd19047abbf937c2938affccffea9c5707..dd23608023cd83e9fbe35745981ddbb7b3cacebd 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/rest/FlightRealizationController.java @@ -50,7 +50,9 @@ public class FlightRealizationController { } @DeleteMapping("/{id}") - public void deleteFlightRealization(@PathVariable Long id) { - flightRealizationRepository.deleteById(id); + public ResponseEntity<String> deleteFlightRealization(@PathVariable Long id) { + flightRealizationRepository.deleteById(id); + + return new ResponseEntity<>("Flight Realization deleted sucessfully", HttpStatus.OK); } } diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java index a57031fcdb9772f99f430ef9b8da0e2dd4c14888..984d9f41c6b6d867110b15106a2555880353a32f 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightRealizationService.java @@ -36,11 +36,11 @@ public class FlightRealizationService { FlightRealization existingFlightRealization = flightRealizationRepository.findById(id).get(); System.out.println(existingFlightRealization); - existingFlightRealization.setArrivalTime( existingFlightRealization.getArrivalTime() ); - existingFlightRealization.setDuration(existingFlightRealization.getDuration()); - existingFlightRealization.setDepartureTime(existingFlightRealization.getDepartureTime()); - existingFlightRealization.setKilometersFlown(existingFlightRealization.getKilometersFlown()); - existingFlightRealization.setReport(existingFlightRealization.getReport()); + existingFlightRealization.setArrivalTime( flightRealization.getArrivalTime() ); + existingFlightRealization.setDuration(flightRealization.getDuration()); + existingFlightRealization.setDepartureTime(flightRealization.getDepartureTime()); + existingFlightRealization.setKilometersFlown(flightRealization.getKilometersFlown()); + existingFlightRealization.setReport(flightRealization.getReport()); FlightRealization updateFlightRealization = flightRealizationRepository.save(existingFlightRealization); diff --git a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightService.java b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightService.java index 2ad11b32c9ab35961317a71650ff88a1dcadf62e..a03b68f753f8f1bdc32479462785ae416ea26435 100644 --- a/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightService.java +++ b/airports-flight-service/src/main/java/cz/muni/fi/pa165/service/FlightService.java @@ -38,6 +38,7 @@ public class FlightService { Flight existingFlight = flightRepository.findById(id).get(); existingFlight.setDestination(flight.getDestination()); existingFlight.setOrigin(flight.getOrigin()); + existingFlight.setPlaneId(flight.getPlaneId()); Flight updateFlight = flightRepository.save(existingFlight);