Changeset 07fe0be for src/main/java/com/example/skychasemk

Timestamp:

02/24/25 22:49:01 (3 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

c064a42

Parents:

fda671c

Message:

Wishlist fully working, can book and pay for the booking.

Location:

src/main/java/com/example/skychasemk

Files:

• controller/FlightController.java (modified) (1 diff)
• controller/WishlistController.java (modified) (4 diffs)
• repository/FlightRepository.java (modified) (1 diff)
• repository/WishlistRepository.java (modified) (2 diffs)

src/main/java/com/example/skychasemk/controller/FlightController.java

@@ -33 +33 @@
     }
 
-    @GetMapping("/flights/{id}")
-    public Optional<Flight> getFlightById(@PathVariable("id") Long flightID) {
+    @GetMapping("/{flightId}")
+    public Optional<Flight> getFlightById(@PathVariable("flightId") Long flightID) {
         return flightService.getFlightById(flightID);
     }

src/main/java/com/example/skychasemk/controller/WishlistController.java

@@ -2 +2 @@
 
 import com.example.skychasemk.dto.WishlistDTO;
+import com.example.skychasemk.model.Flight;
 import com.example.skychasemk.model.Wishlist;
+import com.example.skychasemk.repository.BookingRepository;
+import com.example.skychasemk.repository.FlightRepository;
 import com.example.skychasemk.repository.WishlistRepository;
 import com.example.skychasemk.services.WishlistService;
@@ -10 +13 @@
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 @RestController
@@ -21 +26 @@
     @Autowired
     private WishlistRepository wishlistRepository;
+
+    @Autowired
+    private FlightRepository flightRepository;
 
     @GetMapping
@@ -43 +51 @@
     }
 
+    @GetMapping("/flight/{wishlistId}")
+    public ResponseEntity<List<Optional<Wishlist>>> getFlight(@PathVariable Long wishlistId){
+        Optional<Wishlist> wishlist = wishlistRepository.getFlightFromWishlist(wishlistId);
+        return ResponseEntity.ok(Collections.singletonList(wishlist));
+    }
+
     @PostMapping
     public ResponseEntity<String> updateWishlist(@RequestBody WishlistDTO wishlistRequest) {

src/main/java/com/example/skychasemk/repository/FlightRepository.java

@@ -19 +19 @@
 
 
+    @Query(value="SELECT * FROM flight  WHERE flightId=:flightId",nativeQuery = true)
+    List<Flight> getFlightByFlightId(Long flightId);
 }

src/main/java/com/example/skychasemk/repository/WishlistRepository.java

@@ -14 +14 @@
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
@@ -29 +30 @@
     void deleteByUserIdAndTargetId(@Param("userId") Integer userId, @Param("targetId") Integer targetId);
 
+    @Query("SELECT w.targetId FROM Wishlist w WHERE w.wishlistID = :wishlistId")
+    Optional<Wishlist> getFlightFromWishlist(@Param("wishlistId") Long wishlistId);
 }