From 4cf2ac1aa8c0bf8ecfd540653519b3d1c4f0205b Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Sun, 17 Mar 2024 02:34:00 +0100
Subject: [PATCH] fixed an issue with the getting of curriculums

---
 .../Clyde/Services/CurriculumCourseService.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java
index 0173a05..a32e9d6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java
@@ -3,6 +3,7 @@ package ovh.herisson.Clyde.Services;
 import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.CourseRepository;
 import ovh.herisson.Clyde.Repositories.CurriculumCourseRepository;
+import ovh.herisson.Clyde.Repositories.CurriculumRepository;
 import ovh.herisson.Clyde.Tables.*;
 
 import java.util.ArrayList;
@@ -16,9 +17,12 @@ public class CurriculumCourseService {
 
     private final CourseRepository courseRepo;
 
-    public CurriculumCourseService(CurriculumCourseRepository curriculumCourseRepository, CourseRepository courseRepo) {
+    private final CurriculumRepository curriculumRepo;
+
+    public CurriculumCourseService(CurriculumCourseRepository curriculumCourseRepository, CourseRepository courseRepo, CurriculumRepository curriculumRepo) {
         this.curriculumCourseRepo = curriculumCourseRepository;
         this.courseRepo = courseRepo;
+        this.curriculumRepo = curriculumRepo;
     }
 
     public void save(CurriculumCourse curriculumCourse){
@@ -51,9 +55,11 @@ public class CurriculumCourseService {
 
         ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
 
-        for (Curriculum curriculum : curriculumCourseRepo.findDistinctCurriculums()){
+        for (Curriculum curriculum : curriculumRepo.findAll()){
             toReturn.add(getDepthCurriculum(curriculum));
         }
+
+
         return toReturn;
     }
 
@@ -70,6 +76,7 @@ public class CurriculumCourseService {
 
         ArrayList<Course> toAdd = new ArrayList<>();
         for (Long courseId : coursesIds){
+
             Course course = courseRepo.findById((long) courseId);
             if (course == null)
                 return false;