Changeset 7deb3e2 for src/main/java/com/example/skychasemk

Timestamp:

04/12/25 20:03:33 (2 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Parents:

8ae59d6

Message:

notification status + review page fixed

Location:

src/main/java/com/example/skychasemk

Files:

• controller/ReviewController.java (modified) (3 diffs)
• dto/ReviewDTO.java (modified) (1 diff)
• services/ReviewService.java (modified) (3 diffs)

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

@@ -2 +2 @@
 
 import com.example.skychasemk.dto.ReviewDTO;
-import com.example.skychasemk.model.Notification;
 import com.example.skychasemk.model.Review;
 import com.example.skychasemk.repository.ReviewRepository;
@@ -11 +10 @@
 
 import java.util.List;
-import java.util.Optional;
 
 @RestController
@@ -24 +22 @@
     // Get all reviews
     @GetMapping
-    public List<Review> getAllReviews() {
+    public List<ReviewDTO> getAllReviews() {
         return reviewService.getAllReviews();
     }

src/main/java/com/example/skychasemk/dto/ReviewDTO.java

@@ -11 +11 @@
     private Integer rating;
     private LocalDate date;
+    private String flightNumber;
+
+    public String getFlightNumber() {
+        return flightNumber;
+    }
+
+    public void setFlightNumber(String flightNumber) {
+        this.flightNumber = flightNumber;
+    }
 
     // Getters and Setters

src/main/java/com/example/skychasemk/services/ReviewService.java

@@ -3 +3 @@
 import com.example.skychasemk.dto.ReviewDTO;
 import com.example.skychasemk.model.Review;
+import com.example.skychasemk.repository.FlightRepository;
 import com.example.skychasemk.repository.ReviewRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8 +9 @@
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -17 +19 @@
     private ReviewRepository reviewRepository;
 
-    public List<Review> getAllReviews() {
+    @Autowired
+    private FlightRepository flightRepository;
+
+    public List<ReviewDTO> getAllReviews(){
+        List<Review> reviews = reviewRepository.findAll();
+        List<ReviewDTO> reviewDTOs = new ArrayList<>();
+
+        for (Review review : reviews) {
+            ReviewDTO dto = new ReviewDTO();
+            dto.setReviewID(review.getReviewID());
+            dto.setReviewComment(review.getReviewComment());
+            dto.setRating(review.getRating());
+            dto.setTargetID(review.getTargetID());
+            dto.setUserID(review.getUserID());
+
+            flightRepository.findById(Long.valueOf(review.getTargetID())).ifPresent(flight -> {
+                dto.setFlightNumber(flight.getFlightNumber());
+            });
+
+
+            reviewDTOs.add(dto);
+        }
+        return reviewDTOs;
+    }
+
+   /* public List<Review> getAllReviews() {
         return reviewRepository.findAll();
-    }
+    }*/
 
     public Optional<Review> getReviewById(Integer reviewID) {