Changeset 8a947b9 for src

Timestamp:

03/16/25 20:56:44 (3 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

3a74959

Parents:

c064a42

Message:

Notifications + triggers!

Location:

src/main

Files:

• java/com/example/skychasemk/controller/NotificationController.java (modified) (4 diffs)
• java/com/example/skychasemk/model/Notification.java (modified) (4 diffs)
• java/com/example/skychasemk/repository/NotificationRepository.java (modified) (1 diff)
• java/com/example/skychasemk/services/BookingService.java (modified) (1 diff)
• java/com/example/skychasemk/services/NotificationService.java (modified) (2 diffs)
• resources/static/FlightSearch.html (modified) (7 diffs)

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

@@ -2 +2 @@
 
 import com.example.skychasemk.model.Notification;
+import com.example.skychasemk.model.Wishlist;
+import com.example.skychasemk.repository.NotificationRepository;
 import com.example.skychasemk.services.NotificationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -16 +19 @@
     private NotificationService notificationService;
 
-    // Get all notifications
-    @GetMapping
-    public List<Notification> getAllNotifications() {
-        return notificationService.getAllNotifications();
+    @Autowired
+    private NotificationRepository notificationRepository;
+
+    @GetMapping("/{userId}")
+    public ResponseEntity<List<Notification>> getAllNotifications(@PathVariable Integer userId) {
+        List<Notification> notifications = notificationRepository.findByUserId(userId);
+        return ResponseEntity.ok(notifications);
     }
 
-    // Get notification by ID
-    @GetMapping("/{id}")
-    public Optional<Notification> getNotificationById(@PathVariable("id") Integer notificationID) {
-        return notificationService.getNotificationById(notificationID);
-    }
-
-    // Create a new notification
     @PostMapping
     public Notification createNotification(@RequestBody Notification notification) {
@@ -34 +33 @@
     }
 
-    // Update an existing notification
     @PutMapping("/{id}")
     public Notification updateNotification(@PathVariable("id") Integer notificationID, @RequestBody Notification notification) {
@@ -40 +38 @@
     }
 
-    // Delete a notification
     @DeleteMapping("/{id}")
     public void deleteNotification(@PathVariable("id") Integer notificationID) {

src/main/java/com/example/skychasemk/model/Notification.java

@@ -2 +2 @@
 
 import jakarta.persistence.*;
+import lombok.Getter;
+
 import java.time.LocalDate;
 
+@Getter
 @Entity
 @Table(name="notification")
@@ -15 +18 @@
     @Column(name = "userid")
 
-    private Integer userID;
+    private Integer userId;
     @Column(name = "message")
 
@@ -33 +36 @@
     }
 
-    // Getters and Setters
-    public Integer getNotificationID() {
-        return notificationID;
-    }
-
     public void setNotificationID(Integer notificationID) {
         this.notificationID = notificationID;
     }
 
-    public Integer getUserID() {
-        return userID;
-    }
-
-    public void setUserID(Integer userID) {
-        this.userID = userID;
-    }
-
-    public String getMessage() {
-        return message;
+    public void setUserId(Integer userId) {
+        this.userId = userId;
     }
 
@@ -58 +48 @@
     }
 
-    public Type getType() {
-        return type;
-    }
-
     public void setType(Type type) {
         this.type = type;
-    }
-
-    public LocalDate getDateSent() {
-        return dateSent;
     }
 

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

@@ -2 +2 @@
 
 import com.example.skychasemk.model.Notification;
+import com.example.skychasemk.model.Wishlist;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
 
 public interface NotificationRepository extends JpaRepository<Notification, Integer> {
-    // You can add custom queries here if needed
+    @Query("SELECT n FROM Notification n WHERE n.userId = :userId")
+    List<Notification> findByUserId(@Param("userId") Integer userId);
 }

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

@@ -3 +3 @@
 import com.example.skychasemk.model.Booking;
 import com.example.skychasemk.repository.BookingRepository;
+import jakarta.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -15 +15 @@
     private NotificationRepository notificationRepository;
 
-    // Get all notifications
-    public List<Notification> getAllNotifications() {
-        return notificationRepository.findAll();
+    public List<Notification> getAllNotifications(Integer userId) {
+        return notificationRepository.findByUserId(userId);
     }
 
-    // Get notification by ID
-    public Optional<Notification> getNotificationById(Integer notificationID) {
-        return notificationRepository.findById(notificationID);
-    }
-
-    // Save a new notification
     public Notification saveNotification(Notification notification) {
         return notificationRepository.save(notification);
     }
 
-    // Update an existing notification
     public Notification updateNotification(Integer notificationID, Notification notification) {
         if (notificationRepository.existsById(notificationID)) {
@@ -40 +32 @@
     }
 
-    // Delete notification
     public void deleteNotification(Integer notificationID) {
         notificationRepository.deleteById(notificationID);

src/main/resources/static/FlightSearch.html

@@ -10 +10 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
     <link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css'>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
     <style>
         body {
@@ -212 +213 @@
             color:white;
         }
+
+        .notification-badge {
+            position: absolute;
+            top: 0;
+            right: 0;
+            background-color: red;
+            color: white;
+            border-radius: 50%;
+            padding: 0.3em;
+            font-size: 0.8em;
+        }
+
+        button i {
+            font-size: 24px;
+            color: #333;
+            position: relative;
+        }
+
+        .notifications-popup {
+            position: absolute;
+            top: 50px;
+            right: 0;
+            background: white;
+            border: 1px solid #ddd;
+            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+            width: 300px;
+            max-height: 400px;
+            overflow-y: auto;
+            padding: 10px;
+            z-index: 9999;
+        }
+
+        .notifications-popup ul {
+            list-style-type: none;
+            padding: 0;
+        }
+
+        .notifications-popup li {
+            padding: 10px;
+            border-bottom: 1px solid #ddd;
+        }
+
+        .notifications-popup button {
+            background-color: #4CAF50; /* Green */
+            color: white;
+            padding: 10px;
+            border: none;
+            cursor: pointer;
+            margin-top: 10px;
+        }
+
+        .notifications-popup button:hover {
+            background-color: #45a049;
+        }
     </style>
 </head>
@@ -223 +278 @@
         <button @click="goToReports">Monthly Report</button>
         <button @click="home">Log Out</button>
+
+        <button @click="toggleNotifications">
+            <i class="fas fa-bell"></i>
+            <span v-if="unreadNotifications > 0" class="notification-badge">{{ unreadNotifications }}</span>
+        </button>
     </header>
 
@@ -291 +351 @@
         </div>
     </div>
+
+    <div v-if="notificationsVisible" class="notifications-popup">
+        <ul>
+            <li v-for="notification in notifications" :key="notification.message">
+                {{ notification.message }}
+            </li>
+        </ul>
+        <button @click="markAllAsRead">Mark All as Read</button>
+    </div>
 </div>
 
@@ -310 +379 @@
             issueDescription: '',
             userId:'',
-            wishlisted:false
+            wishlisted:false,
+            unreadNotifications: 0,
+            notifications: [],
+            notificationsVisible: false,
         },
         computed: {
@@ -319 +391 @@
 
         methods: {
+            toggleNotifications() {
+                this.notificationsVisible = !this.notificationsVisible;
+            },
+            fetchNotifications() {
+                console.log('Fetching notifications for userId:', this.userId);
+                axios.get(`/api/notifications/${this.userId}`)
+                    .then(response => {
+                        this.notifications = response.data;
+                        this.unreadNotifications = this.notifications.filter(n => !n.read).length;
+                    })
+                    .catch(error => {
+                        console.error('Error fetching notifications:', error);
+                    });
+            },
             async searchFlights() {
                 this.isContainerVisible = !this.isContainerVisible;
@@ -455 +541 @@
                     console.error("Error fetching flights", error);
                 });
-
+            this.fetchNotifications();
         }
     });