new-commit

Author: eylulozatman

src/main/java/airline/airlinemidterm4458/controller/AuthController.java

@@ -2,6 +2,7 @@
 
 
 import airline.airlinemidterm4458.DTO.AuthenticationResponse;
+import airline.airlinemidterm4458.DTO.CustomerResponse;
 import airline.airlinemidterm4458.DTO.LoginRequest;
 import airline.airlinemidterm4458.DTO.RegisterRequest;
 import airline.airlinemidterm4458.model.Customer;
@@ -30,7 +31,7 @@ public AuthenticationResponse login(@RequestBody LoginRequest loginRequest) {
     }
 
     @PostMapping("/register")
-    public ResponseEntity<String> register(@RequestBody RegisterRequest registerRequest) {
+    public ResponseEntity<?> register(@RequestBody RegisterRequest registerRequest) {
 
         return  authService.register(registerRequest);
 

src/main/java/airline/airlinemidterm4458/repository/FlightRepository.java

@@ -24,4 +24,5 @@ public interface FlightRepository extends JpaRepository<Flight,Long> {
 
     Flight findByFlightDateAndFromCityAndToCity(Date flightDate,String fromCity,String toCity);
 
+
 }

src/main/java/airline/airlinemidterm4458/repository/TicketRepository.java

@@ -20,6 +20,8 @@ public interface TicketRepository extends JpaRepository<Ticket, Long> {
     @Override
     Optional<Ticket> findById(Long aLong);
 
+    List<Ticket> findByFlight_Id(Long flightID);
+
     List<Ticket> findAllByCustomer_Id(Long CustomerID);
 
 

src/main/java/airline/airlinemidterm4458/service/AuthService.java

@@ -1,6 +1,7 @@
 package airline.airlinemidterm4458.service;
 
 import airline.airlinemidterm4458.DTO.AuthenticationResponse;
+import airline.airlinemidterm4458.DTO.CustomerResponse;
 import airline.airlinemidterm4458.DTO.LoginRequest;
 import airline.airlinemidterm4458.DTO.RegisterRequest;
 import airline.airlinemidterm4458.config.JwtUtil;
@@ -40,7 +41,7 @@ public AuthenticationResponse login(LoginRequest loginRequest)
             return AuthenticationResponse.builder().token("Bir hata oluştu").build();
         }
     }
-    public ResponseEntity<String> register(RegisterRequest registerRequest) {
+    public ResponseEntity<?> register(RegisterRequest registerRequest) {
 
         if(registerRequest == null) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -54,11 +55,13 @@ public ResponseEntity<String> register(RegisterRequest registerRequest) {
             customer.setName(registerRequest.getName());
             customer.setLastname(registerRequest.getLastname());
             customer.setPassword(password);
+
             if (customerRepository.findByUsername(customer.getUsername()) != null) {
-               return  new ResponseEntity<>("this username is taken",HttpStatus.BAD_REQUEST);
+               return  new ResponseEntity<>("this username already used",HttpStatus.BAD_REQUEST);
            }
             customerRepository.save(customer);
-            return new ResponseEntity<>("Customer saved",HttpStatus.CREATED);
+            CustomerResponse customerResponse = new CustomerResponse(customer);
+            return new ResponseEntity<>(customerResponse,HttpStatus.CREATED);
 
         }
     }

src/main/java/airline/airlinemidterm4458/service/FlightService.java

@@ -5,7 +5,10 @@
 import airline.airlinemidterm4458.DTO.NewFlightRequest;
 import airline.airlinemidterm4458.DTO.QueryTicketRequest;
 import airline.airlinemidterm4458.model.Flight;
+import airline.airlinemidterm4458.model.Ticket;
 import airline.airlinemidterm4458.repository.FlightRepository;
+import airline.airlinemidterm4458.repository.TicketRepository;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -14,16 +17,21 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
 
 @Service
+@AllArgsConstructor
 public class FlightService {
 
     public static final int PAGE_SIZE = 3;
 
     @Autowired
     FlightRepository flightRepository;
+
+    @Autowired
+    TicketRepository ticketRepository;
     public ResponseEntity<String> createFlight(NewFlightRequest newFlightRequest)
     {
         Flight existingFlight = flightRepository.findByFlightDateAndFromCityAndToCity(
@@ -71,10 +79,15 @@ public ResponseEntity<?> queryFlights(QueryTicketRequest queryTicketRequest)
     public ResponseEntity<String> deleteOneFlight(Long id) {
 
         Optional<Flight> flight = flightRepository.findById(id);
-        if (flight.isPresent())
+        List<Ticket> tickets = ticketRepository.findByFlight_Id(id);
+        if (flight.isPresent() &&  tickets != null)
         {
+            ticketRepository.deleteAll(tickets);
             flightRepository.deleteById(id);
             return new ResponseEntity<>("flight deleted",HttpStatus.OK);
+        } else if (flight.isPresent())
+        {
+            flightRepository.deleteById(id);
         }
         return new ResponseEntity<>("failed",HttpStatus.BAD_REQUEST);
     }