review

review notification service

Author: LinterProd

task-tracker-scheduler/src/main/java/com/metarash/tasktrackerscheduler/repository/TaskRepository.java

@@ -15,8 +15,6 @@
 
 public interface TaskRepository extends JpaRepository<Task, Long> {
     List<Task> findByUser(User user);
-    @Query("SELECT MIN(t.dueDate) FROM Task t WHERE t.dueDate > :now AND t.status != 'completed' AND t.notificationSent IS NULL")
-    Optional<LocalDateTime> findNextDueDateAfterNow(@Param("now") LocalDateTime now);
-
-    List<Task> findAllByDueDateBeforeAndStatusNotAndNotificationSentIsNull(LocalDateTime dueDate, TaskStatus status);
+    List<Task> findByUserAndStatus(User user, TaskStatus status);
+    List<Task> findByUserAndStatusNot(User user, TaskStatus status);
 }

task-tracker-scheduler/src/main/java/com/metarash/tasktrackerscheduler/service/NotificationScheduler.java

@@ -9,8 +9,6 @@
 import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.PriorityQueue;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -29,7 +27,6 @@ public class NotificationScheduler {
 
     private final ReentrantLock lock = new ReentrantLock();
 
-    private final Timer timer = new Timer();
     private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
     private ScheduledFuture<?> currentTask;
 

task-tracker-scheduler/src/main/java/com/metarash/tasktrackerscheduler/service/ReportService.java

@@ -2,6 +2,8 @@
 
 import com.metarash.dto.ReportDto;
 import com.metarash.dto.TaskDto;
+import com.metarash.model.TaskStatus;
+import com.metarash.tasktrackerscheduler.entity.Task;
 import com.metarash.tasktrackerscheduler.entity.User;
 import com.metarash.tasktrackerscheduler.mapper.TaskMapper;
 import lombok.RequiredArgsConstructor;
@@ -17,49 +19,47 @@ public class ReportService {
     private final TaskMapper taskMapper;
 
     public ReportDto generateDayReport(User user) {
-        List<TaskDto> unfinishedTasks = taskService.getUnfinishedTasksByUser(user).stream()
+        List<Task> allTasks = taskService.getAllByUser(user);
+        if (allTasks.isEmpty()) {
+            return null;
+        }
+
+        List<TaskDto> allTaskDtos = allTasks.stream()
                 .map(taskMapper::toDto)
                 .toList();
-        List<TaskDto> allTasks = taskService.getAllByUser(user).stream()
+
+        List<TaskDto> finishedTasks = taskService.getFinishedTasksByUser(user).stream()
                 .map(taskMapper::toDto)
                 .toList();
-        List<TaskDto> finishedTasks = taskService.getFinishedTasksByUser(user).stream()
+
+        List<TaskDto> unfinishedTasks = taskService.getUnfinishedTasksByUser(user).stream()
                 .map(taskMapper::toDto)
                 .toList();
 
         ReportDto dayReport = new ReportDto();
         dayReport.setEmail(user.getEmail());
 
-        if (allTasks.isEmpty()) {
-            return null;
-        }
-
-        if (finishedTasks.size() == allTasks.size()) {
-            buildFinishedTasks(dayReport, finishedTasks);
-        } else if (unfinishedTasks.size() == allTasks.size()) {
-            buildUnfinishedTasks(dayReport, unfinishedTasks);
-        } else {
-            buildAllTaskTasks(dayReport, finishedTasks, unfinishedTasks);
-        }
+        buildReport(dayReport, finishedTasks, unfinishedTasks, allTaskDtos.size());
 
         return dayReport;
     }
 
-    private void buildAllTaskTasks(ReportDto dayReport, List<TaskDto> finishedTasks, List<TaskDto> unfinishedTasks) {
-        dayReport.setFinishedCount(finishedTasks.size());
-        dayReport.setUnfinishedCount(unfinishedTasks.size());
+    private void buildReport(ReportDto report,
+                             List<TaskDto> finishedTasks,
+                             List<TaskDto> unfinishedTasks,
+                             int totalTasks) {
+        report.setFinishedCount(finishedTasks.size());
+        report.setUnfinishedCount(unfinishedTasks.size());
 
-        dayReport.setFinishedTasks(finishedTasks.size() > 5 ? finishedTasks.subList(0, 5) : finishedTasks);
-        dayReport.setUnfinishedTasks(unfinishedTasks.size() > 5 ? unfinishedTasks.subList(0, 5) : unfinishedTasks);
-    }
-
-    private void buildUnfinishedTasks(ReportDto dayReport, List<TaskDto> unfinishedTasks) {
-        dayReport.setUnfinishedCount(unfinishedTasks.size());
-        dayReport.setUnfinishedTasks(unfinishedTasks.size() > 5 ? unfinishedTasks.subList(0, 5) : unfinishedTasks);
+        if (!finishedTasks.isEmpty()) {
+            report.setFinishedTasks(getFirstFive(finishedTasks));
+        }
+        if (!unfinishedTasks.isEmpty()) {
+            report.setUnfinishedTasks(getFirstFive(unfinishedTasks));
+        }
     }
 
-    private void buildFinishedTasks(ReportDto dayReport, List<TaskDto> finishedTasks) {
-        dayReport.setFinishedCount(finishedTasks.size());
-        dayReport.setFinishedTasks(finishedTasks.size() > 5 ? finishedTasks.subList(0, 5) : finishedTasks);
+    private List<TaskDto> getFirstFive(List<TaskDto> tasks) {
+        return tasks.size() > 5 ? tasks.subList(0, 5) : tasks;
     }
 }

task-tracker-scheduler/src/main/java/com/metarash/tasktrackerscheduler/service/TaskService.java

@@ -20,14 +20,10 @@ public List<Task> getAllByUser(User user) {
     }
 
     public List<Task> getFinishedTasksByUser(User user) {
-        return taskRepository.findByUser(user).stream()
-                .filter(task -> task.getStatus() == TaskStatus.completed)
-                .collect(Collectors.toList());
+        return taskRepository.findByUserAndStatus(user, TaskStatus.completed);
     }
 
     public List<Task> getUnfinishedTasksByUser(User user) {
-        return taskRepository.findByUser(user).stream()
-                .filter(task -> task.getStatus() != TaskStatus.completed)
-                .collect(Collectors.toList());
+        return taskRepository.findByUserAndStatusNot(user, TaskStatus.completed);
     }
 }