diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/CourseController.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/CourseController.java index ec66a1e..e6d15dc 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/CourseController.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/CourseController.java @@ -33,6 +33,17 @@ public class CourseController { } } + // Get all past/inactive courses (for public display) + @GetMapping("/past") + public ResponseEntity> getPastCourses() { + try { + List courses = courseRepository.findAllByIsActiveFalse(); + return ResponseEntity.ok(courses); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); + } + } + // Get all courses (for admin) @GetMapping public List getAllCourses() { diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/EventController.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/EventController.java index 5544f1e..76a9eef 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/EventController.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/controller/EventController.java @@ -1,3 +1,4 @@ +// EventController.java - FIXED package net.shyshkin.study.fullstack.supportportal.backend.controller; import org.springframework.beans.factory.annotation.Autowired; @@ -69,17 +70,17 @@ public class EventController { } } - // Additional endpoint to get upcoming events + // Upcoming events - ACTIVE events ordered by date ASC @GetMapping("/upcoming") public ResponseEntity> getUpcomingEvents() { List events = eventRepository.findByIsActiveTrueOrderByDateAsc(); return new ResponseEntity<>(events, HttpStatus.OK); } - // Additional endpoint to get past events + // FIXED: Past events - INACTIVE events ordered by date DESC @GetMapping("/past") public ResponseEntity> getPastEvents() { - List events = eventRepository.findByIsActiveTrueOrderByDateDesc(); + List events = eventRepository.findByIsActiveFalseOrderByDateDesc(); return new ResponseEntity<>(events, HttpStatus.OK); } } \ No newline at end of file diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/CourseRepository.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/CourseRepository.java index cd4d3b5..f783ab8 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/CourseRepository.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/CourseRepository.java @@ -1,4 +1,4 @@ -// CourseRepository.java +// CourseRepository.java - Add this method to your existing repository package net.shyshkin.study.fullstack.supportportal.backend.repository; import net.shyshkin.study.fullstack.supportportal.backend.domain.Course; @@ -9,7 +9,13 @@ import java.util.List; @Repository public interface CourseRepository extends JpaRepository { + + // Get all active courses List findAllByIsActiveTrue(); + + // Get all past/inactive courses - ADD THIS METHOD + List findAllByIsActiveFalse(); + List findAllByCategory(String category); List findAllByLevel(String level); } \ No newline at end of file diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/EventRepository.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/EventRepository.java index 0f8c43a..b26ee30 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/EventRepository.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/repository/EventRepository.java @@ -1,3 +1,4 @@ +// EventRepository.java - FIXED package net.shyshkin.study.fullstack.supportportal.backend.repository; import org.springframework.data.jpa.repository.JpaRepository; @@ -14,8 +15,8 @@ public interface EventRepository extends JpaRepository { // Find active events ordered by date ascending (for upcoming events) List findByIsActiveTrueOrderByDateAsc(); - // Find active events ordered by date descending (for past events) - List findByIsActiveTrueOrderByDateDesc(); + // FIXED: Find INACTIVE events ordered by date descending (for past events) + List findByIsActiveFalseOrderByDateDesc(); // Find events by year List findByYearAndIsActiveTrue(String year);