From 0fc664d8882f4a668af69774e77f2f500e3cad8a Mon Sep 17 00:00:00 2001
From: rokibulislam <rrcucse.11@gmail.com>
Date: Fri, 5 Apr 2024 19:01:34 +0200
Subject: [PATCH] update flights api flightrealization endpoint
---
.../fi/pa165/api/flight/requests/FlightRequest.java | 1 +
.../src/main/java/cz/muni/fi/pa165/dao/Flight.java | 8 ++++++++
.../fi/pa165/rest/FlightRealizationController.java | 6 ++++--
.../fi/pa165/service/FlightRealizationService.java | 10 +++++-----
.../java/cz/muni/fi/pa165/service/FlightService.java | 1 +
5 files changed, 19 insertions(+), 7 deletions(-)
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 77ec211..4affa05 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 367770f..7e1190a 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 87bc6bc..dd23608 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 a57031f..984d9f4 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 2ad11b3..a03b68f 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);
--
GitLab