refactor(notification): add query to exclude stale read notifications and fix receiver selection bug during job application creation

Author: CotSezer

apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/exception/ErrorCode.java

@@ -86,7 +86,9 @@ public enum ErrorCode {
     RESUME_FILE_REQUIRED(HttpStatus.BAD_REQUEST),
     RESUME_FILE_CONTENT_TYPE_INVALID(HttpStatus.UNSUPPORTED_MEDIA_TYPE),
     RESUME_FILE_UPLOAD_FAILED(HttpStatus.INTERNAL_SERVER_ERROR),
-    RESUME_FILE_NOT_FOUND(HttpStatus.NOT_FOUND);
+    RESUME_FILE_NOT_FOUND(HttpStatus.NOT_FOUND),
+
+    NOTIFICATION_NOT_FOUND(HttpStatus.NOT_FOUND);
 
 
     public final HttpStatus status;

apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/jobapplication/service/JobApplicationService.java

@@ -156,7 +156,7 @@ public JobApplicationResponse create(CreateJobApplicationRequest dto) {
         );
 
         notificationService.notifyUser(
-                jobSeeker.getUsername(),
+                jobPost.getEmployer().getUsername(),
                 "New Job Application Request",
                 NotificationType.JOB_APPLICATION_APPROVED,
                 message,

apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/notification/dto/NotificationResponse.java

@@ -23,7 +23,7 @@ public static NotificationResponse fromEntity(Notification n) {
                 n.getTitle(),
                 n.getNotificationType(),
                 n.getMessage(),
-                n.getTimestamp(),
+                n.getCreatedAt(),
                 n.isReadFlag(),
                 n.getUsername(),
                 n.getLinkId()

apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/notification/model/Notification.java

@@ -27,7 +27,9 @@ public class Notification {
     @Column(length = 500)
     private String message;
 
-    private Long timestamp;
+    private Long createdAt;
+
+    private Long updatedAt;
 
     private boolean readFlag;
     private Long linkId;

apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/notification/repository/NotificationRepository.java

@@ -2,11 +2,20 @@
 
 import org.bounswe.jobboardbackend.notification.model.Notification;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
 
     //List<Notification> findByUsernameAndReadFlagFalse(String username);
-    List<Notification> findByUsername(String username);
+    //List<Notification> findByUsername(String username);
+    @Query("""
+    SELECT n FROM Notification n
+    WHERE n.username = :username
+    AND (n.readFlag = false OR n.updatedAt >= :oneDayAgo)
+""")
+    List<Notification> findActiveNotificationsByUsername(String username, long oneDayAgo);
+
+
 }

apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/notification/service/NotificationService.java

@@ -1,6 +1,8 @@
 package org.bounswe.jobboardbackend.notification.service;
 
 import lombok.RequiredArgsConstructor;
+import org.bounswe.jobboardbackend.exception.ErrorCode;
+import org.bounswe.jobboardbackend.exception.HandleException;
 import org.bounswe.jobboardbackend.notification.dto.NotificationMessage;
 import org.bounswe.jobboardbackend.notification.dto.NotificationResponse;
 import org.bounswe.jobboardbackend.notification.model.Notification;
@@ -22,7 +24,7 @@ public void notifyAll(String title, NotificationType notificationType, String me
         long now = System.currentTimeMillis();
 
         Notification notification =
-                new Notification(null, null, title, notificationType, message, now, false, linkId);
+                new Notification(null, null, title, notificationType, message, now, now, false, linkId);
         repository.save(notification);
 
         NotificationMessage payload =
@@ -35,7 +37,7 @@ public void notifyUser(String username, String title, NotificationType notificat
         long now = System.currentTimeMillis();
 
         Notification notification =
-                new Notification(null, username, title, notificationType, message, now, false, linkId);
+                new Notification(null, username, title, notificationType, message, now, now, false, linkId);
         repository.save(notification);
 
         NotificationMessage payload =
@@ -49,22 +51,25 @@ public void notifyUser(String username, String title, NotificationType notificat
     }
 
     public List<NotificationResponse> getNotificationsForUser(String username) {
-        return repository.findByUsername(username)
+        long oneDayAgo = System.currentTimeMillis() - 24 * 60 * 60 * 1000;
+        return repository.findActiveNotificationsByUsername(username, oneDayAgo)
                 .stream()
                 .map(NotificationResponse::fromEntity)
                 .toList();
     }
 
     public void markAsRead(Long id, String username) {
+        long now = System.currentTimeMillis();
         Notification n = repository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("Notification not found: " + id));
+                .orElseThrow(() -> new HandleException(ErrorCode.NOTIFICATION_NOT_FOUND, "Notification not found"));
 
         // simple ownership check; adjust to your security model
         if (n.getUsername() != null && !n.getUsername().equals(username)) {
             throw new IllegalStateException("Not allowed to modify this notification");
         }
 
         n.setReadFlag(true);
+        n.setUpdatedAt(now);
         repository.save(n);
     }
 }