diff --git a/backend/src/main/java/com/tcu/projectpulse/config/DataInitializer.java b/backend/src/main/java/com/tcu/projectpulse/config/DataInitializer.java index bda89ee..973e2cb 100644 --- a/backend/src/main/java/com/tcu/projectpulse/config/DataInitializer.java +++ b/backend/src/main/java/com/tcu/projectpulse/config/DataInitializer.java @@ -109,9 +109,8 @@ public void run(ApplicationArguments args) { Student grace = studentRepository.save(student("Grace", "Green", "g.green@tcu.edu", section2324)); Student henry = studentRepository.save(student("Henry", "Harris", "h.harris@tcu.edu", section2324)); - // Seed WARs and PeerEvaluations using recent weeks so reports show data immediately + // Seed WARs using recent weeks so reports show data immediately addWars(alice, 3, thisMonday.minusWeeks(3)); - addPeerEvaluations(alice, bob, 2, thisMonday.minusWeeks(2)); studentRepository.save(alice); // --- Teams (2024-2025) --- diff --git a/backend/src/main/java/com/tcu/projectpulse/peerevaluation/service/PeerEvaluationService.java b/backend/src/main/java/com/tcu/projectpulse/peerevaluation/service/PeerEvaluationService.java index 81e43db..50008c9 100644 --- a/backend/src/main/java/com/tcu/projectpulse/peerevaluation/service/PeerEvaluationService.java +++ b/backend/src/main/java/com/tcu/projectpulse/peerevaluation/service/PeerEvaluationService.java @@ -50,7 +50,7 @@ public PeerEvaluationSheetResponse getSheet(Long studentId, LocalDate anyDateInW List entries = teammates.stream() .map(tm -> { PeerEvaluation pe = existing.stream() - .filter(e -> e.getEvaluatee().getId().equals(tm.getId())) + .filter(e -> e.getEvaluatee() != null && e.getEvaluatee().getId().equals(tm.getId())) .findFirst() .orElse(null); return toEntryResponse(tm, pe);