Changeset 7deb3e2

Timestamp:

04/12/25 20:03:33 (7 weeks ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Parents:

8ae59d6

Message:

notification status + review page fixed

Location:

src/main

Files:

• java/com/example/skychasemk/controller/ReviewController.java (modified) (3 diffs)
• java/com/example/skychasemk/dto/ReviewDTO.java (modified) (1 diff)
• java/com/example/skychasemk/services/ReviewService.java (modified) (3 diffs)
• resources/static/FlightSearch.html (modified) (2 diffs)
• resources/static/ReviewPage.html (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) {

src/main/resources/static/FlightSearch.html

@@ -356 +356 @@
         <ul>
             <li v-for="notification in notifications" :key="notification.message">
-                {{ notification.message }}
+                {{ notification.message }} - {{ "RESOLVED" }}
             </li>
         </ul>
@@ -402 +402 @@
                         this.notifications = response.data;
                         this.unreadNotifications = this.notifications.filter(n => !n.read).length;
+                        console.log(response.data);
                     })
                     .catch(error => {

src/main/resources/static/ReviewPage.html

@@ -12 +12 @@
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
 <style>
+    .review-container {
+        max-width: 800px;
+        margin: 0 auto;
+        padding: 20px;
+    }
+
+    .review-list {
+        display: flex;
+        flex-direction: column;
+        gap: 20px;
+        margin-top: 20px;
+    }
+
+    .review-item {
+        background-color: #fff;
+        border: 1px solid #ccc;
+        border-radius: 12px;
+        padding: 15px 20px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+        transition: box-shadow 0.3s ease;
+    }
+
+    .review-item:hover {
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
+    }
+
+    .review-item p {
+        margin: 5px 0;
+    }
+
+    .review-item span {
+        font-weight: bold;
+        color: #673ab7;
+    }
+
     .popup-overlay {
         position: fixed;
@@ -85 +120 @@
             <div class="review-list">
                 <div v-for="review in reviews" :key="review.reviewid" class="review-item">
+                    <p><strong>Flight Number:</strong> {{ review.flightNumber }}</p>
                     <h3>{{ review.date }}</h3>
                     <p>{{ review.reviewComment }}</p>
-                    <span>{{ review.rating }}</span>
+                    <span><i class="fas fa-star" style="color:gold;"></i> {{ review.rating }}</span>
                 </div>
             </div>
@@ -139 +175 @@
                     const response = await axios.get("api/reviews");
                     this.reviews = response.data;
+                    console.log(response.data);
                 } catch (error) {
                     console.error(error);